From: Salil Mehta <salil.mehta@huawei.com>
To: <davem@davemloft.net>
Cc: <salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
<mehta.salil.lnk@gmail.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>,
lipeng <lipeng321@huawei.com>
Subject: [PATCH V4 net-next 09/18] net: hns: Correct HNS RSS key set function
Date: Sat, 1 Apr 2017 12:03:39 +0100 [thread overview]
Message-ID: <20170401110348.15908-10-salil.mehta@huawei.com> (raw)
In-Reply-To: <20170401110348.15908-1-salil.mehta@huawei.com>
From: lipeng <lipeng321@huawei.com>
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>
---
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 cd7e88e..f0142e5 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
@@ -826,8 +826,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;
}
@@ -838,15 +839,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 3404eac..3a2a342 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -1244,6 +1244,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,
@@ -1253,12 +1254,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.7.4
next prev parent reply other threads:[~2017-04-01 11:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-01 11:03 [PATCH V4 net-next 00/18] net: hns: Misc. HNS Bug Fixes & Code Improvements Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 01/18] net: hns: Fix the implementation of irq affinity function Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 02/18] net: hns: Modify GMAC init TX threshold value Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 03/18] net: hns: Optimize the code for GMAC pad and crc Config Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 04/18] net: hns: Remove redundant memset during buffer release Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 05/18] net: hns: bug fix of ethtool show the speed Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 06/18] net: hns: Optimize hns_nic_common_poll for better performance Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 07/18] net: hns: Fix to adjust buf_size of ring according to mtu Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 08/18] net: hns: Replace netif_tx_lock to ring spin lock Salil Mehta
2017-04-01 11:03 ` Salil Mehta [this message]
2017-04-01 11:03 ` [PATCH V4 net-next 10/18] net: hns: Remove the redundant adding and deleting mac function Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 11/18] net: hns: Remove redundant mac_get_id() Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 12/18] net: hns: Remove redundant mac table operations Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 13/18] net: hns: Clean redundant code from hns_mdio.c file Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 14/18] net: hns: Optimise the code in hns_mdio_wait_ready() Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 15/18] net: hns: Simplify the exception sequence in hns_ppe_init() Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 16/18] net: hns: Adjust the SBM module buffer threshold Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 17/18] net: hns: Avoid Hip06 chip TX packet line bug Salil Mehta
2017-04-01 11:03 ` [PATCH V4 net-next 18/18] net: hns: Some checkpatch.pl script & warning fixes Salil Mehta
2017-04-03 21:51 ` [PATCH V4 net-next 00/18] net: hns: Misc. HNS Bug Fixes & Code Improvements David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170401110348.15908-10-salil.mehta@huawei.com \
--to=salil.mehta@huawei.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=lipeng321@huawei.com \
--cc=mehta.salil.lnk@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=yisen.zhuang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).