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 36681455AD for ; Mon, 15 Jul 2024 17:30:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3258E40DF8; Mon, 15 Jul 2024 17:30:48 +0200 (CEST) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by mails.dpdk.org (Postfix) with ESMTP id 0BA8E40DF8 for ; Mon, 15 Jul 2024 17:30:46 +0200 (CEST) Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2eecd2c6432so61639211fa.3 for ; Mon, 15 Jul 2024 08:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057445; x=1721662245; 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=ocCaPAeRfo+sGPLqg8qKyZuzc9XUpHHDuh22VMYJOOY=; b=Bj/pM205reWgBfl6QuaKmeIKocYBq+ew0Z38o//Or/nW5PG+7a5fHLQf+wdAWnYOLL 0GVU04OxsAqj41HifpVoy2i9Bkb2MEJqFhDjBHBeTwlSOR0eKK7xmQ87NBeg7Bk2G4oC lHU/9gWaHJ0AQePaswg4Q1YI0YVC6ydDl0ggDJe+on+QjFg1OB8iDelOLtUyvQW3RVTI b1CM3tuKj16XHmaji3R5sDJohId/Nyw9lgQIIyo7oLTeV8DIUnHOuIFcryuVoOgD3By1 R/tn+WXiZMRYRsvC+SvrsbkvfvMJ19FzXVLZE/8lyhurDlF9T0zZFFd6lFLarni8mjIJ V06w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057445; x=1721662245; 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=ocCaPAeRfo+sGPLqg8qKyZuzc9XUpHHDuh22VMYJOOY=; b=o9tYsQM0DJTtobhjYGRV1KHKtaAGAQ40bEoCGrO5Mg4UwyBG4KZBGYA2+Ik4RdPDhE AUpk1dc+qdoHNgYGg5wqLoOgT4mHX16A4INjtOz+ZVjg5Mb9qNuNVIHGtkywmDXCib/z ywqLacEU7LR4QOK9gviKsCuX8LKy+tDnNP/mkkvWI9dL5Cy6lOJTCXm2rELU5ogcBtlt T1VELYx1RiDP+Ri+vgX0LQh95XxWD2zbjlEBMb4/JLjVeKre/RUVxRz2KkQ+0PXdEGFO t8f6d0uTapGR3NAh7avVvzSNZUe91HfbphTJTzAx7yIeiIsE/+iikDVJkiVM/W46S493 RmaQ== X-Gm-Message-State: AOJu0YxWSSSCmddpnJqvtkNJyeeMtZfSgjfDLquPwfZ80gaN2x9rHfzE J8nXi34CFWQ8owfz+exRiCkFfRzkBcO5iTubjm4e9DrVCGGr/PAS X-Google-Smtp-Source: AGHT+IHVF3ALQPIM9+tshzSs6xBNGJxU+tWYZIVuL2ZNgr4xcy18650M38h3lSQORsPhEdIg76JeaA== X-Received: by 2002:a2e:968b:0:b0:2ee:8454:1c25 with SMTP id 38308e7fff4ca-2eef2da6688mr1916451fa.34.1721057445387; Mon, 15 Jul 2024 08:30:45 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427a5e994c6sm90887085e9.26.2024.07.15.08.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:30:44 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: fix hotplug remove' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:26:47 +0100 Message-Id: <20240715152704.2229503-69-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/17/24. 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/0ce675d4cfc603944e43a087cc23a6cf62148c3d Thanks. Luca Boccassi --- >From 0ce675d4cfc603944e43a087cc23a6cf62148c3d Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:42 +0800 Subject: [PATCH] net/ngbe: fix hotplug remove [ upstream commit c602202c346663572043b408a27cb98e20f31886 ] This bug occurs in OpenvSwitch. After adding a port bound to vfio-pci to ovs, detach it from ovs and then unbind it from vfio-pci(that is hotplug) will cause operating system to get stuck. Fixes: 6ee7e574cd48 ("net/ngbe: support probe and remove") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 08e14a05c9..edb3c73f8b 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -546,7 +546,7 @@ static int eth_ngbe_pci_remove(struct rte_pci_device *pci_dev) if (ethdev == NULL) return 0; - return rte_eth_dev_destroy(ethdev, eth_ngbe_dev_uninit); + return rte_eth_dev_pci_generic_remove(pci_dev, eth_ngbe_dev_uninit); } static struct rte_pci_driver rte_ngbe_pmd = { -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:38.047855854 +0100 +++ 0069-net-ngbe-fix-hotplug-remove.patch 2024-07-15 16:19:34.688209025 +0100 @@ -1 +1 @@ -From c602202c346663572043b408a27cb98e20f31886 Mon Sep 17 00:00:00 2001 +From 0ce675d4cfc603944e43a087cc23a6cf62148c3d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c602202c346663572043b408a27cb98e20f31886 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 2a858b76d0..9d75e222c3 100644 +index 08e14a05c9..edb3c73f8b 100644 @@ -22 +23 @@ -@@ -547,7 +547,7 @@ static int eth_ngbe_pci_remove(struct rte_pci_device *pci_dev) +@@ -546,7 +546,7 @@ static int eth_ngbe_pci_remove(struct rte_pci_device *pci_dev)