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 E9ACE46364 for ; Fri, 7 Mar 2025 13:48:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E511F40E30; Fri, 7 Mar 2025 13:48:11 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id A883940E30 for ; Fri, 7 Mar 2025 13:48:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741351690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=piROdGKPTyKs0vt8cDytnfZoEDiKqbyadlZ9D4gUIt8=; b=MSun5+rSeLJUxsTLbEMPlYfieH8TasYPhMxeyn7gWM/YJZKlgsdy+Fnrpg8JBAH6t1mdR2 AA0Q5a1/0tCm1V46xo+m6rJVFyaNUr8i2ZYEZqutDvIYHYKbrpHRzNOl2kSdPUMJPh/4l3 +j3+pmLgONnUdgr/w4/Jc8KRgefqQ7A= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-510-KgAwFbUjNSmcOiSVffKYZA-1; Fri, 07 Mar 2025 07:48:06 -0500 X-MC-Unique: KgAwFbUjNSmcOiSVffKYZA-1 X-Mimecast-MFC-AGG-ID: KgAwFbUjNSmcOiSVffKYZA_1741351685 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C022A19560B0; Fri, 7 Mar 2025 12:48:05 +0000 (UTC) Received: from rh.Home (unknown [10.45.226.25]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1BD9C1956095; Fri, 7 Mar 2025 12:48:03 +0000 (UTC) From: Kevin Traynor To: Shani Peretz Cc: Stephen Hemminger , dpdk stable Subject: patch 'bus/pci: fix registered device name' has been queued to stable release 24.11.2 Date: Fri, 7 Mar 2025 12:46:48 +0000 Message-ID: <20250307124726.475001-15-ktraynor@redhat.com> In-Reply-To: <20250307124726.475001-1-ktraynor@redhat.com> References: <20250307124726.475001-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: -CVc424CQfbIWe-wE36FRxuybW9Ut2MpqlrSFI4ykd8_1741351685 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.2 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/12/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/4ee60b5f8f6608831dc12df2ad38682bb235977a Thanks. Kevin --- >From 4ee60b5f8f6608831dc12df2ad38682bb235977a 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 1173f0887c..70faae4e44 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -100,19 +100,9 @@ pci_common_set(struct rte_pci_device *dev) 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, -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 11:02:57.460894929 +0000 +++ 0015-bus-pci-fix-registered-device-name.patch 2025-03-07 11:02:56.854705857 +0000 @@ -1 +1 @@ -From bd786765996fc2654770049043021ea618fc23f0 Mon Sep 17 00:00:00 2001 +From 4ee60b5f8f6608831dc12df2ad38682bb235977a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bd786765996fc2654770049043021ea618fc23f0 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org