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 3011CA0557 for ; Wed, 16 Nov 2022 11:40:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2893D40F16; Wed, 16 Nov 2022 11:40:43 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 57B3B40E03 for ; Wed, 16 Nov 2022 11:40:41 +0100 (CET) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 372F23F0C0 for ; Wed, 16 Nov 2022 10:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668595241; bh=Bnz1tNN4Ou5gzhNgWhhQWHHjoVXtnkp1HAN4Zpqfqcc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=D8jfunsPHK/Vx3vX462Nb2Y2YhiSVidwN1wtNpcomE538MVNf0Yz00gS1STke2H/t MaMyhQJ1s6HNNZBtXRjp/WIKkVDXKKChnc+I6h0r/PqzpBxc51nSVJc7CShxkVCjv7 6b4fkZT57FHUF1dyi8wqhui9LyLodcp28u0N9xcz5TZCaX6TIeqj4Gh0smW/nPl6pf ogHwHuSQewavnFEbLjJBJNjg5tYCfrpZ1/YVdKXZnVhLF+3xBkzVYsW4IpngNPSsvY hYbT5YFrD5d+xCKL11BRetECJ9CiqZ451HlQXDBf3nnXX4sbuFNR/Ycc2l6urzDkS2 KFMYq8dLij3kg== Received: by mail-wm1-f71.google.com with SMTP id m14-20020a7bcb8e000000b003cfcff0057eso353846wmi.9 for ; Wed, 16 Nov 2022 02:40:41 -0800 (PST) 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=Bnz1tNN4Ou5gzhNgWhhQWHHjoVXtnkp1HAN4Zpqfqcc=; b=YDRVBV/D4Fgxwx+xwKKP0dR5EkC/dW/0eRV66jrrEZpbxS8BPgBqM+NBxU4LcWgh5B y9HqCTihk8d2x0TJoT867L6Rk652dqcjxIwq5LIyO6G9eC2O9X9dFrbk54mrBlw2PAkN WXoifwaesjmNuqfZDEOK7x8hn7HfTsb88npNsQpU9EDyui/pTNrwv6xzu6kT4SDPPun3 yaaZorrfReSXCIqqinzDFibH5d16gDtQRK9V0hE7Wmv6gTU/76dz0WovkXkoghoFfSM2 C7kcz8EXoaFB9mF8RLT0i3f4hWWHhKGb/IPl05Cw6v/Neh2GRJ7ZmYptlkFY7Cu5SOPL G9/w== X-Gm-Message-State: ANoB5pkA0sjTHZmLxQ+DqfFqv1Ap09o37dmVBK5hSpNnjrsVeYioO+cX 6nqz0cWo/M7TOCoAECIzktIsdlpx1FJWG2y77KZG7lMApws0KjIt9oEQK2WrEjllSZw1uAgB/9I 0/s1+E3jWQTHtZtM3Z7AqSw1I X-Received: by 2002:a05:600c:3399:b0:3c6:6f2c:64ef with SMTP id o25-20020a05600c339900b003c66f2c64efmr1703746wmp.91.1668595240182; Wed, 16 Nov 2022 02:40:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf52NgH3C08sTyBDOMI3XbrTLlfyIUst4NiZXilLvj0avl5Jf7nMVncRFoSMPpHNJ/o9A/w0JA== X-Received: by 2002:a05:600c:3399:b0:3c6:6f2c:64ef with SMTP id o25-20020a05600c339900b003c66f2c64efmr1703740wmp.91.1668595239982; Wed, 16 Nov 2022 02:40:39 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39e5:dd00:975:f38b:96af:696f]) by smtp.gmail.com with ESMTPSA id bt14-20020a056000080e00b002417e7f0685sm14359743wrb.9.2022.11.16.02.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 02:40:39 -0800 (PST) From: christian.ehrhardt@canonical.com To: Yiding Zhou Cc: Ke Xu , dpdk stable Subject: patch 'net/ice/base: fix duplicate flow rules' has been queued to stable release 19.11.14 Date: Wed, 16 Nov 2022 11:40:04 +0100 Message-Id: <20221116104012.2975036-9-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116104012.2975036-1-christian.ehrhardt@canonical.com> References: <20221116104012.2975036-1-christian.ehrhardt@canonical.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 19.11.14 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/23/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/abb751ede53458d3693527a3bd33397d9b544bdd Thanks. Christian Ehrhardt --- >From abb751ede53458d3693527a3bd33397d9b544bdd 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 5fe6e9ea69..5daf29dbd0 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -6023,7 +6023,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.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-16 11:36:50.757679285 +0100 +++ 0009-net-ice-base-fix-duplicate-flow-rules.patch 2022-11-16 11:36:50.420775502 +0100 @@ -1 +1 @@ -From 43d30256b215937d9d8b554d39ac91f1866b0e5a Mon Sep 17 00:00:00 2001 +From abb751ede53458d3693527a3bd33397d9b544bdd 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 5fe6e9ea69..5daf29dbd0 100644 @@ -23 +24 @@ -@@ -8786,7 +8786,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw, +@@ -6023,7 +6023,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,