[dpdk-stable] patch 'net/enic: remove flow locks' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 06/27/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/f1b12756062767c1974eecc452f205c51141cfa4

Thanks.

Kevin Traynor

---
>From f1b12756062767c1974eecc452f205c51141cfa4 Mon Sep 17 00:00:00 2001
From: John Daley <johndale at cisco.com>
Date: Thu, 6 Jun 2019 08:26:58 -0700
Subject: [PATCH] net/enic: remove flow locks

[ upstream commit 889dcfd57145250b4de1b79b728e8c04098efa09 ]

There is no requirement for thread safety in the flow PMD code and no
need for the locks.

Fixes: 6ced137607d0 ("net/enic: flow API for NICs with advanced filters enabled")

Signed-off-by: John Daley <johndale at cisco.com>
Reviewed-by: Hyong Youb Kim <hyonkim at cisco.com>
---
 drivers/net/enic/enic.h      | 1 -
 drivers/net/enic/enic_flow.c | 6 ------
 drivers/net/enic/enic_main.c | 1 -
 3 files changed, 8 deletions(-)

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index d4c460343..49831b00a 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -172,5 +172,4 @@ struct enic {
 
 	LIST_HEAD(enic_flows, rte_flow) flows;
-	rte_spinlock_t flows_lock;
 
 	/* RSS */
diff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c
index c32f79bcf..ada570844 100644
--- a/drivers/net/enic/enic_flow.c
+++ b/drivers/net/enic/enic_flow.c
@@ -1616,10 +1616,8 @@ enic_flow_create(struct rte_eth_dev *dev,
 		return NULL;
 
-	rte_spinlock_lock(&enic->flows_lock);
 	flow = enic_flow_add_filter(enic, &enic_filter, &enic_action,
 				    error);
 	if (flow)
 		LIST_INSERT_HEAD(&enic->flows, flow, next);
-	rte_spinlock_unlock(&enic->flows_lock);
 
 	return flow;
@@ -1640,8 +1638,6 @@ enic_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow,
 	FLOW_TRACE();
 
-	rte_spinlock_lock(&enic->flows_lock);
 	enic_flow_del_filter(enic, flow, error);
 	LIST_REMOVE(flow, next);
-	rte_spinlock_unlock(&enic->flows_lock);
 	rte_free(flow);
 	return 0;
@@ -1662,5 +1658,4 @@ enic_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
 	FLOW_TRACE();
 
-	rte_spinlock_lock(&enic->flows_lock);
 
 	while (!LIST_EMPTY(&enic->flows)) {
@@ -1670,5 +1665,4 @@ enic_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
 		rte_free(flow);
 	}
-	rte_spinlock_unlock(&enic->flows_lock);
 	return 0;
 }
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 44d2b2e78..5fb5122da 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1681,5 +1681,4 @@ static int enic_dev_init(struct enic *enic)
 
 	LIST_INIT(&enic->flows);
-	rte_spinlock_init(&enic->flows_lock);
 
 	/* set up link status checking */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-06-24 16:18:56.950284023 +0100
+++ 0036-net-enic-remove-flow-locks.patch	2019-06-24 16:18:55.066430397 +0100
@@ -1 +1 @@
-From 889dcfd57145250b4de1b79b728e8c04098efa09 Mon Sep 17 00:00:00 2001
+From f1b12756062767c1974eecc452f205c51141cfa4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 889dcfd57145250b4de1b79b728e8c04098efa09 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 859d018a0..5a92508f0 100644
+index d4c460343..49831b00a 100644
@@ -24 +25 @@
-@@ -170,5 +170,4 @@ struct enic {
+@@ -172,5 +172,4 @@ struct enic {
@@ -31 +32 @@
-index f389677c0..06796201d 100644
+index c32f79bcf..ada570844 100644
@@ -34 +35 @@
-@@ -1738,10 +1738,8 @@ enic_flow_create(struct rte_eth_dev *dev,
+@@ -1616,10 +1616,8 @@ enic_flow_create(struct rte_eth_dev *dev,
@@ -45 +46 @@
-@@ -1762,8 +1760,6 @@ enic_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow,
+@@ -1640,8 +1638,6 @@ enic_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow,
@@ -54 +55 @@
-@@ -1784,5 +1780,4 @@ enic_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
+@@ -1662,5 +1658,4 @@ enic_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
@@ -60 +61 @@
-@@ -1792,5 +1787,4 @@ enic_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
+@@ -1670,5 +1665,4 @@ enic_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
@@ -67 +68 @@
-index 2d6761bdd..c68d388dc 100644
+index 44d2b2e78..5fb5122da 100644
@@ -70 +71 @@
-@@ -1680,5 +1680,4 @@ static int enic_dev_init(struct enic *enic)
+@@ -1681,5 +1681,4 @@ static int enic_dev_init(struct enic *enic)