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 73472A054A for ; Tue, 25 Oct 2022 17:09:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FA6542C4B; Tue, 25 Oct 2022 17:09:25 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2535642C38 for ; Tue, 25 Oct 2022 17:09:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710562; 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=Rebhgru3+0+ylBymdiLFLZ6wltaCPjQKgGyj+TQkgeg=; b=AGEfjkqwZ/PN0ZJJFzmAGVkKe4/aNQFJIbbGX6a7wTnWMVPWugAVWPqwYEgSW6eyN2FuJO TG/0Wgt+JEA+kb4km5ryKigbbQ7P+I+rZrMCLBEIRMlst3GhqwEDStjzXZEA9XWJzWIRBv S+MESN5Saa6S9GtfUaKso2M5ACETHfQ= 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-314-43Xu1yE2NdK7jAqQbJM4IQ-1; Tue, 25 Oct 2022 11:09:20 -0400 X-MC-Unique: 43Xu1yE2NdK7jAqQbJM4IQ-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 E1EC73826A51; Tue, 25 Oct 2022 15:09:19 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 749F04B400F; Tue, 25 Oct 2022 15:09:18 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Grzegorz Siwik , Qiming Yang , dpdk stable Subject: patch 'net/ice/base: fix double VLAN in promiscuous mode' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:53 +0100 Message-Id: <20221025150734.142189-58-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/da3be8cd7e0e66075cf57e472e069ee576dd433b Thanks. Kevin --- >From da3be8cd7e0e66075cf57e472e069ee576dd433b Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Aug 2022 03:31:38 -0400 Subject: [PATCH] net/ice/base: fix double VLAN in promiscuous mode [ upstream commit 40ff47dd4b7aa168de9a82774c88eff825210418 ] Avoid enabling or disabling vlan 0 when trying to set promiscuous vlan mode if double vlan mode is enabled. This fix is needed because the driver tries to add the vlan 0 filter twice (once for inner and once for outer) when double VLAN mode is enabled. The filter program is rejected by the firmware when double vlan is enabled, because the promiscuous filter only needs to be set once. This issue was missed in the initial implementation of double vlan mode. Fixes: 60ff6f5ce2d8 ("net/ice/base: consolidate VF promiscuous mode") Signed-off-by: Grzegorz Siwik Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_switch.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 45421c0889..5a001222bc 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -6216,4 +6216,11 @@ _ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, LIST_FOR_EACH_ENTRY(list_itr, &vsi_list_head, ice_fltr_list_entry, list_entry) { + /* Avoid enabling or disabling vlan zero twice when in double + * vlan mode + */ + if (ice_is_dvm_ena(hw) && + list_itr->fltr_info.l_data.vlan.tpid == 0) + continue; + vlan_id = list_itr->fltr_info.l_data.vlan.vlan_id; if (rm_vlan_promisc) -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.854541937 +0100 +++ 0058-net-ice-base-fix-double-VLAN-in-promiscuous-mode.patch 2022-10-25 14:18:58.450798231 +0100 @@ -1 +1 @@ -From 40ff47dd4b7aa168de9a82774c88eff825210418 Mon Sep 17 00:00:00 2001 +From da3be8cd7e0e66075cf57e472e069ee576dd433b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 40ff47dd4b7aa168de9a82774c88eff825210418 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index a8f83f62ff..6a94e3fde9 100644 +index 45421c0889..5a001222bc 100644 @@ -30 +31 @@ -@@ -6264,4 +6264,11 @@ _ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, +@@ -6216,4 +6216,11 @@ _ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask,