Commit 717dd807 authored by Kejian Yan's avatar Kejian Yan Committed by David S. Miller
Browse files

net: hns: fixes a bug of RSS 



If trying to get receive flow hash indirection table by ethtool, it needs
to call .get_rxnfc to get ring number first. So this patch implements the
.get_rxnfc of ethtool. And the data type of rss_indir_table is u32, it has
to be multiply by the width of data type when using memcpy.

Signed-off-by: default avatarKejian Yan <yankejian@huawei.com>
Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent beecfe9e

drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c

+4 −2
Original line number Diff line number Diff line
@@ -791,7 +791,8 @@ 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);

	memcpy(indir, ppe_cb->rss_indir_table,

	       HNS_PPEV2_RSS_IND_TBL_SIZE * sizeof(*indir));



	return 0;

}
@@ -806,7 +807,8 @@ static int hns_ae_set_rss(struct hnae_handle *handle, const u32 *indir, 
		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);

	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);

drivers/net/ethernet/hisilicon/hns/hns_ethtool.c

+18 −0
Original line number Diff line number Diff line
@@ -1245,6 +1245,23 @@ hns_set_rss(struct net_device *netdev, const u32 *indir, const u8 *key, 
	return ops->set_rss(priv->ae_handle, indir, key, hfunc);

}



static int hns_get_rxnfc(struct net_device *netdev,

			 struct ethtool_rxnfc *cmd,

			 u32 *rule_locs)

{

	struct hns_nic_priv *priv = netdev_priv(netdev);



	switch (cmd->cmd) {

	case ETHTOOL_GRXRINGS:

		cmd->data = priv->ae_handle->q_num;

		break;

	default:

		return -EOPNOTSUPP;

	}



	return 0;

}



static struct ethtool_ops hns_ethtool_ops = {

	.get_drvinfo = hns_nic_get_drvinfo,

	.get_link  = hns_nic_get_link,
@@ -1268,6 +1285,7 @@ static struct ethtool_ops hns_ethtool_ops = { 
	.get_rxfh_indir_size = hns_get_rss_indir_size,

	.get_rxfh = hns_get_rss,

	.set_rxfh = hns_set_rss,

	.get_rxnfc = hns_get_rxnfc,

};



void hns_ethtool_set_ops(struct net_device *ndev)