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

Commit c5521f96 authored by Arthur Kiyanovski's avatar Arthur Kiyanovski Committed by Greg Kroah-Hartman
Browse files

net: ena: make ena rxfh support ETH_RSS_HASH_NO_CHANGE 



commit 470793a78ce344bd53d31e0c2d537f71ba957547 upstream.

As the name suggests ETH_RSS_HASH_NO_CHANGE is received upon changing
the key or indirection table using ethtool while keeping the same hash
function.

Also add a function for retrieving the current hash function from
the ena-com layer.

Fixes: 1738cd3e ("net: ena: Add a driver for Amazon Elastic Network Adapters (ENA)")
Signed-off-by: default avatarSameeh Jubran <sameehj@amazon.com>
Signed-off-by: default avatarSaeed Bshara <saeedb@amazon.com>
Signed-off-by: default avatarArthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c394e3d3

drivers/net/ethernet/amazon/ena/ena_com.c

+5 −0
Original line number Diff line number Diff line
@@ -860,6 +860,11 @@ static void ena_com_hash_key_fill_default_key(struct ena_com_dev *ena_dev) 
	hash_key->keys_num = sizeof(hash_key->key) / sizeof(u32);

}



int ena_com_get_current_hash_function(struct ena_com_dev *ena_dev)

{

	return ena_dev->rss.hash_func;

}



static int ena_com_hash_key_allocate(struct ena_com_dev *ena_dev)

{

	struct ena_rss *rss = &ena_dev->rss;

drivers/net/ethernet/amazon/ena/ena_com.h

+8 −0
Original line number Diff line number Diff line
@@ -632,6 +632,14 @@ int ena_com_rss_init(struct ena_com_dev *ena_dev, u16 log_size); 
 */

void ena_com_rss_destroy(struct ena_com_dev *ena_dev);



/* ena_com_get_current_hash_function - Get RSS hash function

 * @ena_dev: ENA communication layer struct

 *

 * Return the current hash function.

 * @return: 0 or one of the ena_admin_hash_functions values.

 */

int ena_com_get_current_hash_function(struct ena_com_dev *ena_dev);



/* ena_com_fill_hash_function - Fill RSS hash function

 * @ena_dev: ENA communication layer struct

 * @func: The hash function (Toeplitz or crc)

drivers/net/ethernet/amazon/ena/ena_ethtool.c

+3 −0
Original line number Diff line number Diff line
@@ -749,6 +749,9 @@ static int ena_set_rxfh(struct net_device *netdev, const u32 *indir, 
	}



	switch (hfunc) {

	case ETH_RSS_HASH_NO_CHANGE:

		func = ena_com_get_current_hash_function(ena_dev);

		break;

	case ETH_RSS_HASH_TOP:

		func = ENA_ADMIN_TOEPLITZ;

		break;