From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 3 Mar 2020 11:58:54 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v4.19.108~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6d15657bc19cc9a852bb76ebf65a40c63bd17bc;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	net-ena-make-ena-rxfh-support-eth_rss_hash_no_change.patch
---

diff --git a/queue-4.14/net-ena-make-ena-rxfh-support-eth_rss_hash_no_change.patch b/queue-4.14/net-ena-make-ena-rxfh-support-eth_rss_hash_no_change.patch
new file mode 100644
index 00000000000..b3fef5acba9
--- /dev/null
+++ b/queue-4.14/net-ena-make-ena-rxfh-support-eth_rss_hash_no_change.patch
@@ -0,0 +1,72 @@
+From 470793a78ce344bd53d31e0c2d537f71ba957547 Mon Sep 17 00:00:00 2001
+From: Arthur Kiyanovski <akiyano@amazon.com>
+Date: Tue, 11 Feb 2020 15:17:49 +0000
+Subject: net: ena: make ena rxfh support ETH_RSS_HASH_NO_CHANGE
+
+From: Arthur Kiyanovski <akiyano@amazon.com>
+
+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: 1738cd3ed342 ("net: ena: Add a driver for Amazon Elastic Network Adapters (ENA)")
+Signed-off-by: Sameeh Jubran <sameehj@amazon.com>
+Signed-off-by: Saeed Bshara <saeedb@amazon.com>
+Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/amazon/ena/ena_com.c     |    5 +++++
+ drivers/net/ethernet/amazon/ena/ena_com.h     |    8 ++++++++
+ drivers/net/ethernet/amazon/ena/ena_ethtool.c |    3 +++
+ 3 files changed, 16 insertions(+)
+
+--- a/drivers/net/ethernet/amazon/ena/ena_com.c
++++ b/drivers/net/ethernet/amazon/ena/ena_com.c
+@@ -861,6 +861,11 @@ static void ena_com_hash_key_fill_defaul
+ 	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;
+--- a/drivers/net/ethernet/amazon/ena/ena_com.h
++++ b/drivers/net/ethernet/amazon/ena/ena_com.h
+@@ -632,6 +632,14 @@ int ena_com_rss_init(struct ena_com_dev
+  */
+ 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)
+--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
++++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+@@ -748,6 +748,9 @@ static int ena_set_rxfh(struct net_devic
+ 	}
+ 
+ 	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;
diff --git a/queue-4.14/series b/queue-4.14/series
index 1caa43ad742..e33d25a5fef 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -53,3 +53,4 @@ ecryptfs-fix-up-bad-backport-of-fe2e082f5da5b4a0a92ae32978f81507ef37ec66.patch
 include-linux-bitops.h-introduce-bits_per_type.patch
 net-netlink-cap-max-groups-which-will-be-considered-in-netlink_bind.patch
 net-atlantic-fix-potential-error-handling.patch
+net-ena-make-ena-rxfh-support-eth_rss_hash_no_change.patch