From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F3E4AA00C2 for ; Wed, 23 Nov 2022 19:04:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFA9D42DB2; Wed, 23 Nov 2022 19:04:54 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 4ECE042DA5 for ; Wed, 23 Nov 2022 19:04:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226692; 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=RFesi1ocbDokY+mPe2dr+YGYVoZUzOOfZLvJZwyWk3w=; b=bwJ7w16whVfW13iX+8nMua1jp2OjfEebZwjjAC+qL7VOJy5ICwb3RHXpu9sc6Agnw1Ayu3 1cQ5O/WSFBUmq5IxTQqbdlOKBNSATEMknfygu4Y4L7HgNwpLJW7Q6OrxP8VkXyqGdeWx2/ Ugg5VHlAMkw4dRSGqCJkuyL8XRKXGCg= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-280-0QLJbGbdOx-hM5Z7GCrIVQ-1; Wed, 23 Nov 2022 13:04:49 -0500 X-MC-Unique: 0QLJbGbdOx-hM5Z7GCrIVQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 318DA3C0E466; Wed, 23 Nov 2022 18:04:49 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 23819492B07; Wed, 23 Nov 2022 18:04:47 +0000 (UTC) From: Kevin Traynor To: Yiding Zhou Cc: Ke Xu , dpdk stable Subject: patch 'net/ice/base: fix duplicate flow rules' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:33 +0000 Message-Id: <20221123180413.733554-20-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.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 11/28/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/59f67d1041ec6f26a6a94b263781e3fa42fddc35 Thanks. Kevin --- >From 59f67d1041ec6f26a6a94b263781e3fa42fddc35 Mon Sep 17 00:00:00 2001 From: Yiding Zhou Date: Thu, 13 Oct 2022 14:21:13 +0800 Subject: [PATCH] net/ice/base: fix duplicate flow rules [ upstream commit 43d30256b215937d9d8b554d39ac91f1866b0e5a ] When a vsi that already exists in the created vsi_list subscribes to the same filter again, the return value ICE_SUCCESS results in duplicate flow rules to be stored, which will cause 'flush' and 'destroy' errors. Fixes: fed0c5ca5f19 ("net/ice/base: support programming a new switch recipe") Signed-off-by: Yiding Zhou Tested-by: Ke Xu --- drivers/net/ice/base/ice_switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index c94d15934b..7c6a258255 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -8806,5 +8806,5 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw, /* A rule already exists with the new VSI being added */ if (ice_is_bit_set(m_entry->vsi_list_info->vsi_map, vsi_handle)) - return ICE_SUCCESS; + return ICE_ERR_ALREADY_EXISTS; /* Update the previously created VSI list set with -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.581374246 +0000 +++ 0020-net-ice-base-fix-duplicate-flow-rules.patch 2022-11-23 09:55:57.055149272 +0000 @@ -1 +1 @@ -From 43d30256b215937d9d8b554d39ac91f1866b0e5a Mon Sep 17 00:00:00 2001 +From 59f67d1041ec6f26a6a94b263781e3fa42fddc35 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 43d30256b215937d9d8b554d39ac91f1866b0e5a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 4b115ce660..a2581f404d 100644 +index c94d15934b..7c6a258255 100644 @@ -23 +24 @@ -@@ -8787,5 +8787,5 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw, +@@ -8806,5 +8806,5 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,