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 65277A04F0 for ; Thu, 19 Dec 2019 15:41:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 59E0B1BF74; Thu, 19 Dec 2019 15:41:43 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 7E7FC1BF74 for ; Thu, 19 Dec 2019 15:41:41 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id t14so5855318wmi.5 for ; Thu, 19 Dec 2019 06:41:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9W8tsIx6qVrwdAT8/4+1fAWN/CKlvjGUykD+VQEGv98=; b=JiLW9lP05kav3j5pgVCFt5daEaqi1fbAHqT13TATxLdwnrjFz9GRJQHBnwG3iQzJWU m0lh0vE4EGKHBQj8TUffNa0D2y9JsK6DXMW5Op5Qz63fo3kUVvw7hjhYEBbACifIU2K3 avsFRu0f1JMN2xsGMpepO/3qCsENduhQSD2lbTcgPFfLLxUy8N+stkPZWRKiWyX3c02c fJlIsBZtpO0BHrSrHAEZhwOjfI2DOdX7SwTboxP+yt6KwFryV9nSdGtMm2tWo+mXCg5A WNdizVqvIGcVurD55hbXMV5jhSKxUTNeTKKz865TwnUyikj7k3vOmZejQGn0CVbsgViC t/VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9W8tsIx6qVrwdAT8/4+1fAWN/CKlvjGUykD+VQEGv98=; b=onCQ+jnUDJIodTi4FIeGR5p96IhZ7CMZn8sY9/QzKb3SpYT0fZOLTWl0W1gDwkxU3A PPL1ScF0J2eXmBa/QNgUQwsr1deaGRNZkSl6dEkjD9/7DCl0dSk0qnaoDxK57nEeA2Vy 4UmvOJetPsOimcGH5O/nY32gFqsAworbIw+sgbY4cUNWdkM0fUVBLo7hHcWygEUY5mYU LyAtyD6R6IxSdm8xAUH8e3mAWbmug49JCqgfNrsaiAUyVNSRsYuESdfGzeNeVMjDq+i/ JA3hhsZfqtFrBB1jsybD54WJqJkgF64YSfazLslau6um0kaInlbHtfRHLgnDRROFZ7fB NUvA== X-Gm-Message-State: APjAAAUGwFMkx8AXxQeTtfS6X1KmiKSCYG2/EQP7q9hceUZ0MD35J5TU NzFVvLtZNdUGf/ZIBBi+dgk= X-Google-Smtp-Source: APXvYqxYoaECrldI4ik4hrcm+nMrtomyI1Z2H7xPn1oMaJKwVdrfebDH0QJFcZuHlvc6seYBjJASUQ== X-Received: by 2002:a7b:cd82:: with SMTP id y2mr10781998wmj.58.1576766501258; Thu, 19 Dec 2019 06:41:41 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p7sm6334737wmp.31.2019.12.19.06.41.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:41:40 -0800 (PST) From: luca.boccassi@gmail.com To: Ivan Malov Cc: Andrew Rybchenko , dpdk stable Date: Thu, 19 Dec 2019 14:34:23 +0000 Message-Id: <20191219143447.21506-116-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: fix adapter lock usage on rule creation' has been queued to LTS release 17.11.10 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 17.11.10 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/21/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. Thanks. Luca Boccassi --- >From 54bbd54fd2eacadb328e1286015ecf8706400eaf 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 90ef5bf204..9d46abeb6f 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c @@ -1185,10 +1185,10 @@ sfc_flow_create(struct rte_eth_dev *dev, if (rc != 0) goto fail_bad_value; + sfc_adapter_lock(sa); + TAILQ_INSERT_TAIL(&sa->filter.flow_list, flow, entries); - sfc_adapter_lock(sa); - if (sa->state == SFC_ADAPTER_STARTED) { rc = sfc_flow_filter_insert(sa, flow); if (rc != 0) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:30.943652508 +0000 +++ 0116-net-sfc-fix-adapter-lock-usage-on-rule-creation.patch 2019-12-19 14:32:26.293301553 +0000 @@ -1,13 +1,14 @@ -From 653b285ff11380c44c96a92bedf08fe1614a2fdc Mon Sep 17 00:00:00 2001 +From 54bbd54fd2eacadb328e1286015ecf8706400eaf 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") -Cc: stable@dpdk.org Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko @@ -16,10 +17,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c -index e4a9ba0ff9..8d636f6923 100644 +index 90ef5bf204..9d46abeb6f 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c -@@ -2315,10 +2315,10 @@ sfc_flow_create(struct rte_eth_dev *dev, +@@ -1185,10 +1185,10 @@ sfc_flow_create(struct rte_eth_dev *dev, if (rc != 0) goto fail_bad_value;