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 873D2468E4 for ; Thu, 12 Jun 2025 23:10:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 81FF542E58; Thu, 12 Jun 2025 23:10:52 +0200 (CEST) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 538B442E0C for ; Thu, 12 Jun 2025 23:10:51 +0200 (CEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-441ab63a415so15725235e9.3 for ; Thu, 12 Jun 2025 14:10:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762651; x=1750367451; darn=dpdk.org; 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=2c3pNkMlftcxVKqPHHuDLYEapfKyWbZoUMlRIVOWtbo=; b=Au2cFReKaO/B1RInKdT37u8KRwMXXC+Ckmf7P/ldVbhBBRVFBBn0iGW1W+wSu+pK5O JcgIhpTORd3cnaMLhd8zpuJ7po4aOptc5HMsPWAcHXlEbXpVcFddSe/IYDRwCU61+rhk ChqMd55A//6TsyhM0m4FrdbxO2MaHLIf7JTdUF9yaJFgKSoqzD63Q6YJG0boV43Pixj3 0c5Fj8aq4QXAJDXuSw1ovRHM7ckmyqehzZZM00mQDdHPTdwyqmO1iTf3s0Aao9bZhJkz /Eg7I4KJjqEublUD2kaqNCm9dwPN/3x/aGe8Cs1ZGrUY8qgYNHak+SncjqY9tBmplEiq IlQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762651; x=1750367451; 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=2c3pNkMlftcxVKqPHHuDLYEapfKyWbZoUMlRIVOWtbo=; b=MqKdjoh5vgj96b53MYCZ8Z+axK86MVBSxhHSKDPBaQDlpwmfnCFpdM2+tI5ug/7q1G v0D6Tp/6GTMw9Ec4qrm1Lq9C6c96NR1WmPm1LCjM9tHLHtMPQBK4YiqLj+pmlWyNaWWC dZ7RMPZbmc9scbFbQLb4rHkf2sgH6RS8w9eyqgcgoIV9YFLwdHEfzPVm/Ir/Ckobf5/P BL8thWhM5c3JgqRC2kle7m12gqXuWJyeZyzCP9kXMl2bCDACJsmTG3634aeUCXZgB7LX YT6kMEf9XG2q2iiYPR+0mfbaLfWEBqDN/uR0hrwsSjSb4SRtToDQapRol9m8H9gY2QcD e3+w== X-Forwarded-Encrypted: i=1; AJvYcCVPt2SwzIWPrdNlXZOP9gaS7z4UZB2znnuDuKVBmY0Bic0e1ztT9eHkgc2yhFDwuW9/cPE6VRc=@dpdk.org X-Gm-Message-State: AOJu0Ywrtw70YwN0F1JBNUQRm0jBNbSqa7ZenjwOhr7vC+YStQTu4ytP N91fGVy2sur5yvDl2CsBjSIZTj04Wge9JRTr427Lci+p4G9+dhjjC2sf X-Gm-Gg: ASbGncsYfSL7gYkfRuGA2qU+h85ijMiiKTv8adTGg5XAOVDxDYC+FhzhWWB78yWkm2P +B79tVhJrQsmhByz/GkHC32jnvJGFV+aKC37kaEfhjVLy/CNFfESb8GTQ2hufzmQS9lMTFUnU8G qQ6pIpMsvUkDqflV9EBpynIRH2PKGicDnFYoDKQXQadm3dHZQzZU/0wAhFu5lf4Fy/AkIrXGhCH BpPOurIVZVrwB3NC0K1xckESv+w5u20tupbwwcBhxPlnbGGvyqrytoH4Cd608AT5dCa0mep/HRN 2voDLLwy46C0h9q207KLo14vC6pcNH/gV35rn21OV8QXOUHYXJylFFge592Yf3VqGP6z X-Google-Smtp-Source: AGHT+IG8b+Sx5ZtsG8btWL6b87q7KRl6PA0wNI4AnHg90Pvhet7WBIeyHXUj0zPVWsi809vy2Vs8KQ== X-Received: by 2002:a05:600c:4e09:b0:453:d3d:d9fd with SMTP id 5b1f17b1804b1-45334a7f16dmr5504155e9.12.1749762650751; Thu, 12 Jun 2025 14:10:50 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b19b32sm385681f8f.67.2025.06.12.14.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:10:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Sunyang Wu Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'ethdev: keep promiscuous/allmulti value before disabling' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:16 +0100 Message-ID: <20250612210733.2506558-59-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 22.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 06/14/25. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/b4656b4697bf63efa148d24660e7354c72a65787 Thanks. Luca Boccassi --- >From b4656b4697bf63efa148d24660e7354c72a65787 Mon Sep 17 00:00:00 2001 From: Sunyang Wu Date: Thu, 22 May 2025 15:42:42 +0800 Subject: [PATCH] ethdev: keep promiscuous/allmulti value before disabling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 00add16978762a8bcd98cd9465503194dc4c1e9a ] The values were reset to 0 before calling the driver function for disabling promiscuous or allmulticast, which could lead the driver to skip disabling. The values of the promiscuous and allmulticast variables are set after calling the driver, according to the return value. Fixes: af75078fece3 ("first public release") Signed-off-by: Sunyang Wu Signed-off-by: Morten Brørup --- lib/ethdev/rte_ethdev.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index f08cf5ccad..75bfc8a299 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -2550,10 +2550,9 @@ rte_eth_promiscuous_disable(uint16_t port_id) if (*dev->dev_ops->promiscuous_disable == NULL) return -ENOTSUP; - dev->data->promiscuous = 0; diag = (*dev->dev_ops->promiscuous_disable)(dev); - if (diag != 0) - dev->data->promiscuous = 1; + if (diag == 0) + dev->data->promiscuous = 0; return eth_err(port_id, diag); } @@ -2603,10 +2602,10 @@ rte_eth_allmulticast_disable(uint16_t port_id) if (*dev->dev_ops->allmulticast_disable == NULL) return -ENOTSUP; - dev->data->all_multicast = 0; + diag = (*dev->dev_ops->allmulticast_disable)(dev); - if (diag != 0) - dev->data->all_multicast = 1; + if (diag == 0) + dev->data->all_multicast = 0; return eth_err(port_id, diag); } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:26.018999467 +0100 +++ 0059-ethdev-keep-promiscuous-allmulti-value-before-disabl.patch 2025-06-12 22:06:23.886044975 +0100 @@ -1 +1 @@ -From 00add16978762a8bcd98cd9465503194dc4c1e9a Mon Sep 17 00:00:00 2001 +From b4656b4697bf63efa148d24660e7354c72a65787 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 00add16978762a8bcd98cd9465503194dc4c1e9a ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index d4197322a0..dd7c00bc94 100644 +index f08cf5ccad..75bfc8a299 100644 @@ -29,2 +30,2 @@ -@@ -3044,10 +3044,9 @@ rte_eth_promiscuous_disable(uint16_t port_id) - if (dev->dev_ops->promiscuous_disable == NULL) +@@ -2550,10 +2550,9 @@ rte_eth_promiscuous_disable(uint16_t port_id) + if (*dev->dev_ops->promiscuous_disable == NULL) @@ -34 +35 @@ - diag = dev->dev_ops->promiscuous_disable(dev); + diag = (*dev->dev_ops->promiscuous_disable)(dev); @@ -40,3 +41,3 @@ - diag = eth_err(port_id, diag); - -@@ -3112,10 +3111,10 @@ rte_eth_allmulticast_disable(uint16_t port_id) + return eth_err(port_id, diag); + } +@@ -2603,10 +2602,10 @@ rte_eth_allmulticast_disable(uint16_t port_id) @@ -44 +45 @@ - if (dev->dev_ops->allmulticast_disable == NULL) + if (*dev->dev_ops->allmulticast_disable == NULL) @@ -48 +49 @@ - diag = dev->dev_ops->allmulticast_disable(dev); + diag = (*dev->dev_ops->allmulticast_disable)(dev); @@ -54,2 +55,2 @@ - diag = eth_err(port_id, diag); - + return eth_err(port_id, diag); + }