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 524C646364 for ; Fri, 7 Mar 2025 13:24:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B35840E32; Fri, 7 Mar 2025 13:24:54 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 072A740E31 for ; Fri, 7 Mar 2025 13:24:53 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4393dc02b78so10885065e9.3 for ; Fri, 07 Mar 2025 04:24:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741350292; x=1741955092; 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=+7cK4Z7ZxDAaAJkf4kOLtc2N3YzbyrG80r69MDa+uAg=; b=SqTFdlVdFkyat+tT4qIsFTGlCp7O3W9s1ceZbWbxS85o6/moUdL5bJiknCm+TxoeOw kDEJNrnI4HsapEZpor08GfS6OUgl/53XGf/pt+/Tgq5MTasHVh/e5kVJrpjNnO0eylbN B/bjkj0cxC+fq0UVTELwTSHZWFcjSeAZGAdB8gyDyUqT1I3exVxm6MkW15Rz95jNQ3f8 bMEXFpBVBn70z3lCnd4hlFjHx7zWppYDQXB0uSHJaW4HALL8/V4o3IUVUF3lX6og4Kl2 A3fH7fTR55e/eyI5FbCxe749hC9JJRuLX564gvePRw29uRF0I6pAtKvwOC5Pex9hpl1I KQrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741350293; x=1741955093; 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=+7cK4Z7ZxDAaAJkf4kOLtc2N3YzbyrG80r69MDa+uAg=; b=nqeks3YsIX42DKIVPfTQos/T4WFfmSEblT2aX/Ch2Vdkh6VBy+UYgn7s6/dvYn0DR3 2bWhHwmoh38Nf0nFBJUGpT2QmfEH9UrEngBkSp6QdMkRhwHqaK5+33vPZ6a5f8RJ4l1+ pnvBOCqWOd4CWZArgOJf6xUdLKb1qHaucKMHKPGE/jRGjhCDncrF/su1GkdIIK+0YDjk QU4hA3tvKrvm3m4cjqc8L61cAdsX5C+z5ERgV5LKCm6gwrs3IgZZsXk67PgLqLqb4ugB sN16bQ/cmcXM1S3+ofBPkreoPCLt7HvZSnAMWDr8/Ne3wrMvvtaVblrO49aj5guKscHt AjIg== X-Forwarded-Encrypted: i=1; AJvYcCWYl54RuFn29gImvJOkLJAVblhfZPPAc8Ju/Nli1kzjRN+dtiITSltqETfkM3cCgXjkLR92n+M=@dpdk.org X-Gm-Message-State: AOJu0YxIhwAh17qvauTXh3hRh+PLxNo0rK6OMiaUSYf2lUGzliglv5Qt 8jqsTAARO6YODuuOzZDrnARss4AMX9KrQCGiV4f84B0pWW/CqsQjCeSVg/V5 X-Gm-Gg: ASbGncvGcPuEWDwPiJkkvQJuyEDixZoBuLpzEmIy8VsjlTFkKr6lxgdllPXGu1ic6RX c7ZJ+QodWQQ2L9MgmiW8UDim/HZGC2vMnoPmEEBQqZ6Z5lrI/zZIKm4JkELylGo6crv6s128Jlb hrcxKswOg04BeMFLyoHlyAvcflrLtgsVu5KOS7elVKf0NO4xcKI6dpf4ux9bnLkXcc3DMj6r4U2 DhcOJ/zDIKpWNfSqS8To/XFA+y34KzVXUg1OSxHesSsBjYwqpgna0dQ26D3nI4vg2T9nIqb06W5 rCV+UE6nRiQIAiGKK2F2tebt2sZhML7gaTcvbq3R/uGLiVE/1QQ= X-Google-Smtp-Source: AGHT+IF09/X08MMjRzBVuGl4RJE9brgTi+boHtNP9GfaOzFmddRo3usm8Gezjw5D4dOVCLUwH0WRKA== X-Received: by 2002:a05:600c:4f46:b0:439:9192:f088 with SMTP id 5b1f17b1804b1-43c5a6008admr21727735e9.8.1741350292485; Fri, 07 Mar 2025 04:24:52 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:ff31:f049:bd38:f7cf]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43bdd8c327fsm49584645e9.13.2025.03.07.04.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 04:24:51 -0800 (PST) From: luca.boccassi@gmail.com To: Shani Peretz Cc: Stephen Hemminger , dpdk stable Subject: patch 'bus/pci: fix registered device name' has been queued to stable release 22.11.8 Date: Fri, 7 Mar 2025 12:24:07 +0000 Message-ID: <20250307122431.1415551-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250307122431.1415551-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-79-luca.boccassi@gmail.com> <20250307122431.1415551-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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/09/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/a3aa0ac7d655d79f4bf88c66bec8415b43a0988c Thanks. Luca Boccassi --- >From a3aa0ac7d655d79f4bf88c66bec8415b43a0988c 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 [ 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 756e308fdf..465f9258af 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 12:23:38.329964549 +0000 +++ 0008-bus-pci-fix-registered-device-name.patch 2025-03-07 12:23:37.998838059 +0000 @@ -1 +1 @@ -From bd786765996fc2654770049043021ea618fc23f0 Mon Sep 17 00:00:00 2001 +From a3aa0ac7d655d79f4bf88c66bec8415b43a0988c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bd786765996fc2654770049043021ea618fc23f0 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 1173f0887c..70faae4e44 100644 +index 756e308fdf..465f9258af 100644