[dpdk-stable] patch 'net/enic: fix filter type used for flow API' has been queued to stable release 20.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.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 02/11/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/6c8be34e6acee1caf4658ad6e5123f3d2a385b00

Thanks.

Luca Boccassi

---
>From 6c8be34e6acee1caf4658ad6e5123f3d2a385b00 Mon Sep 17 00:00:00 2001
From: Hyong Youb Kim <hyonkim at cisco.com>
Date: Mon, 1 Feb 2021 16:24:23 -0800
Subject: [PATCH] net/enic: fix filter type used for flow API

[ upstream commit d700f0d0d7074c76a94c0278315acb86f9ea30ba ]

The filter type (struct filter_v2.type) should always be set to
FILTER_DPDK_1, when advanced filtering is enabled in firmware.
Otherwise, for some old firmware versions, the driver sets
it to FILTER_USNIC_IP, and attempts to install filters fail. This
behavior matches that of the now-removed flow director implementation
(enic_clsf.c).

Fixes: 26faa126d87e ("net/enic: flow API for NICs with advanced filters disabled")

Signed-off-by: Hyong Youb Kim <hyonkim at cisco.com>
Reviewed-by: John Daley <johndale at cisco.com>
---
 drivers/net/enic/enic_flow.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c
index cebca7d55a..453c11a3b3 100644
--- a/drivers/net/enic/enic_flow.c
+++ b/drivers/net/enic/enic_flow.c
@@ -1595,6 +1595,8 @@ enic_flow_parse(struct rte_eth_dev *dev,
 		return -rte_errno;
 	}
 	enic_filter->type = enic->flow_filter_mode;
+	if (enic->adv_filters)
+		enic_filter->type = FILTER_DPDK_1;
 	ret = enic_copy_filter(pattern, enic_filter_cap, enic,
 				       enic_filter, error);
 	return ret;
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-09 10:34:58.101345440 +0000
+++ 0004-net-enic-fix-filter-type-used-for-flow-API.patch	2021-02-09 10:34:57.854582918 +0000
@@ -1 +1 @@
-From d700f0d0d7074c76a94c0278315acb86f9ea30ba Mon Sep 17 00:00:00 2001
+From 6c8be34e6acee1caf4658ad6e5123f3d2a385b00 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d700f0d0d7074c76a94c0278315acb86f9ea30ba ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 97ee7509ce..7eb06f889e 100644
+index cebca7d55a..453c11a3b3 100644
@@ -26 +27 @@
-@@ -1598,6 +1598,8 @@ enic_flow_parse(struct rte_eth_dev *dev,
+@@ -1595,6 +1595,8 @@ enic_flow_parse(struct rte_eth_dev *dev,