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 C18E3A0093; Wed, 20 May 2020 16:00:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9BFC91D172; Wed, 20 May 2020 16:00:08 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 591A01C2A3; Wed, 20 May 2020 16:00:07 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.60]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id CD77E600DA; Wed, 20 May 2020 14:00:06 +0000 (UTC) Received: from us4-mdac16-66.ut7.mdlocal (unknown [10.7.64.78]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id CA16E200B4; Wed, 20 May 2020 14:00:06 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.66.38]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 552381C0052; Wed, 20 May 2020 14:00:06 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 6D7CD80006C; Wed, 20 May 2020 14:00:05 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 20 May 2020 14:59:57 +0100 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 20 May 2020 14:59:57 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 04KDxvO1022902; Wed, 20 May 2020 14:59:57 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 355BC16139D; Wed, 20 May 2020 14:59:57 +0100 (BST) From: Andrew Rybchenko To: CC: Igor Romanov , Date: Wed, 20 May 2020 14:59:52 +0100 Message-ID: <1589983192-9909-1-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1020-25430.003 X-TM-AS-Result: No-5.424100-8.000000-10 X-TMASE-MatchedRID: qODGUxeApuw1KU/m4Dd2rjn/wcdfjLjCOyBTDrxRCtjcUlQs8YFKzl1Z yX1veeaJ3iuNqik9NLyR44PaXvjYi9G0HGXAwxZ8PwKTD1v8YV5MkOX0UoduucuaydEXPqkmcOQ FqW7TulVFiOGmSbOoILgnW/da9GtmlwV2iaAfSWcURSScn+QSXt0H8LFZNFG7hqz53n/yPnoQR/ xFeZ8/8+iRjFd+sQDUG7K/wZEjTqEBRCoAU9WhoJeZT8XNJIzV X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--5.424100-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1020-25430.003 X-MDID: 1589983206-CIEI1XhoZvmp Subject: [dpdk-dev] [PATCH] net/sfc/base: fix manual filter delete in EF10 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Igor Romanov 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 --- 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 7a726ef977..12c84a5640 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.17.1