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 52D0BA00C2 for ; Thu, 3 Nov 2022 10:30:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4EF8640694; Thu, 3 Nov 2022 10:30:14 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id C1EBD40693 for ; Thu, 3 Nov 2022 10:30:11 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id n39-20020a05600c3ba700b003cf71011cddso3315791wms.1 for ; Thu, 03 Nov 2022 02:30:11 -0700 (PDT) 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=wuZ+N07iT+7cGZ8j9Cxq8Z5mj8j5n8KPRhe4TgqvwQs=; b=JCRJGATPgqaDQyTKbA/CWcuzwIw7HdTWxVFl33+1cmKrWfZbaP7QdhTVmdo5wrTWDE B0UariYs0bhUzqNF7qmKBQZtYo5RiWnxrEN/5d/zuZbokXGUkudiq4uEnfLg1URMmZxp cmRWe9AcgdAxzs0gjKJCVLsUnaT4DkaD8IHONJNTguyQQwh2vi3WyEZliSQzoOmj8+j7 8xcGmyWUyFWGGxqS1b67u6NQn/doaI7CtCPNEh5IyoyqXQ/qfmlkApf6i17kh33Xy+94 lQN/KiiaYbQ+3NhmYF8T0wMqtP6HGuYJ+NeyWr9ZBfj9JkwcDxcNhptdbllUhYZGf39l UrIw== 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=wuZ+N07iT+7cGZ8j9Cxq8Z5mj8j5n8KPRhe4TgqvwQs=; b=UReD+dTEPcPueRuD+26as5SRaAy0tP3fzbdvrQbNbIfvkv0WKBOKmHRTwhMWBl7vpR u4a3ZKNu/MS6NIjC7i3mNWFA0d5mZE4GqHZcmm9IQcfPPNHYyRPnXpygLPQBuUcBfuit FZuqasOBi9CTAdnD5ifGHAk/QnALSU37Ql5qymaMHxWGadNtGu5XPzaUkTsWJCRVp5Nj 6i8URxNfuANnEpniG5UWJZhsze38Y8nXIKAy7K42MJSFcjhvt+SHsVVimLqBBcM+0LM4 rmm/LzXvlbUnscsW0AqNCPrgQj2FBo80vuLL09KQgDlPgpnnsnjHZsFQNHjF/KrZV8aD gOIg== X-Gm-Message-State: ACrzQf21Ogv9GmY5rUBQtezRxI+RrUiESrWoRWcBboCRgCQQq/H/2Ms7 eebPN0O4tLSL+W7kzoCn9burFkeu6cQFniK2 X-Google-Smtp-Source: AMsMyM4F9nB2AGFhnFwYmcwlPFoKUDM6rTJpOfxrXEO50qDkDahf9Tceez2/0x/eopoNj5Q1L1B2sA== X-Received: by 2002:a1c:4c16:0:b0:3cf:6f1a:9038 with SMTP id z22-20020a1c4c16000000b003cf6f1a9038mr15305389wmf.151.1667467811465; Thu, 03 Nov 2022 02:30:11 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id c11-20020a056000104b00b002364c77bc96sm353592wrx.33.2022.11.03.02.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:30:10 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.7 Date: Thu, 3 Nov 2022 09:26:55 +0000 Message-Id: <20221103092758.1099402-37-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-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/05/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/912b5c27df08930df45776f3402df8ef8711fee4 Thanks. Luca Boccassi --- >From 912b5c27df08930df45776f3402df8ef8711fee4 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 f217035f33..c0de28ac58 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -4180,7 +4180,8 @@ ice_add_mac_rule(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list, if (!ice_is_vsi_valid(hw, vsi_handle)) 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) return ICE_ERR_PARAM; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:27.670450790 +0000 +++ 0037-net-ice-base-fix-add-MAC-rule.patch 2022-11-03 09:27:25.401422982 +0000 @@ -1 +1 @@ -From 5dbc19cf438efceb7e7162fadbd7f462f1fed0ab Mon Sep 17 00:00:00 2001 +From 912b5c27df08930df45776f3402df8ef8711fee4 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 f217035f33..c0de28ac58 100644 @@ -29 +30 @@ -@@ -4858,7 +4858,8 @@ ice_add_mac_rule(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list, +@@ -4180,7 +4180,8 @@ ice_add_mac_rule(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list,