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 3456AA04A3 for ; Fri, 5 Jun 2020 20:28:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2C6121D515; Fri, 5 Jun 2020 20:28:02 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 006D01D578 for ; Fri, 5 Jun 2020 20:28:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381680; 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=LES6s7ZB9QSKuq/yl1xBzYoJaFOZnd59qlF7OQHswmI=; b=igJ08so9EK1elv9r0Y1nqvh2TabiyxsrN0Pwey+3UJQ7BqdY3mOpnshkhyJCodPrfuwGm9 MYAo2XxVUsjDlF2WAw2B9w0De/RrdNAeE7iFL4YSUSObV6zqNou/yEqx5/e37zQjC4neAq LwMyOnY9knVME9Qiw+KcD4eU1cdVu5w= 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-226-mcmwV3l3Mcyqoj3LozwY0Q-1; Fri, 05 Jun 2020 14:27:56 -0400 X-MC-Unique: mcmwV3l3Mcyqoj3LozwY0Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C8FB418A8225; Fri, 5 Jun 2020 18:27:55 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEF1260C47; Fri, 5 Jun 2020 18:27:54 +0000 (UTC) From: Kevin Traynor To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Fri, 5 Jun 2020 19:25:16 +0100 Message-Id: <20200605182525.22483-79-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc/base: fix manual filter delete in EF10' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/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. 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/55db8eaf27cf3b450c5647f0f8ce349c0f15ed40 Thanks. Kevin. --- >From 55db8eaf27cf3b450c5647f0f8ce349c0f15ed40 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 38843207f6..cf3446805a 100644 --- a/drivers/net/sfc/base/ef10_filter.c +++ b/drivers/net/sfc/base/ef10_filter.c @@ -1173,5 +1173,6 @@ ef10_filter_delete( 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; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:55.139357340 +0100 +++ 0079-net-sfc-base-fix-manual-filter-delete-in-EF10.patch 2020-06-05 19:20:50.984036860 +0100 @@ -1 +1 @@ -From 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 Mon Sep 17 00:00:00 2001 +From 55db8eaf27cf3b450c5647f0f8ce349c0f15ed40 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 7a726ef977..12c84a5640 100644 +index 38843207f6..cf3446805a 100644 @@ -23 +24 @@ -@@ -1162,5 +1162,6 @@ ef10_filter_delete( +@@ -1173,5 +1173,6 @@ ef10_filter_delete(