[dpdk-stable] patch 'net/cxgbe: fix races on flow API operations' has been queued to LTS release 18.11.6
Kevin Traynor
ktraynor at redhat.com
Tue Dec 3 19:26:43 CET 2019
Hi,
FYI, your patch has been queued to LTS release 18.11.6
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/10/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/ed82f120ab3c82028b65b78e51b01cf02e210631
Thanks.
Kevin.
---
>From ed82f120ab3c82028b65b78e51b01cf02e210631 Mon Sep 17 00:00:00 2001
From: Rahul Lakkireddy <rahul.lakkireddy at chelsio.com>
Date: Fri, 4 Oct 2019 19:54:17 +0530
Subject: [PATCH] net/cxgbe: fix races on flow API operations
[ upstream commit 97e02581a15bade3f3f943cd16a965a577746006 ]
When rules are being inserted from multiple cores, there are several
race conditions during rte_flow operations.
For example, when inserting rules from 2 cores simultaneously, both
the cores try to fetch a free available filter entry and they both
end up fetching the same entry. Both of them start overwriting the
same filter entry before sending to firmware, which results in wrong
rule being inserted to hardware.
Fix the races by adding spinlock to serialize the rte_flow operations.
Fixes: ee61f5113b17 ("net/cxgbe: parse and validate flows")
Fixes: 9eb2c9a48072 ("net/cxgbe: implement flow create operation")
Fixes: da23bc9d33f4 ("net/cxgbe: implement flow destroy operation")
Fixes: 8d3c12e19368 ("net/cxgbe: implement flow query operation")
Fixes: 86910379d335 ("net/cxgbe: implement flow flush operation")
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy at chelsio.com>
---
drivers/net/cxgbe/base/adapter.h | 2 +
drivers/net/cxgbe/cxgbe_flow.c | 69 ++++++++++++++++++++++----------
drivers/net/cxgbe/cxgbe_main.c | 2 +
3 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/drivers/net/cxgbe/base/adapter.h b/drivers/net/cxgbe/base/adapter.h
index 063e5bd7c..a232b7cd3 100644
--- a/drivers/net/cxgbe/base/adapter.h
+++ b/drivers/net/cxgbe/base/adapter.h
@@ -323,4 +323,6 @@ struct adapter {
rte_spinlock_t win0_lock;
+ rte_spinlock_t flow_lock; /* Serialize access for rte_flow ops */
+
unsigned int clipt_start; /* CLIP table start */
unsigned int clipt_end; /* CLIP table end */
diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c
index f130c7eb4..b6250a2a9 100644
--- a/drivers/net/cxgbe/cxgbe_flow.c
+++ b/drivers/net/cxgbe/cxgbe_flow.c
@@ -851,4 +851,5 @@ cxgbe_flow_create(struct rte_eth_dev *dev,
struct rte_flow_error *e)
{
+ struct adapter *adap = ethdev2adap(dev);
struct rte_flow *flow;
int ret;
@@ -871,6 +872,8 @@ cxgbe_flow_create(struct rte_eth_dev *dev,
}
+ t4_os_lock(&adap->flow_lock);
/* go, interact with cxgbe_filter */
ret = __cxgbe_flow_create(dev, flow);
+ t4_os_unlock(&adap->flow_lock);
if (ret) {
rte_flow_error_set(e, ret, RTE_FLOW_ERROR_TYPE_HANDLE,
@@ -937,7 +940,10 @@ cxgbe_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow,
struct rte_flow_error *e)
{
+ struct adapter *adap = ethdev2adap(dev);
int ret;
+ t4_os_lock(&adap->flow_lock);
ret = __cxgbe_flow_destroy(dev, flow);
+ t4_os_unlock(&adap->flow_lock);
if (ret)
return rte_flow_error_set(e, ret, RTE_FLOW_ERROR_TYPE_HANDLE,
@@ -966,4 +972,5 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow,
struct rte_flow_error *e)
{
+ struct adapter *adap = ethdev2adap(flow->dev);
struct ch_filter_specification fs;
struct rte_flow_query_count *c;
@@ -995,9 +1002,12 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow,
c = (struct rte_flow_query_count *)data;
+
+ t4_os_lock(&adap->flow_lock);
ret = __cxgbe_flow_query(flow, &c->hits, &c->bytes);
- if (ret)
- return rte_flow_error_set(e, -ret, RTE_FLOW_ERROR_TYPE_ACTION,
- f, "cxgbe pmd failed to"
- " perform query");
+ if (ret) {
+ rte_flow_error_set(e, -ret, RTE_FLOW_ERROR_TYPE_ACTION,
+ f, "cxgbe pmd failed to perform query");
+ goto out;
+ }
/* Query was successful */
@@ -1005,5 +1015,7 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow,
c->hits_set = 1;
- return 0; /* success / partial_success */
+out:
+ t4_os_unlock(&adap->flow_lock);
+ return ret;
}
@@ -1018,5 +1030,5 @@ cxgbe_flow_validate(struct rte_eth_dev *dev,
struct rte_flow *flow;
unsigned int fidx;
- int ret;
+ int ret = 0;
flow = t4_os_alloc(sizeof(struct rte_flow));
@@ -1042,18 +1054,21 @@ cxgbe_flow_validate(struct rte_eth_dev *dev,
}
+ t4_os_lock(&adap->flow_lock);
if (cxgbe_get_fidx(flow, &fidx)) {
- t4_os_free(flow);
- return rte_flow_error_set(e, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE,
- NULL, "no memory in tcam.");
+ ret = rte_flow_error_set(e, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE,
+ NULL, "no memory in tcam.");
+ goto out;
}
if (cxgbe_verify_fidx(flow, fidx, 0)) {
- t4_os_free(flow);
- return rte_flow_error_set(e, EINVAL, RTE_FLOW_ERROR_TYPE_HANDLE,
- NULL, "validation failed");
+ ret = rte_flow_error_set(e, EINVAL, RTE_FLOW_ERROR_TYPE_HANDLE,
+ NULL, "validation failed");
+ goto out;
}
+out:
+ t4_os_unlock(&adap->flow_lock);
t4_os_free(flow);
- return 0;
+ return ret;
}
@@ -1064,12 +1079,10 @@ cxgbe_flow_validate(struct rte_eth_dev *dev,
*/
static int
-cxgbe_check_n_destroy(struct filter_entry *f, struct rte_eth_dev *dev,
- struct rte_flow_error *e)
+cxgbe_check_n_destroy(struct filter_entry *f, struct rte_eth_dev *dev)
{
if (f && (f->valid || f->pending) &&
f->dev == dev && /* Only if user has asked for this port */
f->private) /* We (rte_flow) created this filter */
- return cxgbe_flow_destroy(dev, (struct rte_flow *)f->private,
- e);
+ return __cxgbe_flow_destroy(dev, (struct rte_flow *)f->private);
return 1;
}
@@ -1081,11 +1094,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *e)
int ret = 0;
+ t4_os_lock(&adap->flow_lock);
if (adap->tids.ftid_tab) {
struct filter_entry *f = &adap->tids.ftid_tab[0];
for (i = 0; i < adap->tids.nftids; i++, f++) {
- ret = cxgbe_check_n_destroy(f, dev, e);
- if (ret < 0)
+ ret = cxgbe_check_n_destroy(f, dev);
+ if (ret < 0) {
+ rte_flow_error_set(e, ret,
+ RTE_FLOW_ERROR_TYPE_HANDLE,
+ f->private,
+ "error destroying TCAM "
+ "filter.");
goto out;
+ }
}
}
@@ -1097,11 +1117,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *e)
f = (struct filter_entry *)adap->tids.tid_tab[i];
- ret = cxgbe_check_n_destroy(f, dev, e);
- if (ret < 0)
+ ret = cxgbe_check_n_destroy(f, dev);
+ if (ret < 0) {
+ rte_flow_error_set(e, ret,
+ RTE_FLOW_ERROR_TYPE_HANDLE,
+ f->private,
+ "error destroying HASH "
+ "filter.");
goto out;
+ }
}
}
out:
+ t4_os_unlock(&adap->flow_lock);
return ret >= 0 ? 0 : ret;
}
diff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c
index 2cc4b6d91..76997e71f 100644
--- a/drivers/net/cxgbe/cxgbe_main.c
+++ b/drivers/net/cxgbe/cxgbe_main.c
@@ -1890,4 +1890,6 @@ allocate_mac:
}
+ t4_os_lock_init(&adapter->flow_lock);
+
adapter->mpstcam = t4_init_mpstcam(adapter);
if (!adapter->mpstcam)
--
2.21.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-12-03 17:29:53.798696617 +0000
+++ 0034-net-cxgbe-fix-races-on-flow-API-operations.patch 2019-12-03 17:29:51.760749745 +0000
@@ -1 +1 @@
-From 97e02581a15bade3f3f943cd16a965a577746006 Mon Sep 17 00:00:00 2001
+From ed82f120ab3c82028b65b78e51b01cf02e210631 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 97e02581a15bade3f3f943cd16a965a577746006 ]
+
@@ -22 +23,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
- drivers/net/cxgbe/cxgbe_flow.c | 68 ++++++++++++++++++++++----------
+ drivers/net/cxgbe/cxgbe_flow.c | 69 ++++++++++++++++++++++----------
@@ -29 +30 @@
- 3 files changed, 51 insertions(+), 21 deletions(-)
+ 3 files changed, 52 insertions(+), 21 deletions(-)
@@ -32 +33 @@
-index 6758364c7..db654ad9c 100644
+index 063e5bd7c..a232b7cd3 100644
@@ -35 +36 @@
-@@ -329,4 +329,6 @@ struct adapter {
+@@ -323,4 +323,6 @@ struct adapter {
@@ -43 +44 @@
-index 9ee8353ae..9070f4960 100644
+index f130c7eb4..b6250a2a9 100644
@@ -46 +47 @@
-@@ -1015,4 +1015,5 @@ cxgbe_flow_create(struct rte_eth_dev *dev,
+@@ -851,4 +851,5 @@ cxgbe_flow_create(struct rte_eth_dev *dev,
@@ -52 +53 @@
-@@ -1035,6 +1036,8 @@ cxgbe_flow_create(struct rte_eth_dev *dev,
+@@ -871,6 +872,8 @@ cxgbe_flow_create(struct rte_eth_dev *dev,
@@ -61 +62 @@
-@@ -1101,7 +1104,10 @@ cxgbe_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow,
+@@ -937,7 +940,10 @@ cxgbe_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow,
@@ -72 +73,7 @@
-@@ -1160,9 +1166,12 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow,
+@@ -966,4 +972,5 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow,
+ struct rte_flow_error *e)
+ {
++ struct adapter *adap = ethdev2adap(flow->dev);
+ struct ch_filter_specification fs;
+ struct rte_flow_query_count *c;
+@@ -995,9 +1002,12 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow,
@@ -89,2 +96,2 @@
-@@ -1172,5 +1181,7 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow,
- cxgbe_clear_filter_count(adap, flow->fidx, f->fs.cap, true);
+@@ -1005,5 +1015,7 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_flow *flow,
+ c->hits_set = 1;
@@ -98 +105 @@
-@@ -1185,5 +1196,5 @@ cxgbe_flow_validate(struct rte_eth_dev *dev,
+@@ -1018,5 +1030,5 @@ cxgbe_flow_validate(struct rte_eth_dev *dev,
@@ -105 +112 @@
-@@ -1209,18 +1220,21 @@ cxgbe_flow_validate(struct rte_eth_dev *dev,
+@@ -1042,18 +1054,21 @@ cxgbe_flow_validate(struct rte_eth_dev *dev,
@@ -134 +141 @@
-@@ -1231,12 +1245,10 @@ cxgbe_flow_validate(struct rte_eth_dev *dev,
+@@ -1064,12 +1079,10 @@ cxgbe_flow_validate(struct rte_eth_dev *dev,
@@ -149 +156 @@
-@@ -1248,11 +1260,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *e)
+@@ -1081,11 +1094,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *e)
@@ -170 +177 @@
-@@ -1264,11 +1283,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *e)
+@@ -1097,11 +1117,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *e)
@@ -192 +199 @@
-index f6967a3e4..cc5f4df3a 100644
+index 2cc4b6d91..76997e71f 100644
@@ -195 +202 @@
-@@ -1907,4 +1907,6 @@ allocate_mac:
+@@ -1890,4 +1890,6 @@ allocate_mac:
More information about the stable
mailing list