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 BC2B6A04A4 for ; Wed, 27 May 2020 11:24:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4A2831D8F7; Wed, 27 May 2020 11:24:55 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id D618F1D8F2 for ; Wed, 27 May 2020 11:24:53 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id e1so23291125wrt.5 for ; Wed, 27 May 2020 02:24:53 -0700 (PDT) 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=gtKEMPUnN8AsVoi6PDZIZK7DpKQ9lOnfmcjZr0YM9UQ=; b=jFMMNeelqpsmAtg0g+Y7W8brbpWvIGp2h28plbCYIgUmjUlXds+2MRz+gfGhu4rkig FkqVPbCHudm+WQ7MUKrEgPOpXWRXco9L0D9DB82W3mlz5TdOohDyHTc2WHojs821fssW vB8CbcVX/a72zITXzmNSfkxO6Kz4HzQi6N3e10LbRon5LbN/J2CD7+RI3eTrVrhRbDrZ g9/gPbHlXKBb19Clzxh2YgMbYdWFP8oRT7Jts1Eg/k/vv98q5j8PkuEvFe+QXpkoDVb7 utoyN/WoCVmYQKC9v2ADX1Aw/JQRorRqqNzRW1g3++BhCx1i1pHHbLJQyTWnam9M4+sC i/5A== 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=gtKEMPUnN8AsVoi6PDZIZK7DpKQ9lOnfmcjZr0YM9UQ=; b=HcqYc5/JCBctDJw1dS/f5H8q62sTjzV3Fmi9qhdrO/A2dDtezmFSvdJ7hxh5o2mqWa gL28TaacO10aHoZeq68zEHJ8dLMtTR2CPv5nnCY5mKyqCdUfwkhVJdYocfdNx8RWZ26g cbaEIXzIJP0NXa6zHbtzBAsmVuKz0cabEpP+kTAaaCyehKJi7Y6Xv4UPVyPxEg/ybbGG ADlsVpDyZH19Zkt8N79HaG5G6m4WJqTigetH12v58L94gcn5lXooVA4U3v1VzYqNfBbI ovgCPVYXqung6N+PvkRX17o1B65XmAYAUvTmgsbkTX8S1CPBjTSR1TmqsIBcCAalkdY2 qC7A== X-Gm-Message-State: AOAM533m00hKilTJHfximPEYO37qOE7frpp7+Erd3yz8qKYa9YMJK/VO GyB9WEU2X8F6pWXIp4gg8k0= X-Google-Smtp-Source: ABdhPJzGji5Uu09kb0UO1k2G0rZMK5qbNJORT0ppIx5rATDl4+1LuEjE9/pi0+W6GVIDfKiXRxfkqg== X-Received: by 2002:adf:fdcc:: with SMTP id i12mr14005299wrs.313.1590571493592; Wed, 27 May 2020 02:24:53 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v22sm2232914wml.21.2020.05.27.02.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 02:24:53 -0700 (PDT) From: luca.boccassi@gmail.com To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Wed, 27 May 2020 10:24:12 +0100 Message-Id: <20200527092422.258652-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527092422.258652-1-luca.boccassi@gmail.com> References: <20200522094022.1025696-43-luca.boccassi@gmail.com> <20200527092422.258652-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc/base: fix manual filter delete in EF10' has been queued to stable release 19.11.3 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 stable release 19.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 05/29/20. 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 696a40bd944c63b038c0b0f1b370c5f9ba52b8ee Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Wed, 20 May 2020 14:59:52 +0100 Subject: [PATCH] net/sfc/base: fix manual filter delete in EF10 [ upstream commit 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 ] When user requests a filter deletion only filter with manual priority must be deleted. When an automatic filter has the same specification, it must be skipped. Fixes: 585c22edb29c ("net/sfc/base: handle manual and auto filter clashes in EF10") Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/ef10_filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/sfc/base/ef10_filter.c b/drivers/net/sfc/base/ef10_filter.c index 12802a3d13..158e77e3bb 100644 --- a/drivers/net/sfc/base/ef10_filter.c +++ b/drivers/net/sfc/base/ef10_filter.c @@ -1161,7 +1161,8 @@ ef10_filter_delete( i = (hash + depth) & (EFX_EF10_FILTER_TBL_ROWS - 1); saved_spec = ef10_filter_entry_spec(table, i); if (saved_spec && ef10_filter_equal(spec, saved_spec) && - ef10_filter_same_dest(spec, saved_spec)) { + ef10_filter_same_dest(spec, saved_spec) && + saved_spec->efs_priority == EFX_FILTER_PRI_MANUAL) { break; } if (depth == EF10_FILTER_SEARCH_LIMIT) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-27 10:23:31.955299567 +0100 +++ 0009-net-sfc-base-fix-manual-filter-delete-in-EF10.patch 2020-05-27 10:23:31.639933832 +0100 @@ -1,14 +1,15 @@ -From 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 Mon Sep 17 00:00:00 2001 +From 696a40bd944c63b038c0b0f1b370c5f9ba52b8ee Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Wed, 20 May 2020 14:59:52 +0100 Subject: [PATCH] net/sfc/base: fix manual filter delete in EF10 +[ upstream commit 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 ] + When user requests a filter deletion only filter with manual priority must be deleted. When an automatic filter has the same specification, it must be skipped. Fixes: 585c22edb29c ("net/sfc/base: handle manual and auto filter clashes in EF10") -Cc: stable@dpdk.org Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko @@ -17,7 +18,7 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/sfc/base/ef10_filter.c b/drivers/net/sfc/base/ef10_filter.c -index 7a726ef977..12c84a5640 100644 +index 12802a3d13..158e77e3bb 100644 --- a/drivers/net/sfc/base/ef10_filter.c +++ b/drivers/net/sfc/base/ef10_filter.c @@ -1161,7 +1161,8 @@ ef10_filter_delete(