From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D8D2A04B5 for ; Tue, 3 Dec 2019 19:28:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6097A1BF8D; Tue, 3 Dec 2019 19:28:39 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 4FFEB235 for ; Tue, 3 Dec 2019 19:28:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p0JyeKSXp4g12wzVLa3FSVxOE4POBpwRCLMeN5tJUYc=; b=ZnSgj3WFL0uc8skhZViPXhDS2WShiVltxSFvwBfXCWhIlBBgmp9eFPhlNIWewqEn9xxJTm Vfkye59SyhJr+44YJxLQ8baOK0PMEXQ0+E/wE8RjS30Eekdg8tiButF/I7xhcVLgrKdhGL 8mV0rh6WGSrBA7mIkqK+6U0AYfkjmZU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-268-xdKD6Sf0NxOyZVMyWuCH-g-1; Tue, 03 Dec 2019 13:28:35 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE5FD1883521; Tue, 3 Dec 2019 18:28:34 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED5B45C3FA; Tue, 3 Dec 2019 18:28:33 +0000 (UTC) From: Kevin Traynor To: Rahul Lakkireddy Cc: dpdk stable Date: Tue, 3 Dec 2019 18:26:43 +0000 Message-Id: <20191203182714.17297-34-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: xdKD6Sf0NxOyZVMyWuCH-g-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/cxgbe: fix races on flow API operations' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 rebasi= ng (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/ed82f120ab3c82028b= 65b78e51b01cf02e210631 Thanks. Kevin. --- >From ed82f120ab3c82028b65b78e51b01cf02e210631 Mon Sep 17 00:00:00 2001 From: Rahul Lakkireddy 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 --- 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/adap= ter.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 { =09rte_spinlock_t win0_lock; =20 +=09rte_spinlock_t flow_lock; /* Serialize access for rte_flow ops */ + =09unsigned int clipt_start; /* CLIP table start */ =09unsigned 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, =09=09 struct rte_flow_error *e) { +=09struct adapter *adap =3D ethdev2adap(dev); =09struct rte_flow *flow; =09int ret; @@ -871,6 +872,8 @@ cxgbe_flow_create(struct rte_eth_dev *dev, =09} =20 +=09t4_os_lock(&adap->flow_lock); =09/* go, interact with cxgbe_filter */ =09ret =3D __cxgbe_flow_create(dev, flow); +=09t4_os_unlock(&adap->flow_lock); =09if (ret) { =09=09rte_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, =09=09 struct rte_flow_error *e) { +=09struct adapter *adap =3D ethdev2adap(dev); =09int ret; =20 +=09t4_os_lock(&adap->flow_lock); =09ret =3D __cxgbe_flow_destroy(dev, flow); +=09t4_os_unlock(&adap->flow_lock); =09if (ret) =09=09return 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_fl= ow *flow, =09=09 struct rte_flow_error *e) { +=09struct adapter *adap =3D ethdev2adap(flow->dev); =09struct ch_filter_specification fs; =09struct rte_flow_query_count *c; @@ -995,9 +1002,12 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_= flow *flow, =20 =09c =3D (struct rte_flow_query_count *)data; + +=09t4_os_lock(&adap->flow_lock); =09ret =3D __cxgbe_flow_query(flow, &c->hits, &c->bytes); -=09if (ret) -=09=09return rte_flow_error_set(e, -ret, RTE_FLOW_ERROR_TYPE_ACTION, -=09=09=09=09=09 f, "cxgbe pmd failed to" -=09=09=09=09=09 " perform query"); +=09if (ret) { +=09=09rte_flow_error_set(e, -ret, RTE_FLOW_ERROR_TYPE_ACTION, +=09=09=09=09 f, "cxgbe pmd failed to perform query"); +=09=09goto out; +=09} =20 =09/* Query was successful */ @@ -1005,5 +1015,7 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_= flow *flow, =09c->hits_set =3D 1; =20 -=09return 0; /* success / partial_success */ +out: +=09t4_os_unlock(&adap->flow_lock); +=09return ret; } =20 @@ -1018,5 +1030,5 @@ cxgbe_flow_validate(struct rte_eth_dev *dev, =09struct rte_flow *flow; =09unsigned int fidx; -=09int ret; +=09int ret =3D 0; =20 =09flow =3D t4_os_alloc(sizeof(struct rte_flow)); @@ -1042,18 +1054,21 @@ cxgbe_flow_validate(struct rte_eth_dev *dev, =09} =20 +=09t4_os_lock(&adap->flow_lock); =09if (cxgbe_get_fidx(flow, &fidx)) { -=09=09t4_os_free(flow); -=09=09return rte_flow_error_set(e, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE, -=09=09=09=09=09 NULL, "no memory in tcam."); +=09=09ret =3D rte_flow_error_set(e, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE, +=09=09=09=09=09 NULL, "no memory in tcam."); +=09=09goto out; =09} =20 =09if (cxgbe_verify_fidx(flow, fidx, 0)) { -=09=09t4_os_free(flow); -=09=09return rte_flow_error_set(e, EINVAL, RTE_FLOW_ERROR_TYPE_HANDLE, -=09=09=09=09=09 NULL, "validation failed"); +=09=09ret =3D rte_flow_error_set(e, EINVAL, RTE_FLOW_ERROR_TYPE_HANDLE, +=09=09=09=09=09 NULL, "validation failed"); +=09=09goto out; =09} =20 +out: +=09t4_os_unlock(&adap->flow_lock); =09t4_os_free(flow); -=09return 0; +=09return ret; } =20 @@ -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, -=09=09 struct rte_flow_error *e) +cxgbe_check_n_destroy(struct filter_entry *f, struct rte_eth_dev *dev) { =09if (f && (f->valid || f->pending) && =09 f->dev =3D=3D dev && /* Only if user has asked for this port */ =09 f->private) /* We (rte_flow) created this filter */ -=09=09return cxgbe_flow_destroy(dev, (struct rte_flow *)f->private, -=09=09=09=09=09 e); +=09=09return __cxgbe_flow_destroy(dev, (struct rte_flow *)f->private); =09return 1; } @@ -1081,11 +1094,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *dev= , struct rte_flow_error *e) =09int ret =3D 0; =20 +=09t4_os_lock(&adap->flow_lock); =09if (adap->tids.ftid_tab) { =09=09struct filter_entry *f =3D &adap->tids.ftid_tab[0]; =20 =09=09for (i =3D 0; i < adap->tids.nftids; i++, f++) { -=09=09=09ret =3D cxgbe_check_n_destroy(f, dev, e); -=09=09=09if (ret < 0) +=09=09=09ret =3D cxgbe_check_n_destroy(f, dev); +=09=09=09if (ret < 0) { +=09=09=09=09rte_flow_error_set(e, ret, +=09=09=09=09=09=09 RTE_FLOW_ERROR_TYPE_HANDLE, +=09=09=09=09=09=09 f->private, +=09=09=09=09=09=09 "error destroying TCAM " +=09=09=09=09=09=09 "filter."); =09=09=09=09goto out; +=09=09=09} =09=09} =09} @@ -1097,11 +1117,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *dev= , struct rte_flow_error *e) =09=09=09f =3D (struct filter_entry *)adap->tids.tid_tab[i]; =20 -=09=09=09ret =3D cxgbe_check_n_destroy(f, dev, e); -=09=09=09if (ret < 0) +=09=09=09ret =3D cxgbe_check_n_destroy(f, dev); +=09=09=09if (ret < 0) { +=09=09=09=09rte_flow_error_set(e, ret, +=09=09=09=09=09=09 RTE_FLOW_ERROR_TYPE_HANDLE, +=09=09=09=09=09=09 f->private, +=09=09=09=09=09=09 "error destroying HASH " +=09=09=09=09=09=09 "filter."); =09=09=09=09goto out; +=09=09=09} =09=09} =09} =20 out: +=09t4_os_unlock(&adap->flow_lock); =09return ret >=3D 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: =09} =20 +=09t4_os_lock_init(&adapter->flow_lock); + =09adapter->mpstcam =3D t4_init_mpstcam(adapter); =09if (!adapter->mpstcam) --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:53.798696617 +0000 +++ 0034-net-cxgbe-fix-races-on-flow-API-operations.patch=092019-12-03 17:2= 9: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@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 rt= e_flow *flow, @@ -72 +73,7 @@ -@@ -1160,9 +1166,12 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rt= e_flow *flow, +@@ -966,4 +972,5 @@ cxgbe_flow_query(struct rte_eth_dev *dev, struct rte_f= low *flow, + =09=09 struct rte_flow_error *e) + { ++=09struct adapter *adap =3D ethdev2adap(flow->dev); + =09struct ch_filter_specification fs; + =09struct 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, - =09=09cxgbe_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, + =09c->hits_set =3D 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 *de= v, struct rte_flow_error *e) +@@ -1081,11 +1094,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *de= v, struct rte_flow_error *e) @@ -170 +177 @@ -@@ -1264,11 +1283,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *de= v, struct rte_flow_error *e) +@@ -1097,11 +1117,18 @@ static int cxgbe_flow_flush(struct rte_eth_dev *de= v, 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: