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 B78E245804 for ; Fri, 23 Aug 2024 18:22:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B27D94336F; Fri, 23 Aug 2024 18:22:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id CCE4B402BE for ; Fri, 23 Aug 2024 18:22:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430170; 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=x0mdnK5eHPwcT/mdsrPg2VpT/ZUYVmwZobLk9Zakbr0=; b=YqZuKPT+ZMbjX3N7qOYfl5i9dvZ/q3MgvvFEoP3Qb4oN6cV1GqDKcfpsHsa6ILQk4Pbus/ sEA6gJycv67TOi8TJAWyLz16OvpCCRh1GWGYYHScwax5jGz+7nfaoTlT/TuqgSWJijSUr0 lQpUlvd0nSqie0WNjNpDtfThhG5eQa4= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-665-akVI3PYvMuGn6EKsVrfM1A-1; Fri, 23 Aug 2024 12:22:47 -0400 X-MC-Unique: akVI3PYvMuGn6EKsVrfM1A-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 708441955D47; Fri, 23 Aug 2024 16:22:46 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 728FA1956053; Fri, 23 Aug 2024 16:22:44 +0000 (UTC) From: Kevin Traynor To: Mateusz Pacuszka Cc: Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix check for existing switch rule' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:36 +0100 Message-ID: <20240823161929.1004778-88-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/6ad78e90aaecf9871c7008f1e4cfe0b4b8ed8747 Thanks. Kevin --- >From 6ad78e90aaecf9871c7008f1e4cfe0b4b8ed8747 Mon Sep 17 00:00:00 2001 From: Mateusz Pacuszka Date: Wed, 26 Jun 2024 12:41:20 +0100 Subject: [PATCH] net/ice/base: fix check for existing switch rule [ upstream commit 771db7d9466488135a2899f8809d6e61bc685ed5 ] In case the rule already exists and another VSI wants to subscribe to it, a new VSI list is being created and both VSIs are moved to it. Currently, the check for already existing VSI with the same rule is done based on fdw_id.hw_vsi_id, which applies only to LOOKUP_RX flag. Change it to vsi_handle. This is software VSI ID, but it can be applied here, because vsi_map itself is also based on it. Additionally change return status in case the VSI already exists in the VSI map to "Already exists". Such case should be handled by the caller. Fixes: c7dd15931183 ("net/ice/base: add virtual switch code") Signed-off-by: Mateusz Pacuszka Signed-off-by: Ian Stokes Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 468d58cdb9..dd21ef4bd1 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -4335,5 +4335,5 @@ ice_add_update_vsi_list(struct ice_hw *hw, /* A rule already exists with the new VSI being added */ - if (cur_fltr->fwd_id.hw_vsi_id == new_fltr->fwd_id.hw_vsi_id) + if (cur_fltr->vsi_handle == new_fltr->vsi_handle) return ICE_ERR_ALREADY_EXISTS; @@ -4383,5 +4383,5 @@ ice_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.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.329370004 +0100 +++ 0088-net-ice-base-fix-check-for-existing-switch-rule.patch 2024-08-23 17:18:09.783430325 +0100 @@ -1 +1 @@ -From 771db7d9466488135a2899f8809d6e61bc685ed5 Mon Sep 17 00:00:00 2001 +From 6ad78e90aaecf9871c7008f1e4cfe0b4b8ed8747 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 771db7d9466488135a2899f8809d6e61bc685ed5 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index fa5bd94c58..f8d98d8a9e 100644 +index 468d58cdb9..dd21ef4bd1 100644 @@ -30 +31 @@ -@@ -4625,5 +4625,5 @@ ice_add_update_vsi_list(struct ice_hw *hw, +@@ -4335,5 +4335,5 @@ ice_add_update_vsi_list(struct ice_hw *hw, @@ -37 +38 @@ -@@ -4673,5 +4673,5 @@ ice_add_update_vsi_list(struct ice_hw *hw, +@@ -4383,5 +4383,5 @@ ice_add_update_vsi_list(struct ice_hw *hw, @@ -40 +41 @@ -- return 0; +- return ICE_SUCCESS;