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 D40BC468E4 for ; Thu, 12 Jun 2025 23:10:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D05E642E0C; Thu, 12 Jun 2025 23:10:03 +0200 (CEST) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 84DDD42E56 for ; Thu, 12 Jun 2025 23:10:02 +0200 (CEST) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3a536ecbf6fso931797f8f.2 for ; Thu, 12 Jun 2025 14:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762602; x=1750367402; 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=pd045BQamVL1c/+txmPuQjWUINVgD/QPFrjAbewJAdI=; b=WwIRfXMeD10gX6l8OnDlT8jMzNqWyJeKS6RpIYPJ0LLv+Yw8eLltONnVAM9S2032Aq VXDkKChd3bxEXrCTUKSZZg0XzcDzbYTwdWeWpgaZ1b7hhkdUp7CDDSX28+hq0qnppbFC NYL37ZledKJy90FBJ+tCoGr/2Y5ULfWFDTWihjU5sjzLoY44w6cxPlUhD8Q0Mr09c4mm fPf7uX+4kmZRBxSUiTDiJL227Kggxg5sYMhtlVpXho3ZpM5abj6glOVbPCnyL4hFXcOW ze8nfAzf4ql9LDxuFb5lxxAFgFza/bFSEw1O7BZmPZqlnFsrdoyikT7BqTHr4SQSFUAq 92iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762602; x=1750367402; 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=pd045BQamVL1c/+txmPuQjWUINVgD/QPFrjAbewJAdI=; b=ncmaNRiSMG04uZ2CvnNVmt7emrMq7yWBXv+rsiDdt6HxBsiE8wHz9eC4iyk2PVPUZT bYy6TDmc/WtZLCA6Z73UyosywTgkyjJINIDuki16c9rHtk56gP4Xm3k9ZhiE+lvmDffA /hnlRlLaPT0am8rmm2iDc0DWIFaXjEKKN0pbwm7/JAf5RJFk8GowYpG9jrVsxxYggF1Q x851nat8LEdrmPpsT0GAxmYjY+52A4/3PaUa+zbaPYebTpr4YwKTl7UXf9zGG0msB7YU +8LPwqpl28k7KDMSCbWI+EelOKmO/+RLdAAI24cp5T9djirbpNnxB2fpW9q0Of3bYATI Yhpg== X-Gm-Message-State: AOJu0Yxn9PtM6LldOZ82In1cCGhuQq/JZ8wUzrOhrani/lUBZVRjsXSB DNGzmMXMSmdxmv0b2SE/L9pnfLwcevDCdRPQdfMXuMnjwn+LeQUyQbJK2Lpn+N3C X-Gm-Gg: ASbGncu7INRWWMW5xFM+y782XHN6MQFng1AUUzHVJKxcNOopNZDV9FqIRID7f6rvrTo 0/sss7ftOirdX7QwHHbGlwExNXeE/1FzpyPHH/5bGwTc5I+mOMmmompkBvN7HMVTFX23ulJIF4b CQ1f9rCJ7Wt6FTPFiwCQdW/l4ydGASvzPwe/SQApxiNEPSCQ5cKEpEXbW//4h8WLFfcreqbzUma ppwTnP30G8x4GkHd3DQnWLMUElpiS6y2Cs2GAz5qDPFRddfdjuEDt03jHEySd/B4bOhZJmfAy9r v4deqWKtntaURovesxkOoFzFMunEfAXAbk2R20OyJCpl1fWlCme/03VzOf5BR6Fzg5/h X-Google-Smtp-Source: AGHT+IEcgSMQexhYq9OIyhsYQ58sX1usYdwvkvFRS2uvlf/hLxrMbyhGuOJnmKqrTMIv9oObaGm8gA== X-Received: by 2002:a05:6000:26c6:b0:3a5:58a5:6a83 with SMTP id ffacd0b85a97d-3a568671df8mr686641f8f.13.1749762601952; Thu, 12 Jun 2025 14:10:01 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b61071sm362734f8f.90.2025.06.12.14.10.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:10:01 -0700 (PDT) From: luca.boccassi@gmail.com To: Yan Lu Cc: dpdk stable Subject: patch 'net/tap: fix qdisc add failure handling' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:01 +0100 Message-ID: <20250612210733.2506558-44-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-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/ad22d940fa5d8c4a2dd6cd118bc200fa213e3d52 Thanks. Luca Boccassi --- >From ad22d940fa5d8c4a2dd6cd118bc200fa213e3d52 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 7bbd4bb02e..8cd91eff62 100644 --- a/.mailmap +++ b/.mailmap @@ -1569,6 +1569,7 @@ Yanglong Wu Yang Ming Yang Zhang Yanjie Xu +Yan Lu Yan Xia Yao-Po Wang Yao Zhao diff --git a/drivers/net/tap/tap_tcmsgs.c b/drivers/net/tap/tap_tcmsgs.c index a3aae3c814..24a0423a0e 100644 --- a/drivers/net/tap/tap_tcmsgs.c +++ b/drivers/net/tap/tap_tcmsgs.c @@ -261,7 +261,7 @@ qdisc_create_multiq(int nlsk_fd, unsigned int ifindex) int err = 0; 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)); return -1; @@ -287,7 +287,7 @@ qdisc_create_ingress(int nlsk_fd, unsigned int ifindex) int err = 0; 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)); return -1; -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.509599259 +0100 +++ 0044-net-tap-fix-qdisc-add-failure-handling.patch 2025-06-12 22:06:23.874044722 +0100 @@ -1 +1 @@ -From 02a68649e6fb55d8975c726e3073ee9d12c20bac Mon Sep 17 00:00:00 2001 +From ad22d940fa5d8c4a2dd6cd118bc200fa213e3d52 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 7bbd4bb02e..8cd91eff62 100644 @@ -23 +24,2 @@ -@@ -1746,6 +1746,7 @@ Yang Ming +@@ -1569,6 +1569,7 @@ Yanglong Wu + Yang Ming @@ -25 +26,0 @@ - Yaniv Rosner @@ -32 +33 @@ -index 1755b57519..caca9445c8 100644 +index a3aae3c814..24a0423a0e 100644