From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 0A309455AD
for <public@inbox.dpdk.org>; Mon, 15 Jul 2024 17:30:47 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 0123640E15;
Mon, 15 Jul 2024 17:30:47 +0200 (CEST)
Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com
[209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 8D32D40E0C
for <stable@dpdk.org>; Mon, 15 Jul 2024 17:30:44 +0200 (CEST)
Received: by mail-wm1-f52.google.com with SMTP id
5b1f17b1804b1-4272738eb9eso32705395e9.3
for <stable@dpdk.org>; Mon, 15 Jul 2024 08:30:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1721057444; x=1721662244; 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=PhcJIZ5w8mdfpJefmGBX1YUZFfZ8saOcrD5pcmmfmgc=;
b=eUcL3p6gsA5D0GHYA4iHhvhQrVkbSRg8nzkLCCxQkVpUrvImd7UVHaIWziIAGwC1aM
3ma3icIRJhml8DUwYM+XnSml3QIvExe/04bMs+zMrNlTOyHccTbyq4pBf1/1MTYLPSd9
elA8YMVYoiQkGubBHdayi7Y7D6Ghi9rP00noOOiH7GNTgvOSbea3iGfAj3kvnVrhuG/C
jsAbV6vonL/Yim8x+kAnIOinzFQdG8tcl5LKeGT/iJMewvcsF7yIOglbODDCNrGAAqGf
9DU9IcEWgigaUzd1GgJquFYQtioAmb3A07mqIXYpkqEzxBSiLPqQAsybIB3hsAJG7DBj
A8Gg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1721057444; x=1721662244;
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=PhcJIZ5w8mdfpJefmGBX1YUZFfZ8saOcrD5pcmmfmgc=;
b=Kyfj9IpO5HQhgIknQ+egjVFxXr/2kDhuXG1t5fddI/3lM4ZlwEmWf+pnWKKJRYVjmb
oJEJVMeaKyOoOitaY1jqeWhEmt52Ct0ogJcloGjREUnmRATvlrl/Xf7zGvoECMCEAO1w
/Vil+G0nbjBUyCrexwVajvlrbgQultT2OahD6d0baT6NWpI095zn5Al9X1hGFjPZOMJT
/ugXvDjWPB67MHH4JlKqimcmpJ10kVZ0Lku9VGyJEHsCdqpL4PPGhBlzO1kUnoIsLeHu
/K5U3yd/q1kV4sf/2vyqnD5py5cRL0UlrcQwDhKc1AOo/+24lL7m1TalBbX6wVbZHgr+
ILZA==
X-Gm-Message-State: AOJu0YzSE6jD8EQ+IM5dxcw5NaOLSX+zwja5lnkbRzlAOEYe2sGR20kG
Q9T8PyiWYwUA3xl0UoCObHxOc/d9K+lbvuxIOeUfKvelUrkJtzAH
X-Google-Smtp-Source: AGHT+IGDKw/zwD0yLbbAXh8GUD42w7J861XJIkiDs/9j91M8NgEX6M/ZRbnWPnhZvQnKFFMIwG+Rzg==
X-Received: by 2002:a7b:cd1a:0:b0:426:4f47:6037 with SMTP id
5b1f17b1804b1-426707d7914mr114801315e9.19.1721057444141;
Mon, 15 Jul 2024 08:30:44 -0700 (PDT)
Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-4279f2d717asm127106705e9.40.2024.07.15.08.30.43
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 15 Jul 2024 08:30:43 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Jiawen Wu <jiawenwu@trustnetic.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: patch 'net/txgbe: fix hotplug remove' has been queued to stable
release 22.11.6
Date: Mon, 15 Jul 2024 16:26:46 +0100
Message-Id: <20240715152704.2229503-68-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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=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/4d4117d9d959b699ec43460e79b3c77c912884d3
Thanks.
Luca Boccassi
---
>From 4d4117d9d959b699ec43460e79b3c77c912884d3 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Tue, 18 Jun 2024 15:11:41 +0800
Subject: [PATCH] net/txgbe: fix hotplug remove
[ upstream commit 82ffdaf14d3b3a3391a873d2ef8ab33fa5c70e0f ]
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: 7dc117068a7c ("net/txgbe: support probe and remove")
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
drivers/net/txgbe/txgbe_ethdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 24e779c02c..acfdb65eaf 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -963,7 +963,7 @@ static int eth_txgbe_pci_remove(struct rte_pci_device *pci_dev)
if (!ethdev)
return 0;
- return rte_eth_dev_destroy(ethdev, eth_txgbe_dev_uninit);
+ return rte_eth_dev_pci_generic_remove(pci_dev, eth_txgbe_dev_uninit);
}
static struct rte_pci_driver rte_txgbe_pmd = {
--
2.39.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-07-15 16:19:37.997423964 +0100
+++ 0068-net-txgbe-fix-hotplug-remove.patch 2024-07-15 16:19:34.684208940 +0100
@@ -1 +1 @@
-From 82ffdaf14d3b3a3391a873d2ef8ab33fa5c70e0f Mon Sep 17 00:00:00 2001
+From 4d4117d9d959b699ec43460e79b3c77c912884d3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 82ffdaf14d3b3a3391a873d2ef8ab33fa5c70e0f ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 699ff1c920..20fa0a5b05 100644
+index 24e779c02c..acfdb65eaf 100644
@@ -22 +23 @@
-@@ -964,7 +964,7 @@ static int eth_txgbe_pci_remove(struct rte_pci_device *pci_dev)
+@@ -963,7 +963,7 @@ static int eth_txgbe_pci_remove(struct rte_pci_device *pci_dev)