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 A7CD045804 for ; Fri, 23 Aug 2024 18:23:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A38C7433A0; Fri, 23 Aug 2024 18:23:15 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 8C6514339F for ; Fri, 23 Aug 2024 18:23:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430193; 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=7BvhBUYHgORkd/Rqv/YildzdL8oq0nLK+I1J9/q47wc=; b=EJe/ojGjEuLVVFlHCPFxDfyVKAEUG+ThHmjpPPiN7I2nauUy+vuQN8tgLyYWwEzb87MgHF QG13aCIcFvFTXufvHcf9mSluxUjmd4/r3ky6KNItdIUvXSMx7bUR4KOjBz2aVeBPnoC0Ru o0RJWJKIZV8iG/OztQ+RzzHrMFnHcMo= Received: from mx-prod-mc-05.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-93-Url_atJnPbW47FrzRwaSxQ-1; Fri, 23 Aug 2024 12:23:11 -0400 X-MC-Unique: Url_atJnPbW47FrzRwaSxQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0795F1955F3F; Fri, 23 Aug 2024 16:23:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D31AD1956053; Fri, 23 Aug 2024 16:23:09 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix hotplug remove' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:49 +0100 Message-ID: <20240823161929.1004778-101-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 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 21.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 08/28/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/13f645ef0ebde3bc55660ba5a68906c23464dab8 Thanks. Kevin --- >From 13f645ef0ebde3bc55660ba5a68906c23464dab8 Mon Sep 17 00:00:00 2001 From: Jiawen Wu 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 --- 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 3ff8da2de9..00375b3b94 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -952,5 +952,5 @@ static int eth_txgbe_pci_remove(struct rte_pci_device *pci_dev) 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); } -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.692302699 +0100 +++ 0101-net-txgbe-fix-hotplug-remove.patch 2024-08-23 17:18:09.828430483 +0100 @@ -1 +1 @@ -From 82ffdaf14d3b3a3391a873d2ef8ab33fa5c70e0f Mon Sep 17 00:00:00 2001 +From 13f645ef0ebde3bc55660ba5a68906c23464dab8 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 3ff8da2de9..00375b3b94 100644 @@ -22 +23 @@ -@@ -965,5 +965,5 @@ static int eth_txgbe_pci_remove(struct rte_pci_device *pci_dev) +@@ -952,5 +952,5 @@ static int eth_txgbe_pci_remove(struct rte_pci_device *pci_dev)