[dpdk-stable] patch 'net/sfc/base: fix manual filter delete in EF10' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

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/29/20. 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.

Thanks.

Luca Boccassi

---
>From 696a40bd944c63b038c0b0f1b370c5f9ba52b8ee Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at oktetlabs.ru>
Date: Wed, 20 May 2020 14:59:52 +0100
Subject: [PATCH] net/sfc/base: fix manual filter delete in EF10

[ upstream commit 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 ]

When user requests a filter deletion only filter with
manual priority must be deleted. When an automatic filter has
the same specification, it must be skipped.

Fixes: 585c22edb29c ("net/sfc/base: handle manual and auto filter clashes in EF10")

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

diff --git a/drivers/net/sfc/base/ef10_filter.c b/drivers/net/sfc/base/ef10_filter.c
index 12802a3d13..158e77e3bb 100644
--- a/drivers/net/sfc/base/ef10_filter.c
+++ b/drivers/net/sfc/base/ef10_filter.c
@@ -1161,7 +1161,8 @@ ef10_filter_delete(
 		i = (hash + depth) & (EFX_EF10_FILTER_TBL_ROWS - 1);
 		saved_spec = ef10_filter_entry_spec(table, i);
 		if (saved_spec && ef10_filter_equal(spec, saved_spec) &&
-		    ef10_filter_same_dest(spec, saved_spec)) {
+		    ef10_filter_same_dest(spec, saved_spec) &&
+		    saved_spec->efs_priority == EFX_FILTER_PRI_MANUAL) {
 			break;
 		}
 		if (depth == EF10_FILTER_SEARCH_LIMIT) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-27 10:23:31.955299567 +0100
+++ 0009-net-sfc-base-fix-manual-filter-delete-in-EF10.patch	2020-05-27 10:23:31.639933832 +0100
@@ -1,14 +1,15 @@
-From 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 Mon Sep 17 00:00:00 2001
+From 696a40bd944c63b038c0b0f1b370c5f9ba52b8ee Mon Sep 17 00:00:00 2001
 From: Igor Romanov <igor.romanov at oktetlabs.ru>
 Date: Wed, 20 May 2020 14:59:52 +0100
 Subject: [PATCH] net/sfc/base: fix manual filter delete in EF10
 
+[ upstream commit 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 ]
+
 When user requests a filter deletion only filter with
 manual priority must be deleted. When an automatic filter has
 the same specification, it must be skipped.
 
 Fixes: 585c22edb29c ("net/sfc/base: handle manual and auto filter clashes in EF10")
-Cc: stable at dpdk.org
 
 Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -17,7 +18,7 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/sfc/base/ef10_filter.c b/drivers/net/sfc/base/ef10_filter.c
-index 7a726ef977..12c84a5640 100644
+index 12802a3d13..158e77e3bb 100644
 --- a/drivers/net/sfc/base/ef10_filter.c
 +++ b/drivers/net/sfc/base/ef10_filter.c
 @@ -1161,7 +1161,8 @@ ef10_filter_delete(