[dpdk-stable] patch 'net/sfc: set FDIR bit for flow mark in EF100 Rx' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/12/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/ed49cafb257e1141fc6cf518e2ab5330bdd93fd8

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From ed49cafb257e1141fc6cf518e2ab5330bdd93fd8 Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at oktetlabs.ru>
Date: Mon, 30 Aug 2021 17:35:42 +0300
Subject: [PATCH] net/sfc: set FDIR bit for flow mark in EF100 Rx
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 142dd26a2fbd909f8d10ca25b1e698cd41a2667f ]

According to flow action MARK definition, PMDs must set both
PKT_RX_FDIR and PKT_RX_FDIR_ID if the packet contains a mark.

Fixes: 1aacc3d388d3 ("net/sfc: support user mark and flag Rx for EF100")

Signed-off-by: Ivan Malov <ivan.malov at oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
 drivers/net/sfc/sfc_ef100_rx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/sfc/sfc_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c
index f5fa629f90..061077bcf4 100644
--- a/drivers/net/sfc/sfc_ef100_rx.c
+++ b/drivers/net/sfc/sfc_ef100_rx.c
@@ -413,7 +413,7 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,
 		user_mark = EFX_OWORD_FIELD(rx_prefix[0],
 					    ESF_GZ_RX_PREFIX_USER_MARK);
 		if (user_mark != SFC_EF100_USER_MARK_INVALID) {
-			ol_flags |= PKT_RX_FDIR_ID;
+			ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
 			m->hash.fdir.hi = user_mark;
 		}
 	}
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:03.767510974 +0800
+++ 0037-net-sfc-set-FDIR-bit-for-flow-mark-in-EF100-Rx.patch	2021-11-10 14:17:01.784080133 +0800
@@ -1 +1 @@
-From 142dd26a2fbd909f8d10ca25b1e698cd41a2667f Mon Sep 17 00:00:00 2001
+From ed49cafb257e1141fc6cf518e2ab5330bdd93fd8 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 142dd26a2fbd909f8d10ca25b1e698cd41a2667f ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index d4cb96881c..1bf04f565a 100644
+index f5fa629f90..061077bcf4 100644
@@ -22 +24 @@
-@@ -414,7 +414,7 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,
+@@ -413,7 +413,7 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,