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 F3262A054A for ; Tue, 25 Oct 2022 17:09:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EF63E42C3F; Tue, 25 Oct 2022 17:09:36 +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 60A5F42C48 for ; Tue, 25 Oct 2022 17:09:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710574; 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=+6g81jupEiWRsQRsl1uvfR99rvNaKPgWsIRfUDWZGqc=; b=RXIDa5We3g3n2vGXvNHdmVaajKlFx389HVbVDh1fJ6BHwb+jwPU4fG06Jlv5W7jZ415aaG 5mXtf4dr8wCAtzZMEpI3/WUjRB0iy3SsIOIEYDle24C2avBLIlLnfyCxhNlyWVazYT4yzc cqJf6kaTpIHgOcaMSZMgR9/0MhlGJTU= 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-561-lMhvbUgZNgec3G7XpBMVBQ-1; Tue, 25 Oct 2022 11:09:30 -0400 X-MC-Unique: lMhvbUgZNgec3G7XpBMVBQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 139641C0BC8E; Tue, 25 Oct 2022 15:09:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCEDF4B400F; Tue, 25 Oct 2022 15:09:16 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Grzegorz Nitka , Qiming Yang , dpdk stable Subject: patch 'net/ice/base: fix add MAC rule' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:52 +0100 Message-Id: <20221025150734.142189-57-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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/01/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/b1f7933ce6052c9b5538bfce0d017548349fba52 Thanks. Kevin --- >From b1f7933ce6052c9b5538bfce0d017548349fba52 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Aug 2022 03:31:32 -0400 Subject: [PATCH] net/ice/base: fix add MAC rule [ upstream commit 5dbc19cf438efceb7e7162fadbd7f462f1fed0ab ] Fix ice_add_mac_rule function by not overriding action value with vsi id. It's possible to add MAC based switch filters with action other than FWD_TO_VSI. In current implementation fwd_id member of filter config structure was always overwritten with hw vsi index, regardless of action type. Fix it, by setting hw vsi index only for FWD_TO_VSI action filter and leave it as it is in case of other actions. Fixes: 3ee1b0159ee5 ("net/ice/base: support adding MAC rules on specific port") Signed-off-by: Grzegorz Nitka Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_switch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 17d292c0db..45421c0889 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -4856,5 +4856,6 @@ ice_add_mac_rule(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list, return ICE_ERR_PARAM; hw_vsi_id = ice_get_hw_vsi_num(hw, vsi_handle); - m_list_itr->fltr_info.fwd_id.hw_vsi_id = hw_vsi_id; + if (m_list_itr->fltr_info.fltr_act == ICE_FWD_TO_VSI) + m_list_itr->fltr_info.fwd_id.hw_vsi_id = hw_vsi_id; /* update the src in case it is VSI num */ if (m_list_itr->fltr_info.src_id != ICE_SRC_ID_VSI) -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.828623890 +0100 +++ 0057-net-ice-base-fix-add-MAC-rule.patch 2022-10-25 14:18:58.443798206 +0100 @@ -1 +1 @@ -From 5dbc19cf438efceb7e7162fadbd7f462f1fed0ab Mon Sep 17 00:00:00 2001 +From b1f7933ce6052c9b5538bfce0d017548349fba52 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5dbc19cf438efceb7e7162fadbd7f462f1fed0ab ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 124b4fad1b..edcfa89bcb 100644 +index 17d292c0db..45421c0889 100644 @@ -29 +30 @@ -@@ -4859,5 +4859,6 @@ ice_add_mac_rule(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list, +@@ -4856,5 +4856,6 @@ ice_add_mac_rule(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list,