lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 101/219] net: hns: Correct HNS RSS key set function
    Date
    From: lipeng <lipeng321@huawei.com>

    [ Upstream commit 64ec10dc2ab8ef5bc6e76b1d4bc8203c08a6da1e ]

    This patch fixes below ethtool configuration error:

    localhost:~ # ethtool -X eth0 hkey XX:XX:XX...
    Cannot set Rx flow hash configuration: Operation not supported

    Signed-off-by: lipeng <lipeng321@huawei.com>
    Reviewed-by: Yisen Zhuang <yisen.zhuang@huawei.com>
    Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 23 ++++++++++++++---------
    drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 9 ++++-----
    2 files changed, 18 insertions(+), 14 deletions(-)

    diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
    index 2d0cb609adc3..b7c8433a7a37 100644
    --- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
    +++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
    @@ -773,8 +773,9 @@ static int hns_ae_get_rss(struct hnae_handle *handle, u32 *indir, u8 *key,
    memcpy(key, ppe_cb->rss_key, HNS_PPEV2_RSS_KEY_SIZE);

    /* update the current hash->queue mappings from the shadow RSS table */
    - memcpy(indir, ppe_cb->rss_indir_table,
    - HNS_PPEV2_RSS_IND_TBL_SIZE * sizeof(*indir));
    + if (indir)
    + memcpy(indir, ppe_cb->rss_indir_table,
    + HNS_PPEV2_RSS_IND_TBL_SIZE * sizeof(*indir));

    return 0;
    }
    @@ -785,15 +786,19 @@ static int hns_ae_set_rss(struct hnae_handle *handle, const u32 *indir,
    struct hns_ppe_cb *ppe_cb = hns_get_ppe_cb(handle);

    /* set the RSS Hash Key if specififed by the user */
    - if (key)
    - hns_ppe_set_rss_key(ppe_cb, (u32 *)key);
    + if (key) {
    + memcpy(ppe_cb->rss_key, key, HNS_PPEV2_RSS_KEY_SIZE);
    + hns_ppe_set_rss_key(ppe_cb, ppe_cb->rss_key);
    + }

    - /* update the shadow RSS table with user specified qids */
    - memcpy(ppe_cb->rss_indir_table, indir,
    - HNS_PPEV2_RSS_IND_TBL_SIZE * sizeof(*indir));
    + if (indir) {
    + /* update the shadow RSS table with user specified qids */
    + memcpy(ppe_cb->rss_indir_table, indir,
    + HNS_PPEV2_RSS_IND_TBL_SIZE * sizeof(*indir));

    - /* now update the hardware */
    - hns_ppe_set_indir_table(ppe_cb, ppe_cb->rss_indir_table);
    + /* now update the hardware */
    + hns_ppe_set_indir_table(ppe_cb, ppe_cb->rss_indir_table);
    + }

    return 0;
    }
    diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
    index 87d5c94b2810..8490cba230bd 100644
    --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
    +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
    @@ -1243,6 +1243,7 @@ hns_set_rss(struct net_device *netdev, const u32 *indir, const u8 *key,
    {
    struct hns_nic_priv *priv = netdev_priv(netdev);
    struct hnae_ae_ops *ops;
    + int ret;

    if (AE_IS_VER1(priv->enet_ver)) {
    netdev_err(netdev,
    @@ -1252,12 +1253,10 @@ hns_set_rss(struct net_device *netdev, const u32 *indir, const u8 *key,

    ops = priv->ae_handle->dev->ops;

    - /* currently hfunc can only be Toeplitz hash */
    - if (key ||
    - (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP))
    + if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP) {
    + netdev_err(netdev, "Invalid hfunc!\n");
    return -EOPNOTSUPP;
    - if (!indir)
    - return 0;
    + }

    return ops->set_rss(priv->ae_handle, indir, key, hfunc);
    }
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 00:49    [W:4.042 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site