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 1B1A946BAE for ; Fri, 18 Jul 2025 21:38:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1368840611; Fri, 18 Jul 2025 21:38:45 +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 0427540E2D for ; Fri, 18 Jul 2025 21:38:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867523; 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=l5kQ3gxmVIv4JzalKgAfC39r8uAYZZFL1UZWIDD94X4=; b=S3QIs1aeJ93EqyKW2FcHRU65PvzuDAQWejcG+/VTNE8eUW4fKbmGLvth62exLosCSnS33/ ZWteAe/zq6IG1nKsP2FJJLFhWgKF6qqhMhTVWYZnC4nszgIQOhGRBE3hUM14GMRnrkyEIP evwbf1XX007qkTX7vHTF12r+aXEGEPQ= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-385-u93klEGMOICmr-IO-9Qa_A-1; Fri, 18 Jul 2025 15:38:38 -0400 X-MC-Unique: u93klEGMOICmr-IO-9Qa_A-1 X-Mimecast-MFC-AGG-ID: u93klEGMOICmr-IO-9Qa_A_1752867516 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2766B180028C; Fri, 18 Jul 2025 19:38:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6308A18003FC; Fri, 18 Jul 2025 19:38:33 +0000 (UTC) From: Kevin Traynor 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 24.11.3 Date: Fri, 18 Jul 2025 20:31:39 +0100 Message-ID: <20250718193247.1008129-165-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: T7cf3iHJdxD4rcFnbB2Y5jxbNEG6KjKSlsmTbNiMyTM_1752867516 X-Mimecast-Originator: redhat.com 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 24.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 07/23/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f23a5bb368641f38f7b5d8eb5247297b324baaf1 Thanks. Kevin --- >From f23a5bb368641f38f7b5d8eb5247297b324baaf1 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 5d24fd6865..58cb952121 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -2979,8 +2979,7 @@ rte_eth_promiscuous_disable(uint16_t port_id) 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; diag = eth_err(port_id, diag); @@ -3044,8 +3043,8 @@ 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; diag = eth_err(port_id, diag); -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:16.753400231 +0100 +++ 0165-ethdev-keep-promiscuous-allmulti-value-before-disabl.patch 2025-07-18 20:29:11.174908079 +0100 @@ -1 +1 @@ -From 00add16978762a8bcd98cd9465503194dc4c1e9a Mon Sep 17 00:00:00 2001 +From f23a5bb368641f38f7b5d8eb5247297b324baaf1 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 5d24fd6865..58cb952121 100644 @@ -29 +30 @@ -@@ -3045,8 +3045,7 @@ rte_eth_promiscuous_disable(uint16_t port_id) +@@ -2979,8 +2979,7 @@ rte_eth_promiscuous_disable(uint16_t port_id) @@ -33 +34 @@ - diag = dev->dev_ops->promiscuous_disable(dev); + diag = (*dev->dev_ops->promiscuous_disable)(dev); @@ -40,2 +41,2 @@ -@@ -3113,8 +3112,8 @@ rte_eth_allmulticast_disable(uint16_t port_id) - if (dev->dev_ops->allmulticast_disable == NULL) +@@ -3044,8 +3043,8 @@ rte_eth_allmulticast_disable(uint16_t port_id) + if (*dev->dev_ops->allmulticast_disable == NULL) @@ -45 +46 @@ - diag = dev->dev_ops->allmulticast_disable(dev); + diag = (*dev->dev_ops->allmulticast_disable)(dev);