lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 145/639] net: hns3: fix bug of ethtool_ops.get_channels for VF
    Date
    From: Huazhong Tan <tanhuazhong@huawei.com>

    [ Upstream commit 8be7362186bd5ccb5f6f72be49751ad2778e2636 ]

    The current code returns the number of all queues that can be used and
    the number of queues that have been allocated, which is incorrect.
    What should be returned is the number of queues allocated for each enabled
    TC and the number of queues that can be allocated.

    This patch fixes it.

    Fixes: 849e46077689 ("net: hns3: add ethtool_ops.get_channels support for VF")
    Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
    Signed-off-by: Peng Li <lipeng321@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
    index 67db19709deaa..fd5375b5991bb 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
    @@ -1957,7 +1957,8 @@ static u32 hclgevf_get_max_channels(struct hclgevf_dev *hdev)
    struct hnae3_handle *nic = &hdev->nic;
    struct hnae3_knic_private_info *kinfo = &nic->kinfo;

    - return min_t(u32, hdev->rss_size_max * kinfo->num_tc, hdev->num_tqps);
    + return min_t(u32, hdev->rss_size_max,
    + hdev->num_tqps / kinfo->num_tc);
    }

    /**
    @@ -1978,7 +1979,7 @@ static void hclgevf_get_channels(struct hnae3_handle *handle,
    ch->max_combined = hclgevf_get_max_channels(hdev);
    ch->other_count = 0;
    ch->max_other = 0;
    - ch->combined_count = hdev->num_tqps;
    + ch->combined_count = handle->kinfo.rss_size;
    }

    static void hclgevf_get_tqps_and_rss_info(struct hnae3_handle *handle,
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:44    [W:3.159 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site