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 66E2D46364 for ; Fri, 7 Mar 2025 13:24:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 382054029E; Fri, 7 Mar 2025 13:24:35 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 82F1C4029E for ; Fri, 7 Mar 2025 13:24:34 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4394345e4d5so10212645e9.0 for ; Fri, 07 Mar 2025 04:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741350274; x=1741955074; 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=v6KcvM2NGp1EfMzDMhFMDjTqS2vf1xjdfLf98mUYoUk=; b=bZxuPBE3hbbMWvf8tSN/DO+mY/IXCqR0YtORukydBb5ozXJdAL6h1uDzSSozKx2xba XS2QjPA4DukzhvrZ1XSqNM/528oyveKa1gGP1+x4PRKwmGCn7LzSeWL+TfB/jE9DvRdC HX3G9Ss+/SCo2OWKpneYSGcd6n1TSpICi0jX3HPLiJ5Wt+zQKaQ5QKBInBZhEVfSaFuL d8zkHX0s/d6cg/FhBYUFNfWKOlaOaOAJy9ejITK5iKsPa3QJbVUUEGVLIPH/Xc6WV4Im xk+y9jVmnQeg6h7HN4vOfUcgFm3PimV4nNNmIV2PtXgznvl+B5w0NqTpiLHiIFGfL0RN G+fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741350274; x=1741955074; 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=v6KcvM2NGp1EfMzDMhFMDjTqS2vf1xjdfLf98mUYoUk=; b=S4X5XRJs6KbTKUaNBHcoM9/8CF3vrlnqQJ3+CRJfbxRU265z+ilp2EFgSKhj+dPOyi G6P52xBzOQBzThVyNYjKcXY94kFZJa8Pn7pKexjwrJjcNx8YoTh7IlWmf3upOAJ22Lmq DWYYbcQUZrEiF9kxaSCQLxeFEA3tniDwnqGfdPCemUdhIDy57Cr/Wl0h1BYZqTYdw0z/ hVC6UCdIGZtkJB4ur1rxWEFwmPG7iAXrdF2Yl0agwfdh+gLcegsVS8hCIR1YOFZDpglA hvmcEYZq6g4e5RvDl2gYf1J9SxfVEg8+QJilSRyZmvtlAgq/Pdf3q9BDaztmlkWIhg8u 78Cw== X-Gm-Message-State: AOJu0YwCRi+K8j0dF8ooGXEWc2XMmZGNxVoNjEJiNvHekdqKmsyLe7Bk 48h0bb1oS+9dr+HFtw3xh3HpRugObGWLIxE76bxgleDHShd8ahuuiI6MzvWS X-Gm-Gg: ASbGncs0zktkh9Tj0XlA5HXi35pt5j7ZYSx5iDsbYJGLSRFYn8w7hGam+T3XBabKmE2 xhbVWJQGxWJbMSrJl06qjS9Jsggafh4+LdCvV7ngdlf1ZgCHXRlQp1AW9N7g3e+jvMjTXbuf26q iuyioWR393h2BVrNWj46hjmdpebvhiWYvfF/G6wLNHAA8PW6uqUCAsCDzEW1TxAFQz3BoQCFtul N2kPnw9sedKKbGh7BpnEOosxvrvPlKcPYZm8lvkaTxzvYmrRTuusDWTk9ZVSlf3JQr+8kL9atET V5jCkbp0oeTDFXQuqrjj61y6mp23F3AFLL+kpqKUu2Zp50DJqOo= X-Google-Smtp-Source: AGHT+IHbLXjfLrFAiEP9s9CnGEtCyMZaSheKf0UJyRltZEtVaVE9foUngD58mgN/IbrEYbcd9ooLDg== X-Received: by 2002:a5d:584e:0:b0:391:306f:57e4 with SMTP id ffacd0b85a97d-39132dc56b5mr1650877f8f.34.1741350273807; Fri, 07 Mar 2025 04:24:33 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:ff31:f049:bd38:f7cf]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43bd6530f26sm76727535e9.4.2025.03.07.04.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 04:24:33 -0800 (PST) From: luca.boccassi@gmail.com To: Long Li Cc: dpdk stable Subject: patch 'net/netvsc: scan all net devices under the PCI device' has been queued to stable release 22.11.8 Date: Fri, 7 Mar 2025 12:24:00 +0000 Message-ID: <20250307122431.1415551-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-79-luca.boccassi@gmail.com> References: <20250217170456.1068278-79-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/7d43e0d1a593e59ab62efe6596d49086b41724a5 Thanks. Luca Boccassi --- >From 7d43e0d1a593e59ab62efe6596d49086b41724a5 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 73db9d38d9..fc47979766 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 12:23:38.079627582 +0000 +++ 0001-net-netvsc-scan-all-net-devices-under-the-PCI-device.patch 2025-03-07 12:23:37.978837475 +0000 @@ -1 +1 @@ -From 7690b9ca7b0e5f54ffa7e94957e3fc04bcdc92e4 Mon Sep 17 00:00:00 2001 +From 7d43e0d1a593e59ab62efe6596d49086b41724a5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7690b9ca7b0e5f54ffa7e94957e3fc04bcdc92e4 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 1736cb5d07..f848157b49 100644 +index 73db9d38d9..fc47979766 100644