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 E7B41A04F5 for ; Wed, 11 Dec 2019 22:28:14 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB84B1BE80; Wed, 11 Dec 2019 22:28:14 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 74FF52C6A for ; Wed, 11 Dec 2019 22:28:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099693; 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=zmZr29SiOPaRHIhIl+qjMMk/JxAldZAiRc/RpEvOXjU=; b=hbJVsZny8x84/7t/GSlZcpVTctY9eHdEJV4Ls0jL1q7YA4hvRQiMC8LwA3UL63mcmelrO7 q8EuM2lHU4xC5cp6AoK57ZJ7e7Y6rLbe3mBrQ3HlCn1kjKMauSQapPudlc633q/eAlnKys IJuR2Cqu0OAobqe3d0JXOCAj/fCATiY= 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-377-Abu8pE-uNjaM0l37K-tZqA-1; Wed, 11 Dec 2019 16:28:11 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C920100551A; Wed, 11 Dec 2019 21:28:10 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A76710013A1; Wed, 11 Dec 2019 21:28:08 +0000 (UTC) From: Kevin Traynor To: Ivan Malov Cc: Andrew Rybchenko , dpdk stable Date: Wed, 11 Dec 2019 21:26:12 +0000 Message-Id: <20191211212702.27851-20-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: Abu8pE-uNjaM0l37K-tZqA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/sfc: fix adapter lock usage on rule creation' 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/17/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/0f527b4d01518354f0= 3662fcdcb53c85b783c0d6 Thanks. Kevin. --- >From 0f527b4d01518354f03662fcdcb53c85b783c0d6 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Sun, 3 Nov 2019 13:33:09 +0300 Subject: [PATCH] net/sfc: fix adapter lock usage on rule creation [ upstream commit 653b285ff11380c44c96a92bedf08fe1614a2fdc ] The point is that adapter lock has to be held on list accesses, as well as when talking to the HW. Fixes: a9825ccf5bb8 ("net/sfc: support flow API filters") Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c index 371648b0e..1811852fc 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c @@ -2315,8 +2315,8 @@ sfc_flow_create(struct rte_eth_dev *dev, =09=09goto fail_bad_value; =20 +=09sfc_adapter_lock(sa); + =09TAILQ_INSERT_TAIL(&sa->filter.flow_list, flow, entries); =20 -=09sfc_adapter_lock(sa); - =09if (sa->state =3D=3D SFC_ADAPTER_STARTED) { =09=09rc =3D sfc_flow_filter_insert(sa, flow); --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:14.324704421 +0000 +++ 0020-net-sfc-fix-adapter-lock-usage-on-rule-creation.patch=092019-12-11= 21:24:12.613652333 +0000 @@ -1 +1 @@ -From 653b285ff11380c44c96a92bedf08fe1614a2fdc Mon Sep 17 00:00:00 2001 +From 0f527b4d01518354f03662fcdcb53c85b783c0d6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 653b285ff11380c44c96a92bedf08fe1614a2fdc ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index e4a9ba0ff..8d636f692 100644 +index 371648b0e..1811852fc 100644 @@ -22 +23 @@ -@@ -2316,8 +2316,8 @@ sfc_flow_create(struct rte_eth_dev *dev, +@@ -2315,8 +2315,8 @@ sfc_flow_create(struct rte_eth_dev *dev,