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 6C07146364 for ; Fri, 7 Mar 2025 13:47:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6644640E30; Fri, 7 Mar 2025 13:47:48 +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 0F77240E30 for ; Fri, 7 Mar 2025 13:47:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741351666; 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=kZ51EvhL1DfqxonSXMlLTnFkXtnMsjnD76q5+/SeQt4=; b=Q3WzLrfbtYBSb6aHkxcvm1Aw4pAlxIdwvPUO8tCmxGZTDXFRpQdzozRUl/O9ltXctJJipD yv62arFnVuII5PysBJOOiQtfu2bnO/ZxnuycQ9J5zcKwmfbTvCk1aRZGqSUboxjkFt49jp HLgt/5cpzEAsHC7l7d5OlSYCCMnXJuw= 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-562-TdyShWAbOEiV54jwTMC9Eg-1; Fri, 07 Mar 2025 07:47:40 -0500 X-MC-Unique: TdyShWAbOEiV54jwTMC9Eg-1 X-Mimecast-MFC-AGG-ID: TdyShWAbOEiV54jwTMC9Eg_1741351658 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 0770819560B0; Fri, 7 Mar 2025 12:47:38 +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 8B3EF1956095; Fri, 7 Mar 2025 12:47:36 +0000 (UTC) From: Kevin Traynor To: Long Li Cc: dpdk stable Subject: patch 'net/netvsc: scan all net devices under the PCI device' has been queued to stable release 24.11.2 Date: Fri, 7 Mar 2025 12:46:35 +0000 Message-ID: <20250307124726.475001-2-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: xLpDremj0o-dloBa4GR7BZjErVjbiUZePqBd4uoAd9E_1741351658 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/166d4b2a49ab3d1ec395c6b52d230bebb1b26c64 Thanks. Kevin --- >From 166d4b2a49ab3d1ec395c6b52d230bebb1b26c64 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 [ 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 @@ -571,5 +571,5 @@ static void netvsc_hotplug_retry(void *args) char buf[256]; - DIR *di; + DIR *di = NULL; struct dirent *dir; struct ifreq req; @@ -591,5 +591,7 @@ static void netvsc_hotplug_retry(void *args) 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; } @@ -615,8 +617,7 @@ static void netvsc_hotplug_retry(void *args) 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)); @@ -637,20 +638,14 @@ static void netvsc_hotplug_retry(void *args) "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); -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 11:02:56.980706611 +0000 +++ 0002-net-netvsc-scan-all-net-devices-under-the-PCI-device.patch 2025-03-07 11:02:56.788335346 +0000 @@ -1 +1 @@ -From 7690b9ca7b0e5f54ffa7e94957e3fc04bcdc92e4 Mon Sep 17 00:00:00 2001 +From 166d4b2a49ab3d1ec395c6b52d230bebb1b26c64 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7690b9ca7b0e5f54ffa7e94957e3fc04bcdc92e4 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org