[dpdk-stable] patch 'net/mlx4: fix RSS action with null hash key' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/19/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/3ed1b3374823b3ced3e707a0c5c08aec9ca3f4e8

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 3ed1b3374823b3ced3e707a0c5c08aec9ca3f4e8 Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Date: Wed, 7 Apr 2021 15:30:15 +0000
Subject: [PATCH] net/mlx4: fix RSS action with null hash key

[ upstream commit 4a750d29927e750b7197dc18fb9ebd9286324108 ]

If RSS action contains non zero hash key length and NULL
key buffer pointer the default hash key should be used.
The check for the NULL pointer this was missing in the mlx4
PMD causing crash, for example, in testpmd with command:

flow validate 0 ingress group 0
  pattern eth / ipv4 / end
  actions rss queues 0 end key_len 40 / end

Fixes: ac8d22de2394 ("ethdev: flatten RSS configuration in flow API")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx4/mlx4_flow.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c
index 2da4f6d965..b268c0fafa 100644
--- a/drivers/net/mlx4/mlx4_flow.c
+++ b/drivers/net/mlx4/mlx4_flow.c
@@ -792,7 +792,8 @@ fill:
 			rss = action->conf;
 			/* Default RSS configuration if none is provided. */
 			if (rss->key_len) {
-				rss_key = rss->key;
+				rss_key = rss->key ?
+					  rss->key : mlx4_rss_hash_key_default;
 				rss_key_len = rss->key_len;
 			} else {
 				rss_key = mlx4_rss_hash_key_default;
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:33.776854264 +0200
+++ 0111-net-mlx4-fix-RSS-action-with-null-hash-key.patch	2021-05-17 17:40:29.319810642 +0200
@@ -1 +1 @@
-From 4a750d29927e750b7197dc18fb9ebd9286324108 Mon Sep 17 00:00:00 2001
+From 3ed1b3374823b3ced3e707a0c5c08aec9ca3f4e8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4a750d29927e750b7197dc18fb9ebd9286324108 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 43a65abcc0..71ea91b3fb 100644
+index 2da4f6d965..b268c0fafa 100644
@@ -28 +29 @@
-@@ -791,7 +791,8 @@ fill:
+@@ -792,7 +792,8 @@ fill: