[dpdk-stable] patch 'net/sfc/base: fix field order in filter spec struct' has been queued to stable release 18.08.1

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/08/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 74346fda9eb6067033bd31aee4bbf09bfc5b458c Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Tue, 13 Nov 2018 15:02:44 +0000
Subject: [PATCH] net/sfc/base: fix field order in filter spec struct

[ upstream commit f7c8539801480bf39f1792daf562c664ee6ad37b ]

Fields in the struct efx_filter_spec_t starting from efs_outer_vid
are hashed for software filter lookup. efs_mark is not a matching
criteria. Exclude efs_mark from hash.

Fixes: 5f78af523912 ("net/sfc: support MARK and FLAG actions in flow API")

Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/sfc/base/efx.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 24fdd867d..13e0c92e7 100644
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -2705,4 +2705,6 @@ typedef struct efx_filter_spec_s {
 	uint16_t			efs_dmaq_id;
 	uint32_t			efs_rss_context;
+	uint32_t			efs_mark;
+	/* Fields below here are hashed for software filter lookup */
 	uint16_t			efs_outer_vid;
 	uint16_t			efs_inner_vid;
@@ -2718,5 +2720,4 @@ typedef struct efx_filter_spec_s {
 	uint8_t				efs_vni_or_vsid[EFX_VNI_OR_VSID_LEN];
 	uint8_t				efs_ifrm_loc_mac[EFX_MAC_ADDR_LEN];
-	uint32_t			efs_mark;
 } efx_filter_spec_t;
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 13:11:35.714214168 +0000
+++ 0026-net-sfc-base-fix-field-order-in-filter-spec-struct.patch	2018-11-29 13:11:34.000000000 +0000
@@ -1,14 +1,15 @@
-From f7c8539801480bf39f1792daf562c664ee6ad37b Mon Sep 17 00:00:00 2001
+From 74346fda9eb6067033bd31aee4bbf09bfc5b458c Mon Sep 17 00:00:00 2001
 From: Igor Romanov <igor.romanov@oktetlabs.ru>
 Date: Tue, 13 Nov 2018 15:02:44 +0000
 Subject: [PATCH] net/sfc/base: fix field order in filter spec struct
 
+[ upstream commit f7c8539801480bf39f1792daf562c664ee6ad37b ]
+
 Fields in the struct efx_filter_spec_t starting from efs_outer_vid
 are hashed for software filter lookup. efs_mark is not a matching
 criteria. Exclude efs_mark from hash.
 
 Fixes: 5f78af523912 ("net/sfc: support MARK and FLAG actions in flow API")
-Cc: stable@dpdk.org
 
 Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
@@ -17,17 +18,17 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
-index 8e10e8934..2e847b6ce 100644
+index 24fdd867d..13e0c92e7 100644
 --- a/drivers/net/sfc/base/efx.h
 +++ b/drivers/net/sfc/base/efx.h
-@@ -2879,4 +2879,6 @@ typedef struct efx_filter_spec_s {
+@@ -2705,4 +2705,6 @@ typedef struct efx_filter_spec_s {
  	uint16_t			efs_dmaq_id;
  	uint32_t			efs_rss_context;
 +	uint32_t			efs_mark;
 +	/* Fields below here are hashed for software filter lookup */
  	uint16_t			efs_outer_vid;
  	uint16_t			efs_inner_vid;
-@@ -2892,5 +2894,4 @@ typedef struct efx_filter_spec_s {
+@@ -2718,5 +2720,4 @@ typedef struct efx_filter_spec_s {
  	uint8_t				efs_vni_or_vsid[EFX_VNI_OR_VSID_LEN];
  	uint8_t				efs_ifrm_loc_mac[EFX_MAC_ADDR_LEN];
 -	uint32_t			efs_mark;