Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1355561 > unrolled thread

[PATCH v3 net-next 0/2] net: hns: get and set RSS indirection table by using ethtool

Started byKejian Yan <yankejian@huawei.com>
First post2016-03-11 04:10 +0100
Last post2016-03-14 05:30 +0100
Articles 4 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v3 net-next 0/2] net: hns: get and set RSS indirection table by using ethtool Kejian Yan <yankejian@huawei.com> - 2016-03-11 04:10 +0100
    [PATCH v3 net-next 1/2] net: hns: fix return value of the function about rss Kejian Yan <yankejian@huawei.com> - 2016-03-11 04:10 +0100
    Re: [PATCH v3 net-next 0/2] net: hns: get and set RSS indirection  table by using ethtool Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-03-11 10:10 +0100
      Re: [PATCH v3 net-next 0/2] net: hns: get and set RSS indirection  table by using ethtool "Yankejian (Hackim Yim)" <yankejian@huawei.com> - 2016-03-14 05:30 +0100

#1355561 — [PATCH v3 net-next 0/2] net: hns: get and set RSS indirection table by using ethtool

FromKejian Yan <yankejian@huawei.com>
Date2016-03-11 04:10 +0100
Subject[PATCH v3 net-next 0/2] net: hns: get and set RSS indirection table by using ethtool
Message-ID<rblCG-8hC-3@gated-at.bofh.it>
When we use ethtool to retrieves or configure the receive flow hash 
indirection table, ethtool needs to call .get_rxnfc to get the ring number
so this patchset implements the .get_rxnfc and fixes the bug that we can
not get the tatal table each time.

---
change log:
PATCH v3:
 - This patchset fixes the building warning and error

PATCH v2:
 - This patchset fixes the comments provided by Andy Shevchenko <Andy Shevchenko>

PATCH v1:
 - first submit

Kejian Yan (2):
  net: hns: fix return value of the function about rss
  net: hns: fixes a bug of RSS

 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c |  8 ++++---
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c |  2 +-
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c  | 28 ++++++++++++++++-------
 3 files changed, 26 insertions(+), 12 deletions(-)

-- 
1.9.1

[toc] | [next] | [standalone]

#1355562 — [PATCH v3 net-next 1/2] net: hns: fix return value of the function about rss

FromKejian Yan <yankejian@huawei.com>
Date2016-03-11 04:10 +0100
Subject[PATCH v3 net-next 1/2] net: hns: fix return value of the function about rss
Message-ID<rblCG-8hC-13@gated-at.bofh.it>
In reply to#1355561
Both .get_rxfh and .get_rxfh are always return 0, it should return result
from hardware when getting or setting rss. And the rss function should
return the correct data type.

Signed-off-by: Kejian Yan <yankejian@huawei.com>
---
change log:
PATCH v3:
 - This patch removes unused variable 'ret' to fix the build warning

PATCH v2:
 - This patch fixes the comments provided by Andy Shevchenko <Andy Shevchenko>

 Link: https://lkml.org/lkml/2016/3/10/266

PATCH v1:
 - first submit

 Link: https://lkml.org/lkml/2016/3/9/978
---
 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c |  2 +-
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c |  2 +-
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c  | 14 ++++----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
index d4f92ed..d07db1f 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
@@ -799,7 +799,7 @@ static int hns_ae_set_rss(struct hnae_handle *handle, const u32 *indir,
 
 	/* set the RSS Hash Key if specififed by the user */
 	if (key)
-		hns_ppe_set_rss_key(ppe_cb, (int *)key);
+		hns_ppe_set_rss_key(ppe_cb, (u32 *)key);
 
 	/* update the shadow RSS table with user specified qids */
 	memcpy(ppe_cb->rss_indir_table, indir, HNS_PPEV2_RSS_IND_TBL_SIZE);
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
index f302ef9..811ef35 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
@@ -27,7 +27,7 @@ void hns_ppe_set_tso_enable(struct hns_ppe_cb *ppe_cb, u32 value)
 void hns_ppe_set_rss_key(struct hns_ppe_cb *ppe_cb,
 			 const u32 rss_key[HNS_PPEV2_RSS_KEY_NUM])
 {
-	int key_item = 0;
+	u32 key_item = 0;
 
 	for (key_item = 0; key_item < HNS_PPEV2_RSS_KEY_NUM; key_item++)
 		dsaf_write_dev(ppe_cb, PPEV2_RSS_KEY_REG + key_item * 0x4,
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index 3c4a3bc..01b65eb 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -1178,7 +1178,7 @@ hns_get_rss_key_size(struct net_device *netdev)
 	if (AE_IS_VER1(priv->enet_ver)) {
 		netdev_err(netdev,
 			   "RSS feature is not supported on this hardware\n");
-		return -EOPNOTSUPP;
+		return (u32)-EOPNOTSUPP;
 	}
 
 	ops = priv->ae_handle->dev->ops;
@@ -1197,7 +1197,7 @@ hns_get_rss_indir_size(struct net_device *netdev)
 	if (AE_IS_VER1(priv->enet_ver)) {
 		netdev_err(netdev,
 			   "RSS feature is not supported on this hardware\n");
-		return -EOPNOTSUPP;
+		return (u32)-EOPNOTSUPP;
 	}
 
 	ops = priv->ae_handle->dev->ops;
@@ -1211,7 +1211,6 @@ hns_get_rss(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc)
 {
 	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,
@@ -1224,9 +1223,7 @@ hns_get_rss(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc)
 	if (!indir)
 		return 0;
 
-	ret = ops->get_rss(priv->ae_handle, indir, key, hfunc);
-
-	return 0;
+	return ops->get_rss(priv->ae_handle, indir, key, hfunc);
 }
 
 static int
@@ -1235,7 +1232,6 @@ 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,9 +1248,7 @@ hns_set_rss(struct net_device *netdev, const u32 *indir, const u8 *key,
 	if (!indir)
 		return 0;
 
-	ret = ops->set_rss(priv->ae_handle, indir, key, hfunc);
-
-	return 0;
+	return ops->set_rss(priv->ae_handle, indir, key, hfunc);
 }
 
 static struct ethtool_ops hns_ethtool_ops = {
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1355739 — Re: [PATCH v3 net-next 0/2] net: hns: get and set RSS indirection table by using ethtool

FromAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Date2016-03-11 10:10 +0100
SubjectRe: [PATCH v3 net-next 0/2] net: hns: get and set RSS indirection table by using ethtool
Message-ID<rbrf3-3Sw-15@gated-at.bofh.it>
In reply to#1355561
On Fri, 2016-03-11 at 11:25 +0800, Kejian Yan wrote:
> When we use ethtool to retrieves or configure the receive flow hash 
> indirection table, ethtool needs to call .get_rxnfc to get the ring
> number
> so this patchset implements the .get_rxnfc and fixes the bug that we
> can
> not get the tatal table each time.
> 

FWIW:

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> ---
> change log:
> PATCH v3:
>  - This patchset fixes the building warning and error
> 
> PATCH v2:
>  - This patchset fixes the comments provided by Andy Shevchenko <Andy
> Shevchenko>
> 
> PATCH v1:
>  - first submit
> 
> Kejian Yan (2):
>   net: hns: fix return value of the function about rss
>   net: hns: fixes a bug of RSS
> 
>  drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c |  8 ++++---
>  drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c |  2 +-
>  drivers/net/ethernet/hisilicon/hns/hns_ethtool.c  | 28
> ++++++++++++++++-------
>  3 files changed, 26 insertions(+), 12 deletions(-)
> 

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

[toc] | [prev] | [next] | [standalone]

#1356890 — Re: [PATCH v3 net-next 0/2] net: hns: get and set RSS indirection table by using ethtool

From"Yankejian (Hackim Yim)" <yankejian@huawei.com>
Date2016-03-14 05:30 +0100
SubjectRe: [PATCH v3 net-next 0/2] net: hns: get and set RSS indirection table by using ethtool
Message-ID<rcsiK-7as-13@gated-at.bofh.it>
In reply to#1355739

On 2016/3/11 17:01, Andy Shevchenko wrote:
> On Fri, 2016-03-11 at 11:25 +0800, Kejian Yan wrote:
>> When we use ethtool to retrieves or configure the receive flow hash 
>> indirection table, ethtool needs to call .get_rxnfc to get the ring
>> number
>> so this patchset implements the .get_rxnfc and fixes the bug that we
>> can
>> not get the tatal table each time.
>>
> FWIW:
>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Hi Andy,
I'm sorry for missing it.i will fix it in next submit.

MBR, Kejian

>> ---
>> change log:
>> PATCH v3:
>>  - This patchset fixes the building warning and error
>>
>> PATCH v2:
>>  - This patchset fixes the comments provided by Andy Shevchenko <Andy
>> Shevchenko>
>>
>> PATCH v1:
>>  - first submit
>>
>> Kejian Yan (2):
>>   net: hns: fix return value of the function about rss
>>   net: hns: fixes a bug of RSS
>>
>>  drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c |  8 ++++---
>>  drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c |  2 +-
>>  drivers/net/ethernet/hisilicon/hns/hns_ethtool.c  | 28
>> ++++++++++++++++-------
>>  3 files changed, 26 insertions(+), 12 deletions(-)
>>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web