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 16E9246BAE for ; Fri, 18 Jul 2025 21:35:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1212A40611; Fri, 18 Jul 2025 21:35:15 +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 102CA40B8F for ; Fri, 18 Jul 2025 21:35:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867313; 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=nJYODPpETXeLH4FANBmx9ikC+lt/hpaZ+cimQr53peE=; b=VSYVrvmx588ZlOL+ypHbwDGlK54Wyd2qJMPP4Ke5dXqiRJinQL4oLv/UiD+2yMJYjToGXj WYfuI5tTWMyR5KgsLSU4OrHROvyidsjBy4YLx39/LQk5RrpTIKdsm78FjNIgxYOD3X4V0s 06NDXOJ6V1lDRMPK4mogkuLUkdA+TKg= 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-121-eqKBineSNS-IIj2jK-8m4Q-1; Fri, 18 Jul 2025 15:35:07 -0400 X-MC-Unique: eqKBineSNS-IIj2jK-8m4Q-1 X-Mimecast-MFC-AGG-ID: eqKBineSNS-IIj2jK-8m4Q_1752867306 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 547591800282; Fri, 18 Jul 2025 19:35:06 +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 171A4180045B; Fri, 18 Jul 2025 19:35:04 +0000 (UTC) From: Kevin Traynor To: Yan Lu Cc: dpdk stable Subject: patch 'net/tap: fix qdisc add failure handling' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:57 +0100 Message-ID: <20250718193247.1008129-63-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: Twc5hx3f46Av7D7wA_R6meU3lZyr0HHG2hrCuDEI4s0_1752867306 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 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/1c12ebb23098986c34fa9ac1983124d840f294d6 Thanks. Kevin --- >From 1c12ebb23098986c34fa9ac1983124d840f294d6 Mon Sep 17 00:00:00 2001 From: Yan Lu Date: Wed, 21 May 2025 09:33:13 +0800 Subject: [PATCH] net/tap: fix qdisc add failure handling [ upstream commit 02a68649e6fb55d8975c726e3073ee9d12c20bac ] The errno variable was assigned a positive value in the previous handling, but here it is compared against -EEXIST, When the tap already exists, this would falsely report an error. Fixes: 6fc6de7e0eaf ("net/tap: update netlink error code management") Signed-off-by: Yan Lu --- .mailmap | 1 + drivers/net/tap/tap_tcmsgs.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 257dd551a6..9211e53fc7 100644 --- a/.mailmap +++ b/.mailmap @@ -1728,4 +1728,5 @@ Yang Ming Yang Zhang Yanjie Xu +Yan Lu Yan Xia Yao-Po Wang diff --git a/drivers/net/tap/tap_tcmsgs.c b/drivers/net/tap/tap_tcmsgs.c index 1755b57519..caca9445c8 100644 --- a/drivers/net/tap/tap_tcmsgs.c +++ b/drivers/net/tap/tap_tcmsgs.c @@ -262,5 +262,5 @@ qdisc_create_multiq(int nlsk_fd, unsigned int ifindex) err = qdisc_add_multiq(nlsk_fd, ifindex); - if (err < 0 && errno != -EEXIST) { + if (err < 0 && errno != EEXIST) { TAP_LOG(ERR, "Could not add multiq qdisc (%d): %s", errno, strerror(errno)); @@ -288,5 +288,5 @@ qdisc_create_ingress(int nlsk_fd, unsigned int ifindex) err = qdisc_add_ingress(nlsk_fd, ifindex); - if (err < 0 && errno != -EEXIST) { + if (err < 0 && errno != EEXIST) { TAP_LOG(ERR, "Could not add ingress qdisc (%d): %s", errno, strerror(errno)); -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:13.258493708 +0100 +++ 0063-net-tap-fix-qdisc-add-failure-handling.patch 2025-07-18 20:29:10.963907432 +0100 @@ -1 +1 @@ -From 02a68649e6fb55d8975c726e3073ee9d12c20bac Mon Sep 17 00:00:00 2001 +From 1c12ebb23098986c34fa9ac1983124d840f294d6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 02a68649e6fb55d8975c726e3073ee9d12c20bac ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 59ee5f7d30..df3674cc7f 100644 +index 257dd551a6..9211e53fc7 100644 @@ -23,2 +24,2 @@ -@@ -1747,4 +1747,5 @@ Yang Zhang - Yaniv Rosner +@@ -1728,4 +1728,5 @@ Yang Ming + Yang Zhang