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 0AEE246A63 for ; Thu, 26 Jun 2025 14:07:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 01514400D6; Thu, 26 Jun 2025 14:07:02 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2088.outbound.protection.outlook.com [40.107.244.88]) by mails.dpdk.org (Postfix) with ESMTP id 344394026B for ; Thu, 26 Jun 2025 14:07:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c1cbCZsqnUBWElb3/nErwop496I8wbjujMjRhZ0DGKP2RpcTehn3Noo4Fa0n5YfVOgd1OxO2hxjxpEnyK3LadGzt6qQdiKfncGRtHS34p+oxj1WesJQWf6zW/CB0QEWhF/aYEuEUqR42Syuo/h2WB8bePzhx/pjHpHrXMUuaLFtQz2S3FH4l7JieKRInqI+Dgogq2fzoAXgn/+/kaTY2OuLvbUm0OEPGvI/Q2xLG/2mFXtHzoqxSl8n6tMzlSj9V73AYPaDVwEqD27CioNrS5GY+BAFHOlMfPd2LW2CI5OLL/hXYAkCeUr4HTIRnZfOYyv8cBqRh3EZ76o8ZYEYjRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kQCPx8P+gsyscp9mMqfqJU5Ev6/lrjoW2cMQgVzd3k4=; b=ZBpMwxDP+EbQp1qzLvqeOPHBzb8x6V73R7cA/PmrhjDcqT4uRsYPrRDnJakbRT2rsXK3GqLXOzx+g8HEWxQdChaPppD36ShgGKNVxY3dCs4IJHkbLX05v7DGm/iGpdPR8zv5FqNyOVH55SxgmEROeeQcuM9XZBey7sSk6LwuREUJora0ZoAcEsWyBsgRsmkxYbuFjRpFVsRBT1BuRMN5M9JGm4paA3j8MMaRC6pAFmexOXIZjv1L5aDv7PgPkN/sbjjwnIjnNT63a4cV/HuUKVHEGJ1lu6MpLvW37iI1fHQ9+ugR1BwkeJcYqT39C0kQKhzBH6YjOrD31hodWbkoig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=cmss.chinamobile.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kQCPx8P+gsyscp9mMqfqJU5Ev6/lrjoW2cMQgVzd3k4=; b=AozuaA/eTNpXU8nlf+VWjEEU+c3RMRUX/XLlV1MdJwsTJABxxIT0TytrQQ/M/GqdXVKf8AAnstxiN4Qsj4NB4RNWqAd1Hge1SL4mjkrpysNvWZV3b1HbBXHxLPoD6pd3oHwIUBUs7IJ/GVHGEKMeEKbhZ4p/zORIZY9GSz63JG2IbbsUQf2I3xf2uUQvExI2bYyfNbrGc1aAUksKiTCLLtszgrqPtuuqNgcomMSO1iWXLZRvpzSN2ojycAUH3v7eR4i2UXvXy0pos6SaGZKixJGp0S4kSgjvmJ8UeNUt1lr51F+WljS3gJ53NZYWk5fmlfd33trkZ84lV9Nu6mdaQA== Received: from MN2PR08CA0011.namprd08.prod.outlook.com (2603:10b6:208:239::16) by MW4PR12MB7335.namprd12.prod.outlook.com (2603:10b6:303:22b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.25; Thu, 26 Jun 2025 12:06:57 +0000 Received: from MN1PEPF0000F0E4.namprd04.prod.outlook.com (2603:10b6:208:239:cafe::d8) by MN2PR08CA0011.outlook.office365.com (2603:10b6:208:239::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.23 via Frontend Transport; Thu, 26 Jun 2025 12:06:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000F0E4.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:06:56 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 26 Jun 2025 05:06:34 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 26 Jun 2025 05:06:32 -0700 From: Xueming Li To: Yan Lu CC: Xueming Li , dpdk stable Subject: patch 'net/tap: fix qdisc add failure handling' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:13 +0800 Message-ID: <20250626120145.27369-54-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E4:EE_|MW4PR12MB7335:EE_ X-MS-Office365-Filtering-Correlation-Id: e21e9b76-acff-40d3-4342-08ddb4a9f238 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?CRIVMAyA5CgQs1zPyXmg6cpltg4Pq9/aEr54S+U7PnGNwjsP9F02Ho3sNYIW?= =?us-ascii?Q?Nr6g7OfrLpVblq+pryllrYpy/VD95vnAehlzhoxcm+1MsGtasOFrPMuW4Lbz?= =?us-ascii?Q?ss5pDYCblxFpmSNfyqmHogv2pw4TBagBmYIOkDf96MNL/R45n/FGnc61eyU7?= =?us-ascii?Q?O2kLv2Pb0PyHQCQPeA9+KHlw6XHkKFYCCkwHY0yhD7N/VO4IwRr/nRtY/ZXu?= =?us-ascii?Q?Qu6TUOjYqmDCzSsuyuPFdThY5JaTtrFVw2sJ9zUzyy7Fkj538MLDqfQwZUvE?= =?us-ascii?Q?St3Uu1XsRuGYzo0Mv2tT6Y88IBAS/lCBfUQuDg2F++35m//rENqp19ucyv/o?= =?us-ascii?Q?xdx+JRLK/BPwUNSxoKP2CQGhyutOyuQilITPVW1S/dWDFo2079FVDSNIknpE?= =?us-ascii?Q?F54r83b4xkjO092zQlFyZ4UkltdWMUumEGNG/9qS7c/0vcNKAct44VxSTRQD?= =?us-ascii?Q?TjU7JgI6eS6JkJkBpSdRwGGfBlmVQfNPzZQnyN5ZqzhRPlvaLcm0p9Ba5Uoh?= =?us-ascii?Q?AYfj3snUKGvupyXVdrIi2ut6Jm/Ba/SUvj9H6WcmiCd7tPNhaf5keHQ2kj5H?= =?us-ascii?Q?xjCO2aoO7YvNw9J+JqZiqJsUrYmcnkIWto6nPAuT1IVY8Cv7jFHrTnSD6dN8?= =?us-ascii?Q?KighP3gziJ3WHoBtAuYXLMfH2AOPthXlW1Mkc6Q3xl9Mj+vVyl9UzvHHD3Je?= =?us-ascii?Q?dIjZBVLmsyzHCXIhf8IvK+L/a78ogFNFHX6Sc94X8Xge1i+tOu/g51PQDKHK?= =?us-ascii?Q?g+atGG3slCULIxHxg4U7v7LVSngJiT1DR7EWj4TMvjLPbo86+C/kSBvudolL?= =?us-ascii?Q?Vy5RJjpqESGF148zK7TS9Ig8+Up6yr+Ue8vxRz82lIi4KG1OzRQISRLVkJTd?= =?us-ascii?Q?RU2xx6yn5IdScBi1rh9yxPce39V6LxbuE/2Bw7p7Hiy0FXLJPZap4ppQc2P/?= =?us-ascii?Q?zqfHkNUSpF7DL2fYUSIbYEWQe9IEN5Xz07zYFR1Nq1orRotTepXLbA47GCQK?= =?us-ascii?Q?lY2TJyQvh1QUgmywQvDQistWI6WZHZMP5TytSBuWNsgxNYqboUfdIh3C0swN?= =?us-ascii?Q?IrXGIYFPYivsTkWZ18LSMx/IqmarG+AzMDye/qg2jlGUNtuwCOJe/Rslnbsb?= =?us-ascii?Q?/iDfpVVGoZUg+O5AIvqPwF7Rex1bQYo9tslTeKa7WqvaDwwD5JviWe0xrZAU?= =?us-ascii?Q?W8es/Ozy/aTXcPlKp6LDFzH/I83pqPpqhvtF/5KTVf6KJpEuTqP+SQWlJAFU?= =?us-ascii?Q?O+OuQDLcDfHtyUO6Y/jyIemNuMkRvssK4v8FhMHRRXwDbZTS6i8ECc2ipH+p?= =?us-ascii?Q?AAEO0L5OFR9OC3KvP+EuJZEh69+PyQQexRY7+y0/dLxWnTAS2x1lWe5lLkY6?= =?us-ascii?Q?wQzFvZBn7Nw00+Bdwtv6ZfwRTKCzELVGHSz8kTNdDJ8KX0CLmQQj7XoaI+Hq?= =?us-ascii?Q?8BNZJoDGC5io8dIB7yKAIkBuBgDGBvCNF1yk4FLUFZmXqqq4zFaaVBcqM+Ch?= =?us-ascii?Q?deaucrQGxZQ0SqUsbgtXRiGUUk8qj/QJptnfj49OlBA634qXIluqzEH6Tg?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:06:56.0792 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e21e9b76-acff-40d3-4342-08ddb4a9f238 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000F0E4.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7335 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 23.11.5 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/28/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=9a33966ea38cc61e79b9577faeee47ce713fe3ad Thanks. Xueming Li --- >From 9a33966ea38cc61e79b9577faeee47ce713fe3ad 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 Cc: Xueming Li [ 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 20fa4a22ba..b4e75a6046 100644 --- a/.mailmap +++ b/.mailmap @@ -1639,6 +1639,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:19.861836541 +0800 +++ 0053-net-tap-fix-qdisc-add-failure-handling.patch 2025-06-26 19:59:17.422418042 +0800 @@ -1 +1 @@ -From 02a68649e6fb55d8975c726e3073ee9d12c20bac Mon Sep 17 00:00:00 2001 +From 9a33966ea38cc61e79b9577faeee47ce713fe3ad Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 02a68649e6fb55d8975c726e3073ee9d12c20bac ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 59ee5f7d30..df3674cc7f 100644 +index 20fa4a22ba..b4e75a6046 100644 @@ -23 +25,2 @@ -@@ -1746,6 +1746,7 @@ Yang Ming +@@ -1639,6 +1639,7 @@ Yanglong Wu + Yang Ming @@ -25 +27,0 @@ - Yaniv Rosner @@ -32 +34 @@ -index 1755b57519..caca9445c8 100644 +index a3aae3c814..24a0423a0e 100644