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 33BA946364 for ; Fri, 7 Mar 2025 13:24:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5DD9C40E32; Fri, 7 Mar 2025 13:24:36 +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 B00B040E32 for ; Fri, 7 Mar 2025 13:24:35 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43bcf9612f4so14834045e9.3 for ; Fri, 07 Mar 2025 04:24:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741350275; x=1741955075; 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=dcRQMEdWtGm+zCJPdzM6yt/bANyNuL5SxZaW9ipSQao=; b=LUT/rXghebKle6CVsJAggVeQyoLlKy4B+Qe9NmztiLO5O7g6SxLL+YCpiNiLlvQ5n+ BTwM8PYs4n5q9RoMviAliB+tSTpq8C0ZaN8kpLhM/MPwGxc5gA+SiIKN+jGPIDOsfqbL Ekm6ok8hG4BkbwEbskh3STIh5rmngS80PA7pro9zUFIyuFWQzrFlnm4sghvhxWB2qg/E cMSlmc+vSmWPKJrbzIBY4HC+yzZodzms4h8lWDzq2d5bo/kKfts+gJhKgqwBKyR4ux20 2PKRG8+6QcEDnZdjxI3jwPdoOYXvKvi16klxYolnYvhQt/0dom6H/wnHpHS94JMlI+9g o99Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741350275; x=1741955075; 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=dcRQMEdWtGm+zCJPdzM6yt/bANyNuL5SxZaW9ipSQao=; b=BRh2DkcEFnHhC3WV69I2d6tv+9Crt9XIVEyAjvxLOI071jcrQQt30tsorrq8s0arYK 1pHjjXfCckGryE8kaoBRH5r3i4dbF9p7QlsRt1QvtezJb4OTMZNdhS8myWSEqG5BrY5h fsH9YDTIlG6RWh3ZZueSVDJzXv5I38dEANS37pms5jWZMnQPB3hVXGymkTpGdtl20gfo I3xX0ap2ckcmTWFQ1wD2tKtdN+nCBq/QciESjpdlGu4CSIvS4sTa5Tu6xkCksSmjvuol 2ISMdfmeScQzOhwD2Ckbvdaf5Edr/JTsbqm8qiPhSZwNHPxpvYIqWECORvVQ/wH4YVdP V4vQ== X-Gm-Message-State: AOJu0YwgX0qxxvm/5GdZ9DvwYuiBX4FQOeuZPqXoQL6t6XONfb8pfvcI dkABLKsgatTEkjKLQJ/qgt28Zsw65SD1OK4HYFWfvw6beFXgECBT2ayz7HuK X-Gm-Gg: ASbGnct/QaZRgT1pHAjawt6K0D46d1Qtu/nWBTrRXa82hFMvsVgTfolVI9Dq7U7dWm2 WXIFgV3K32wUotko6yRlCLsxQFUyaAj+I8/p0DonAinVurkCFMiHlS7xr54BFlwiyQhoU7HLoYH T5nvj3mNCH1MKaQ9u7Q94RKkPVwKnxhn7NUzDXLiV8uyKIAvaWnnaIIBSrITeODtZLwVB8YCgQR ivSsEk58QCIpgDMfCsm1Iow3ib45dMR5xBOyaWsxhn2DCbSP3V7tELFipjtr9dq4JRuy9mpiHzz I63WYZbEa9e4LXMbsqfXzyXHFwy4MjGp4Zvt+sYteJatbt46PEg= X-Google-Smtp-Source: AGHT+IHF31tZVyXtMxKiBuP1KAkTEdmlbQO5p8qmoxnzyboXRLrauy0Gy90MoJweWQlPR4VbR4uhbw== X-Received: by 2002:a05:600c:314d:b0:439:99e6:2ab with SMTP id 5b1f17b1804b1-43c60220ea9mr19619475e9.28.1741350274979; Fri, 07 Mar 2025 04:24:34 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:ff31:f049:bd38:f7cf]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43bdd8b0461sm52248835e9.4.2025.03.07.04.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 04:24:34 -0800 (PST) From: luca.boccassi@gmail.com To: Long Li Cc: dpdk stable Subject: patch 'net/netvsc: remove device if its net devices removed' has been queued to stable release 22.11.8 Date: Fri, 7 Mar 2025 12:24:01 +0000 Message-ID: <20250307122431.1415551-2-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/1b2cefe985fa65e17257cf058a265ce1d6c8c3c8 Thanks. Luca Boccassi --- >From 1b2cefe985fa65e17257cf058a265ce1d6c8c3c8 Mon Sep 17 00:00:00 2001 From: Long Li Date: Thu, 13 Feb 2025 10:58:24 -0800 Subject: [PATCH] net/netvsc: remove device if its net devices removed [ upstream commit 1ec0995e173da14f2871ee19326f275f94f412c4 ] An RTE device can have multiple Ethernet devices. On hot plug events, it can't be removed until all its Ethernet devices have been removed. Fixes: a2a23a794b3a ("net/netvsc: support VF device hot add/remove") Signed-off-by: Long Li --- drivers/net/netvsc/hn_vf.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c index 40981706d5..72ac8dfb09 100644 --- a/drivers/net/netvsc/hn_vf.c +++ b/drivers/net/netvsc/hn_vf.c @@ -102,6 +102,7 @@ static void hn_remove_delayed(void *args) uint16_t port_id = hv->vf_ctx.vf_port; struct rte_device *dev = rte_eth_devices[port_id].device; int ret; + bool all_eth_removed; /* Tell VSP to switch data path to synthetic */ hn_vf_remove(hv); @@ -138,7 +139,17 @@ static void hn_remove_delayed(void *args) PMD_DRV_LOG(ERR, "rte_eth_dev_close failed port_id=%u ret=%d", port_id, ret); - ret = rte_dev_remove(dev); + /* Remove the rte device when all its eth devices are removed */ + all_eth_removed = true; + RTE_ETH_FOREACH_DEV_OF(port_id, dev) { + if (rte_eth_devices[port_id].state != RTE_ETH_DEV_UNUSED) { + all_eth_removed = false; + break; + } + } + if (all_eth_removed) + ret = rte_dev_remove(dev); + hv->vf_ctx.vf_state = vf_removed; rte_rwlock_write_unlock(&hv->vf_lock); -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 12:23:38.114546338 +0000 +++ 0002-net-netvsc-remove-device-if-its-net-devices-removed.patch 2025-03-07 12:23:37.978837475 +0000 @@ -1 +1 @@ -From 1ec0995e173da14f2871ee19326f275f94f412c4 Mon Sep 17 00:00:00 2001 +From 1b2cefe985fa65e17257cf058a265ce1d6c8c3c8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1ec0995e173da14f2871ee19326f275f94f412c4 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index b664beaa5d..5d8058774d 100644 +index 40981706d5..72ac8dfb09 100644