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 9E3EDA0A02 for ; Mon, 17 May 2021 18:16:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9873641101; Mon, 17 May 2021 18:16:02 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 1350040041 for ; Mon, 17 May 2021 18:16:01 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifuS-0008HI-7n; Mon, 17 May 2021 16:16:00 +0000 From: Christian Ehrhardt To: Siwar Zitouni Cc: Thibaut Collet , Qi Zhang , dpdk stable Date: Mon, 17 May 2021 18:09:28 +0200 Message-Id: <20210517161039.3132619-139-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix disabling promiscuous mode' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/134077900ede56ff8ccd9079baf7d6c9ec7e33bc Thanks. Christian Ehrhardt --- >From 134077900ede56ff8ccd9079baf7d6c9ec7e33bc Mon Sep 17 00:00:00 2001 From: Siwar Zitouni Date: Mon, 19 Apr 2021 14:53:48 +0200 Subject: [PATCH] net/ice: fix disabling promiscuous mode [ upstream commit fa1d598844a73765cf26676ce3d219589ba57114 ] When promiscuous mode is disabled, allmulticast is also disabled, even if it was previously enabled. Add a test in ice_promisc_disable() to check if allmulticast should be kept enabled. Fixes: c945e4bf9063 ("net/ice: support promiscuous mode") Signed-off-by: Thibaut Collet Signed-off-by: Siwar Zitouni Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 7227d2182e..42d62bded9 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3778,8 +3778,11 @@ ice_promisc_disable(struct rte_eth_dev *dev) uint8_t pmask; int ret = 0; - pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX | - ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX; + if (dev->data->all_multicast == 1) + pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX; + else + pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX | + ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX; status = ice_clear_vsi_promisc(hw, vsi->idx, pmask, 0); if (status != ICE_SUCCESS) { -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:34.853860759 +0200 +++ 0139-net-ice-fix-disabling-promiscuous-mode.patch 2021-05-17 17:40:29.415811398 +0200 @@ -1 +1 @@ -From fa1d598844a73765cf26676ce3d219589ba57114 Mon Sep 17 00:00:00 2001 +From 134077900ede56ff8ccd9079baf7d6c9ec7e33bc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fa1d598844a73765cf26676ce3d219589ba57114 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 84d1735255..da9e85bd7c 100644 +index 7227d2182e..42d62bded9 100644 @@ -26 +27 @@ -@@ -4526,8 +4526,11 @@ ice_promisc_disable(struct rte_eth_dev *dev) +@@ -3778,8 +3778,11 @@ ice_promisc_disable(struct rte_eth_dev *dev)