Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc6aaa14 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rss_hash' 



Amir Vadai says:

====================
ethtool, net/mlx4_en: RSS hash function selection

This patchset by Eyal adds support in set/get of RSS hash function. Current
supported functions are Toeplitz and XOR. The API is design to enable adding
new hash functions without breaking backward compatibility.
Userspace patch will be sent after API is available in kernel.

The patchset was applied and tested over commit cd4c910e ("netpoll: delete
defconfig references to obsolete NETPOLL_TRAP")
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 18b5427a 947cbb0a

drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c

+9 −2
Original line number Diff line number Diff line
@@ -511,7 +511,8 @@ static u32 xgbe_get_rxfh_indir_size(struct net_device *netdev) 
	return ARRAY_SIZE(pdata->rss_table);

}



static int xgbe_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key)

static int xgbe_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,

			 u8 *hfunc)

{

	struct xgbe_prv_data *pdata = netdev_priv(netdev);

	unsigned int i;
@@ -525,16 +526,22 @@ static int xgbe_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key) 
	if (key)

		memcpy(key, pdata->rss_key, sizeof(pdata->rss_key));



	if (hfunc)

		*hfunc = ETH_RSS_HASH_TOP;



	return 0;

}



static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,

			 const u8 *key)

			 const u8 *key, const u8 hfunc)

{

	struct xgbe_prv_data *pdata = netdev_priv(netdev);

	struct xgbe_hw_if *hw_if = &pdata->hw_if;

	unsigned int ret;



	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)

		return -EOPNOTSUPP;



	if (indir) {

		ret = hw_if->set_rss_lookup_table(pdata, indir);

		if (ret)

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+18 −2
Original line number Diff line number Diff line
@@ -3358,12 +3358,18 @@ static u32 bnx2x_get_rxfh_indir_size(struct net_device *dev) 
	return T_ETH_INDIRECTION_TABLE_SIZE;

}



static int bnx2x_get_rxfh(struct net_device *dev, u32 *indir, u8 *key)

static int bnx2x_get_rxfh(struct net_device *dev, u32 *indir, u8 *key,

			  u8 *hfunc)

{

	struct bnx2x *bp = netdev_priv(dev);

	u8 ind_table[T_ETH_INDIRECTION_TABLE_SIZE] = {0};

	size_t i;



	if (hfunc)

		*hfunc = ETH_RSS_HASH_TOP;

	if (!indir)

		return 0;



	/* Get the current configuration of the RSS indirection table */

	bnx2x_get_rss_ind_table(&bp->rss_conf_obj, ind_table);
@@ -3383,11 +3389,21 @@ static int bnx2x_get_rxfh(struct net_device *dev, u32 *indir, u8 *key) 
}



static int bnx2x_set_rxfh(struct net_device *dev, const u32 *indir,

			  const u8 *key)

			  const u8 *key, const u8 hfunc)

{

	struct bnx2x *bp = netdev_priv(dev);

	size_t i;



	/* We require at least one supported parameter to be changed and no

	 * change in any of the unsupported parameters

	 */

	if (key ||

	    (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP))

		return -EOPNOTSUPP;



	if (!indir)

		return 0;



	for (i = 0; i < T_ETH_INDIRECTION_TABLE_SIZE; i++) {

		/*

		 * The same as in bnx2x_get_rxfh: we can't use a memcpy()

drivers/net/ethernet/broadcom/tg3.c

+18 −2
Original line number Diff line number Diff line
@@ -12561,22 +12561,38 @@ static u32 tg3_get_rxfh_indir_size(struct net_device *dev) 
	return size;

}



static int tg3_get_rxfh(struct net_device *dev, u32 *indir, u8 *key)

static int tg3_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, u8 *hfunc)

{

	struct tg3 *tp = netdev_priv(dev);

	int i;



	if (hfunc)

		*hfunc = ETH_RSS_HASH_TOP;

	if (!indir)

		return 0;



	for (i = 0; i < TG3_RSS_INDIR_TBL_SIZE; i++)

		indir[i] = tp->rss_ind_tbl[i];



	return 0;

}



static int tg3_set_rxfh(struct net_device *dev, const u32 *indir, const u8 *key)

static int tg3_set_rxfh(struct net_device *dev, const u32 *indir, const u8 *key,

			const u8 hfunc)

{

	struct tg3 *tp = netdev_priv(dev);

	size_t i;



	/* We require at least one supported parameter to be changed and no

	 * change in any of the unsupported parameters

	 */

	if (key ||

	    (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP))

		return -EOPNOTSUPP;



	if (!indir)

		return 0;



	for (i = 0; i < TG3_RSS_INDIR_TBL_SIZE; i++)

		tp->rss_ind_tbl[i] = indir[i];

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+16 −2
Original line number Diff line number Diff line
@@ -2923,21 +2923,35 @@ static u32 get_rss_table_size(struct net_device *dev) 
	return pi->rss_size;

}



static int get_rss_table(struct net_device *dev, u32 *p, u8 *key)

static int get_rss_table(struct net_device *dev, u32 *p, u8 *key, u8 *hfunc)

{

	const struct port_info *pi = netdev_priv(dev);

	unsigned int n = pi->rss_size;



	if (hfunc)

		*hfunc = ETH_RSS_HASH_TOP;

	if (!p)

		return 0;

	while (n--)

		p[n] = pi->rss[n];

	return 0;

}



static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key)

static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key,

			 const u8 hfunc)

{

	unsigned int i;

	struct port_info *pi = netdev_priv(dev);



	/* We require at least one supported parameter to be changed and no

	 * change in any of the unsupported parameters

	 */

	if (key ||

	    (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP))

		return -EOPNOTSUPP;

	if (!p)

		return 0;



	for (i = 0; i < pi->rss_size; i++)

		pi->rss[i] = p[i];

	if (pi->adapter->flags & FULL_INIT_DONE)

drivers/net/ethernet/emulex/benet/be_ethtool.c

+10 −2
Original line number Diff line number Diff line
@@ -1171,7 +1171,8 @@ static u32 be_get_rxfh_key_size(struct net_device *netdev) 
	return RSS_HASH_KEY_LEN;

}



static int be_get_rxfh(struct net_device *netdev, u32 *indir, u8 *hkey)

static int be_get_rxfh(struct net_device *netdev, u32 *indir, u8 *hkey,

		       u8 *hfunc)

{

	struct be_adapter *adapter = netdev_priv(netdev);

	int i;
@@ -1185,16 +1186,23 @@ static int be_get_rxfh(struct net_device *netdev, u32 *indir, u8 *hkey) 
	if (hkey)

		memcpy(hkey, rss->rss_hkey, RSS_HASH_KEY_LEN);



	if (hfunc)

		*hfunc = ETH_RSS_HASH_TOP;



	return 0;

}



static int be_set_rxfh(struct net_device *netdev, const u32 *indir,

		       const u8 *hkey)

		       const u8 *hkey, const u8 hfunc)

{

	int rc = 0, i, j;

	struct be_adapter *adapter = netdev_priv(netdev);

	u8 rsstable[RSS_INDIR_TABLE_LEN];



	/* We do not allow change in unsupported parameters */

	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)

		return -EOPNOTSUPP;



	if (indir) {

		struct be_rx_obj *rxo;