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 C73564642F for ; Tue, 8 Apr 2025 09:47:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C04094027F; Tue, 8 Apr 2025 09:47:24 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2065.outbound.protection.outlook.com [40.107.92.65]) by mails.dpdk.org (Postfix) with ESMTP id 15A994027F for ; Tue, 8 Apr 2025 09:47:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=B7HQAvKPHVFW9Ws/vfYHqbN0G15YTO12irRRwxdZb5rz2P3NumvXHN+eo+3MVaoE07X9LT0aJiq6BxDAlAGoMxywNMr3GQIx/vvkNwcTNtQRXyhNg/jPOCIXG3pATaTQdp//KLkegLxQuVb8+b8hY+N/phrEAn3Twr9wzF+c4SP7L29bhIZIdBqp8Ebe8SOD9pXRbRxXg/19ken2rfMWekZeZ3Kj5OHH7s7XftL5Ipak95PINWzDbJDCsf8kVo2sJzbQWfksQumW2AStFJNqgwITWEuuueMtdkaOBPxJfYuEbygiZkBfUF0WnEdyKYVpzUHpFIQsEyvnu6jbDiEGUQ== 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=GBMyCDANcEUSsGZEtqpkzgGrWzbjbPZzMekHuCJ2UiE=; b=XgxJZMT6wF3wC4doWZJPMGZsbCNSxc19W2kS5eR/JTdCZrDpv4seQFS1JT77CZSJLwp8YIg90UaRuhOmnFUtXnLE7nMI25Jgkf/KMtO/wxQK84y05ngCKYgQrxGa7cijHH8DvUoTc21xXSPMLi2C/lPAPJ9yYIQ0UHLRuG/3yp9czXyKa4G/TRmKv6sFXShN0KBShOY3ZgInp/dERS/0PT9WEyE9nfKZh1eT5KnTNwsRFKSvZIm+dyfjdmcVdTNKLREyOcmYNkBtX38ZMmNnbDdvUPWHXbeURTnfYzuXeRhrSMnKWh2afpoWQrg6fH1nwFx70IYuw6A7Si99Uepz4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org 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=GBMyCDANcEUSsGZEtqpkzgGrWzbjbPZzMekHuCJ2UiE=; b=bepUSKS+p+6d29FGz9fnDScj9qXXFwzEVUZVJVR6YrtneSDXai2k5qDSoJynGpe+F8ehR3trCbdx9tngNtsAaQ3brIn+ZYOyL9zprtZIhVKn0ozTwNAGZwjEDk+tKct0nO6950NrbX9JJJEip5EIqQfN+PUaH99wA4XtAmAg4SgmojsBpxv3EfNRX52IxQoC6DmDERKCLQzarC7kKdvKX75qokUG50AFJrvseX7qrU0Npap6lzqTZNnc1nHMR4di2/3harKD3H2WrHT1XXwem9lv8GLk6qt5doPEeANREAUQMyYi0XaPT4XhW/1livllcSqBIRsqVUtvht0fWNptNA== Received: from SJ0PR05CA0119.namprd05.prod.outlook.com (2603:10b6:a03:334::34) by SA3PR12MB9091.namprd12.prod.outlook.com (2603:10b6:806:395::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.35; Tue, 8 Apr 2025 07:47:20 +0000 Received: from SJ1PEPF000023D1.namprd02.prod.outlook.com (2603:10b6:a03:334:cafe::33) by SJ0PR05CA0119.outlook.office365.com (2603:10b6:a03:334::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8632.13 via Frontend Transport; Tue, 8 Apr 2025 07:47:19 +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 SJ1PEPF000023D1.mail.protection.outlook.com (10.167.244.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.22 via Frontend Transport; Tue, 8 Apr 2025 07:47:19 +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; Tue, 8 Apr 2025 00:47:05 -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:47:02 -0700 From: Xueming Li To: Shani Peretz CC: Xueming Li , Stephen Hemminger , dpdk stable Subject: patch 'bus/pci: fix registered device name' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 15:44:35 +0800 Message-ID: <20250408074515.361046-11-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: SJ1PEPF000023D1:EE_|SA3PR12MB9091:EE_ X-MS-Office365-Filtering-Correlation-Id: 07f75740-6f90-43c8-9563-08dd76719723 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|36860700013|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?g90yQGQfn1zYz9iDE84lzgPqxukJUaYH0bI81oDllg611pksYRG+J/wRjtRJ?= =?us-ascii?Q?ufpuaxkikJ7Wc+zS4+MDq+wygrThrrcj8eKf+Fa4/Dl25NKjwXjU7+j3qsN2?= =?us-ascii?Q?1G+ibNcLYUlD9OCbvN2uwxVkqnPAknPCUb4XnTzYZs8YDl80ugJb7rOzGA1P?= =?us-ascii?Q?B9Ld6yS354eKRYhiqkNtN4al3KHqIjhsj4/uKL4auQe0UqrMAvaE4HPV9xrw?= =?us-ascii?Q?1+2FO5SzA7hX6892e+mYNriVdASjstFPSbhEdzEnprEEXGZFLOW4vD88rJCh?= =?us-ascii?Q?4Np9qVlyN83fyCs5Edswf//5Gl8Xxnr0jjaAEhxXWvrGcI+XHSTBOvqcui3o?= =?us-ascii?Q?nGVZwjucoFGYV2+BlyumNSmJJbzJzrdQc0+frKn47wXGxfGV5lnmTqTg5mDh?= =?us-ascii?Q?ZgkDbJnAZUejAk+suUaE1eRDfrR847BdvrcHqDkvZH028fmmlQiXaarjupv0?= =?us-ascii?Q?6Nb+7XGIwIeiJJOlTzwe8jFkb7iKug8EHTgrNsAaNF6hWJYdDLBrMX0WUd8Z?= =?us-ascii?Q?tBMAjb71udmi1N3ea+t5yI73J6OJg2iq/Xi258MgO25OmOjBC0j/3n+s6hQD?= =?us-ascii?Q?hHJfNz1PmHfr4dNg6D3gcSUipVItx6Ah//Ro+FXu6WtnT63h30oxcaeQP6KY?= =?us-ascii?Q?+qfkBOqc643TD6XhxB08jl3WTKa42AAr71Mji731YuBJobaWEqambK6Auoit?= =?us-ascii?Q?Oxp9evkgux3YWm4QNGjvqiEotbaOVGHXzMXDDjRVBfxdzcCA3ftERRzCfGZV?= =?us-ascii?Q?hRqiKuXpDJTveL9C85FVR+ImbwcYkA6iFUXoyjXqsRDm7JaqFNYnzzxtP11N?= =?us-ascii?Q?Kz7zvOtZCSBMhAsQkMBOP3mxpbsPl5eSUn3Ro9sagF1bvHlg8Bul7SUS2fWM?= =?us-ascii?Q?jywxMPI0OInpz8A+oPjFxIpYn+n4otxKMct7DJEi5xfaI+uw+mGIip6auiIZ?= =?us-ascii?Q?Cshi3BpfxT7KKpjJwdZupVN0Yf6iSfOzGM4m6hnMh/7gCXJf8z0yiqdlriae?= =?us-ascii?Q?p3iZTMvfS2eHtuf2Y3Of31dSFgOqvp+hZ9ozZ95DJ0L0y3Nc1R9tWlATT30T?= =?us-ascii?Q?94GzhJZ7BHY+qrDltGDqG7xPAwkMTVsu6ydQpSTkOjQjSaz0uYQy5vYuy+yS?= =?us-ascii?Q?65SFa0PjlAPS3g1o88/vq4POv0q7lLtcqtG0EJ8YqAAhor9eHfk3xk2zvJQQ?= =?us-ascii?Q?1aoAyMectzNTFmi3UGMarMv62usKEaYRzpwwLr1nLtUGigWK980dqVQttdJZ?= =?us-ascii?Q?/RGQNN7+Z7TqyDbBx/9X4JQs9FU2QPR9m3N+srtc92VsB9iZQ3e6Maz42Aae?= =?us-ascii?Q?w56SDJn00c7hhWx9dNtZNyEAawcPN5103Xvw8GApmmoGKbZWSAkk5QmnpjT+?= =?us-ascii?Q?IwzXXzz2P3jPwhuXR9l1KZt4lNY0qRThvZ3Dr86r0SgFfVl7KF2Yzz7I//jx?= =?us-ascii?Q?DnxK4HSB72WIqfNw3hpA4ldO8ysA2AIHEMuBvu+Yjx6/Pr0xKfu+MC74Sv2J?= =?us-ascii?Q?NwF884U2YxJDEGY=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)(82310400026)(376014)(36860700013)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 07:47:19.5395 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 07f75740-6f90-43c8-9563-08dd76719723 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: SJ1PEPF000023D1.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9091 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=a1fa35eb4562849ef4d0d3633af234c8280d01f7 Thanks. Xueming Li --- >From a1fa35eb4562849ef4d0d3633af234c8280d01f7 Mon Sep 17 00:00:00 2001 From: Shani Peretz Date: Wed, 12 Feb 2025 18:38:32 +0200 Subject: [PATCH] bus/pci: fix registered device name Cc: Xueming Li [ upstream commit bd786765996fc2654770049043021ea618fc23f0 ] When registering a new PCI device, the device->name field stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices. This patch fix this issue by saving the parsed PCI in device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version. Fixes: 23eaa9059ec2 ("bus/pci: use given name as generic name") Signed-off-by: Shani Peretz Acked-by: Stephen Hemminger --- drivers/bus/pci/pci_common.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 889a48d2af..1b3fe4783e 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -99,21 +99,11 @@ pci_common_set(struct rte_pci_device *dev) /* Each device has its internal, canonical name set. */ rte_pci_device_name(&dev->addr, dev->name, sizeof(dev->name)); + dev->device.name = dev->name; + devargs = pci_devargs_lookup(&dev->addr); dev->device.devargs = devargs; - /* When using a blocklist, only blocked devices will have - * an rte_devargs. Allowed devices won't have one. - */ - if (devargs != NULL) - /* If an rte_devargs exists, the generic rte_device uses the - * given name as its name. - */ - dev->device.name = dev->device.devargs->name; - else - /* Otherwise, it uses the internal, canonical form. */ - dev->device.name = dev->name; - if (dev->bus_info != NULL || asprintf(&dev->bus_info, "vendor_id=%"PRIx16", device_id=%"PRIx16, dev->id.vendor_id, dev->id.device_id) != -1) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-04-08 15:39:06.338255948 +0800 +++ 0010-bus-pci-fix-registered-device-name.patch 2025-04-08 15:39:05.886436594 +0800 @@ -1 +1 @@ -From bd786765996fc2654770049043021ea618fc23f0 Mon Sep 17 00:00:00 2001 +From a1fa35eb4562849ef4d0d3633af234c8280d01f7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bd786765996fc2654770049043021ea618fc23f0 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 1173f0887c..70faae4e44 100644 +index 889a48d2af..1b3fe4783e 100644