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 ED1D1A00C4 for ; Fri, 18 Nov 2022 00:10:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E25DE4067B; Fri, 18 Nov 2022 00:10:10 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 96AD24021F for ; Fri, 18 Nov 2022 00:10:09 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id y16so6331200wrt.12 for ; Thu, 17 Nov 2022 15:10:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uroa+0774QG3kKbQx+1BZGjgIlm41RBEWSjK0c1N22k=; b=kjiMrXm+cam8yQDR23cDA9h1ydgdxE9cH3HawpZZ+8rp0cCp+qzNSchOOaAdKCqZCG rGjGE2Aw66+DmRg8i2A9+njVgwIw9R/0vxrbYa2XAwEElAZFFaB12MRvLJIlTzDsY/a1 /8lxlG/LEQ92ZbEUegR0AWMDQCvdkdAPPU5mw6wQZ2zWlNqkVlw8QLgF3nm63ACp7eS5 5AtIJGQwCqxU7oSPZeyL2BdGH5beO90nGoFeo0RyUGcyxaat8hBf1wy5eGJYLlOj2Cej 3ObKiq7Hj92jMk02RlmNu8LUw92Rv8gMWq/2YQTnbwEGJsbG6ba/0BS+oUmWs9xIWpAi vXVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uroa+0774QG3kKbQx+1BZGjgIlm41RBEWSjK0c1N22k=; b=iUf2Y+PGyYZ5+DvJSi9qNXDUkpWCUyQkAxyUkwQrj5WbTZjsT9HGVO+jqH0aiBeJKK 6WU7PdWiwFj5NAtJlTX/TA0zl+H08CzwtsCzAlNXN91z8QbT/oTGImIxVk6QYpBTq15+ AfVfH1qx4FO0Tkrcijd3VNZzpzZWjJ76jOppoWB5eMrIjiqQqRhajyisGp00UlulkSLp Fzn2CM6phkOnOPKLOY/JsL1ZThRfhaCfXfQwS2O2Ijqf1Fl2S85nglAOqTK8jEcEAKji KyvpIOAJIAg3Mnh5Rv3COiYKD+hXkbVxzhqV/2O65E7V2Blo751ZtbtaaNRqtwLGX+J9 LKZw== X-Gm-Message-State: ANoB5pmpui5+AD4ORhpu9qX0YUrfYJERKL8hlvP8sAVh6BtjdgaRAr6N FVxJlyvDNKMhDjRaD8tyDDYRePQmdQY= X-Google-Smtp-Source: AA0mqf4Tl9AsH+q2knWNdj7/gnfbTx1oIQzCa5QHLv2zFKpjexUkuLjCqcJdYvAIhFVrDXZAcsEnJQ== X-Received: by 2002:a5d:56c1:0:b0:241:8643:af8e with SMTP id m1-20020a5d56c1000000b002418643af8emr2797452wrw.406.1668726609354; Thu, 17 Nov 2022 15:10:09 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id j18-20020a05600c191200b003c83465ccbfsm7976724wmq.35.2022.11.17.15.10.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 15:10:07 -0800 (PST) From: luca.boccassi@gmail.com To: Yiding Zhou Cc: Ke Xu , dpdk stable Subject: patch 'net/ice/base: fix duplicate flow rules' has been queued to stable release 20.11.7 Date: Thu, 17 Nov 2022 23:08:42 +0000 Message-Id: <20221117230859.611465-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117230859.611465-1-luca.boccassi@gmail.com> References: <20221105171146.1520039-47-luca.boccassi@gmail.com> <20221117230859.611465-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.7 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/19/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/daa172642b713076d7bdc7dd31b4c185cd3532ec Thanks. Luca Boccassi --- >From daa172642b713076d7bdc7dd31b4c185cd3532ec 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 16ddfc09c7..b03db4aabd 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -7901,7 +7901,7 @@ 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 * the new VSI ID passed in -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-17 23:07:56.286218874 +0000 +++ 0018-net-ice-base-fix-duplicate-flow-rules.patch 2022-11-17 23:07:55.512330818 +0000 @@ -1 +1 @@ -From 43d30256b215937d9d8b554d39ac91f1866b0e5a Mon Sep 17 00:00:00 2001 +From daa172642b713076d7bdc7dd31b4c185cd3532ec 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 16ddfc09c7..b03db4aabd 100644 @@ -23 +24 @@ -@@ -8786,7 +8786,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw, +@@ -7901,7 +7901,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,