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 7DE9D4642F for ; Tue, 8 Apr 2025 09:46:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 789384027F; Tue, 8 Apr 2025 09:46:21 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2055.outbound.protection.outlook.com [40.107.237.55]) by mails.dpdk.org (Postfix) with ESMTP id 925104027F for ; Tue, 8 Apr 2025 09:46:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X4rKxjGkptFDgJwvpq/SAqlZpqHfSblnRsI3ZkqD3tce54BfxLj+D4hD2SMPYXAdD/cUETgQetfy3cWl1Z+Z9lw3dVg/ugMqF2C+FABAZUj+HUC4cvtRPWJprNeK7Fnklc5o/C/MxiisQD92GhpVSlcnZ5wYwhYc0ODHdW5AWQUq1DOGl+288XjSWc2DsYSu2Iyfi8TL9OuCbGrbCMNeaZlHOdsYoEMhqI3bTrkAOxaTZGyM9MoUX8doVDCrdrVANGlo4hkC5iYaRMom7QDGpi8OUlaRMjBNMtcnk6zGz3DDL5gQfv1wNREu5l6M0o1LZ+OhonG9j7rKV6bEoRffAA== 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=Te8AoBKH6caKWrx06uBQsAzTvPJ6eK26UF/wn9VVS+8=; b=hBcDCZgoQfF/uY4+wW4RXYzNAA+GW5vbCayMw+UTHDG3Pv+/cxP0BEo4NcQx2HnSk/QF1+/p4R9XF2RckT0WwJH6vL7J3SwNVN10OArV2VppnhaO/E0IsidvlhPPmW2WtNRaYRvFZdykpojXIccBm8AggrZL8Oc1S/PrckJ46vx16qCfbQ7A08NKUAcBETnbwsXjoTcMYHi9+XOYdYqVrIvuiZUZ8QcfP4PcvuPhiog+gY66cs9ItF1CxUsh2S8N+UFKUHLlPrEQoBYjVThNGYhR7tlsD0+j9Wo9GGCat6Br498rxSTn+E2dXFHNDCpdHboZfliPFG2fYkaptfddWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=microsoft.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=Te8AoBKH6caKWrx06uBQsAzTvPJ6eK26UF/wn9VVS+8=; b=LtmE1PaU37W9cFtWx99iBEoApKMvFd+11fp8iLk4EEvYzZh9IfbtSxWeNb6GdEKTiPQ6dAT8Pdrhhkpeo1n54YIMqyHdWmcgvLIDoXLCLfImv5BFVB60m2Id4+A0BUkIfd9Ebc1x0fKDzaTwMH2xBscmNquJxoPpLP5CkZ+ifvg5lSw9kkqpnY6whFIIfBhyD/nYAroFVAr6sdR9fU7VS1gIGLCbnJfapFB65TcIrTb5iI6cf61/e5UdtBQRheplI9CZV4o2yia4JwJHz47a06b2f1agRawXCa4QHJlJ58HzqFeOSRujHxpW1nsClmYdP8l9Hov/ujOiildVE6EH8w== Received: from BLAPR03CA0010.namprd03.prod.outlook.com (2603:10b6:208:32b::15) by SA0PR12MB4416.namprd12.prod.outlook.com (2603:10b6:806:99::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Tue, 8 Apr 2025 07:46:15 +0000 Received: from BN2PEPF000055DD.namprd21.prod.outlook.com (2603:10b6:208:32b:cafe::35) by BLAPR03CA0010.outlook.office365.com (2603:10b6:208:32b::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8606.35 via Frontend Transport; Tue, 8 Apr 2025 07:46:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN2PEPF000055DD.mail.protection.outlook.com (10.167.245.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.0 via Frontend Transport; Tue, 8 Apr 2025 07:46:14 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 8 Apr 2025 00:46:00 -0700 Received: from nvidia.com (10.126.231.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; Tue, 8 Apr 2025 00:45:57 -0700 From: Xueming Li To: Long Li CC: Xueming Li , dpdk stable Subject: patch 'net/netvsc: scan all net devices under the PCI device' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 15:44:27 +0800 Message-ID: <20250408074515.361046-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408074515.361046-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> <20250408074515.361046-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000055DD:EE_|SA0PR12MB4416:EE_ X-MS-Office365-Filtering-Correlation-Id: c64a6e77-9c6d-4c65-bf22-08dd76717086 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?f14YLuTLf3cD6SLpP5hyzW/Xq96y98vcgIV5h5WZst9NzeXG6eTBS96nUwZ6?= =?us-ascii?Q?rnCBuvbDkHHUmkxpKIW+ohrfV+UnjrHO41BgFP0LKDclvZV0Etyqo9tpmd70?= =?us-ascii?Q?6x6SdeWYAUjKO2w8owSNUdtQOy1w1FrCixCbHotcwLkwljyOGqLQxcLlgQ/G?= =?us-ascii?Q?YqC1WTVV2i2IFusvEAenD42gLz5VfX8PAfzwwmhGI2iDb3zEUjkGp21WAOfW?= =?us-ascii?Q?9P//5xE5rxWq3Pjalj544LAvQk5y2x3zTm1/Ub0ubtBJPO/HfU1AQNtkgxvy?= =?us-ascii?Q?TG+tsR3ZhpvRJteRPENXjJlKo8AS4/AyUx1F4XHA7OIPI3cz2TCphGFjgNmD?= =?us-ascii?Q?VFqo91p9Ug+d8H0luhqVrrf7gqN1cdx3d8GhZeKZC6xiCXf6x5w7UbMChhOQ?= =?us-ascii?Q?e89BFNgUeyVYaLEtoHdQOyIVOwgxgk0p/+GHbOlXDDVGCQrQfi6Jtm1UmPNo?= =?us-ascii?Q?98sRWRLEQq8TkXRR2JM6hihJBAVasyMM3HZ4s+94llCreDlYB5q0ETi9HUpv?= =?us-ascii?Q?P3CyWILvU9KDvbNeEj3TXYWiEidHBBzRIuuzUjLPLJ2HyO3fMqnNAT3sIrRZ?= =?us-ascii?Q?+nhF7EmUvIdx193lGEwAj01FUFuf4jGvhTuNH7jEgE3rfQUC1rR6zxtHVYiI?= =?us-ascii?Q?3WHiNMtDjXQ/kQEBtjlZrJt/+Lh9z3oa5WF9X+8K/ZVSr2/A91bf+1i0UMWk?= =?us-ascii?Q?+neEYivoq4R2wsJs5EmMmA1VBdGrfB8j6sQtlNuk3Sj67Vzyi1k11AEEA2iG?= =?us-ascii?Q?lFRKMc98pxfjla3gAyiQ8P+L5Ny05RLrRhU8kGwHPCUcg6Sps9jappA7lryl?= =?us-ascii?Q?2puIjI/bh5Xl7+8aUJJyycmRAk/y/oGiNZo12nzmvCyLMlW/k76UcX4pEUun?= =?us-ascii?Q?4nSgfqnz21ckqAoDKTvS0uGoq1WUSNQwc4pXoST1LmdZj7BNH2P9YFAQUg/T?= =?us-ascii?Q?VH4f0q2GTlK/zpyXJzhku1ITj9s1I6zZ+r8N2jq4VLf9tRNBBc8noDAGdCD5?= =?us-ascii?Q?51jdg2EdY/wU/a/ltylhBWejO7aHULm+Oxe8FOKInw5JNIYO84zCb1tDPS+A?= =?us-ascii?Q?eswq/uiMLIGhrPgg9lSVFmA1xKcNBJQmq+ZNiLNdgRI10yQWczSJqBK7rtBB?= =?us-ascii?Q?4moFoLJjESizeWUPJgImUEYMB/OOsChr6MCKpModeydfEIQuZ6SW3uWKO8xG?= =?us-ascii?Q?RysAcXMtlBwUIE3OqGDxFI0SbTaF4beGh+PAkCnfKDIIy17KqylwFJE9xKPV?= =?us-ascii?Q?JLi5kE2aUVJphhdzNpme71YSvZlqXofbc6nT+rvHCdWCPqKuTOlo8J6V5uqu?= =?us-ascii?Q?eoXOO98IMxlLDmuUcWqYsVvXo9VNLmlmFYSNt7uJKbpAIhcHm/+VPJFXRu0f?= =?us-ascii?Q?hvoe79zjaQF97akG5rpxyYCrHm67NJriOSQWcJeLk/lGlO6fr02RwxhEgo+S?= =?us-ascii?Q?/ZMfo0LEKyWVne43nAQmKq+36CJ23le0eDhsj6cwAobOFlDvZlB4zv6DbrKw?= =?us-ascii?Q?GlSAtSJEbjJvb08OphRfwF2SCmPAI5qNp8f8omCSEFrDHmkkeCxOY1eOlA?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 07:46:14.5688 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c64a6e77-9c6d-4c65-bf22-08dd76717086 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000055DD.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4416 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/10/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=8ba3b764b2ce365201ffb95f391af504b3ce33f0 Thanks. Xueming Li --- >From 8ba3b764b2ce365201ffb95f391af504b3ce33f0 Mon Sep 17 00:00:00 2001 From: Long Li Date: Thu, 13 Feb 2025 10:58:23 -0800 Subject: [PATCH] net/netvsc: scan all net devices under the PCI device Cc: Xueming Li [ upstream commit 7690b9ca7b0e5f54ffa7e94957e3fc04bcdc92e4 ] The current code has the wrong assumption that a PCI device can have only one Ethernet device. This is not correct as a PCI device can be multi functional and have multiple Ethernet devices. Fix this by scanning all the devices under a PCI device. Fixes: a2a23a794b3a ("net/netvsc: support VF device hot add/remove") Signed-off-by: Long Li --- drivers/net/netvsc/hn_ethdev.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index 1736cb5d07..f848157b49 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -570,7 +570,7 @@ static void netvsc_hotplug_retry(void *args) struct rte_devargs *d = &hot_ctx->da; char buf[256]; - DIR *di; + DIR *di = NULL; struct dirent *dir; struct ifreq req; struct rte_ether_addr eth_addr; @@ -590,7 +590,9 @@ static void netvsc_hotplug_retry(void *args) if (!di) { PMD_DRV_LOG(DEBUG, "%s: can't open directory %s, " "retrying in 1 second", __func__, buf); - goto retry; + /* The device is still being initialized, retry after 1 second */ + rte_eal_alarm_set(1000000, netvsc_hotplug_retry, hot_ctx); + return; } while ((dir = readdir(di))) { @@ -614,10 +616,9 @@ static void netvsc_hotplug_retry(void *args) dir->d_name); break; } - if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) { - closedir(di); - goto free_hotadd_ctx; - } + if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) + continue; + memcpy(eth_addr.addr_bytes, req.ifr_hwaddr.sa_data, RTE_DIM(eth_addr.addr_bytes)); @@ -636,22 +637,16 @@ static void netvsc_hotplug_retry(void *args) PMD_DRV_LOG(ERR, "Failed to add PCI device %s", d->name); - break; } + + break; } - /* When the code reaches here, we either have already added - * the device, or its MAC address did not match. - */ - closedir(di); - goto free_hotadd_ctx; } - closedir(di); -retry: - /* The device is still being initialized, retry after 1 second */ - rte_eal_alarm_set(1000000, netvsc_hotplug_retry, hot_ctx); - return; free_hotadd_ctx: + if (di) + closedir(di); + rte_spinlock_lock(&hv->hotadd_lock); LIST_REMOVE(hot_ctx, list); rte_spinlock_unlock(&hv->hotadd_lock); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-04-08 15:39:06.137544313 +0800 +++ 0002-net-netvsc-scan-all-net-devices-under-the-PCI-device.patch 2025-04-08 15:39:05.856436604 +0800 @@ -1 +1 @@ -From 7690b9ca7b0e5f54ffa7e94957e3fc04bcdc92e4 Mon Sep 17 00:00:00 2001 +From 8ba3b764b2ce365201ffb95f391af504b3ce33f0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7690b9ca7b0e5f54ffa7e94957e3fc04bcdc92e4 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org