From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 4CA62A046B for ; Mon, 24 Jun 2019 17:27:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2C0851BEE9; Mon, 24 Jun 2019 17:27:56 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2B2661BEAB for ; Mon, 24 Jun 2019 17:27:54 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 99BED2F8BD3; Mon, 24 Jun 2019 15:27:52 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1ACB819722; Mon, 24 Jun 2019 15:27:48 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Mon, 24 Jun 2019 16:25:16 +0100 Message-Id: <20190624152525.19349-52-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 24 Jun 2019 15:27:53 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: unmap port IO for legacy device' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/635ccd415fee13558bb92c6c9ac7c71a9e9ce8fe Thanks. Kevin Traynor --- >From 635ccd415fee13558bb92c6c9ac7c71a9e9ce8fe Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Wed, 5 Jun 2019 17:43:39 +0800 Subject: [PATCH] net/virtio: unmap port IO for legacy device [ upstream commit 535f8a109a655552b30a7cead6ffdcba3e73db29 ] For legacy devices, we should also unmap the port IO resource on device removal. Fixes: b8f04520ad71 ("virtio: use PCI ioport API") Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index e1c97a481..d8724566a 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1717,4 +1717,6 @@ static int eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) { + struct virtio_hw *hw = eth_dev->data->dev_private; + PMD_INIT_FUNC_TRACE(); @@ -1729,6 +1731,9 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) eth_dev->rx_pkt_burst = NULL; - if (eth_dev->device) + if (eth_dev->device) { rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev)); + if (!hw->modern) + rte_pci_ioport_unmap(VTPCI_IO(hw)); + } PMD_INIT_LOG(DEBUG, "dev_uninit completed"); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:57.759237308 +0100 +++ 0052-net-virtio-unmap-port-IO-for-legacy-device.patch 2019-06-24 16:18:55.123429052 +0100 @@ -1 +1 @@ -From 535f8a109a655552b30a7cead6ffdcba3e73db29 Mon Sep 17 00:00:00 2001 +From 635ccd415fee13558bb92c6c9ac7c71a9e9ce8fe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 535f8a109a655552b30a7cead6ffdcba3e73db29 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index df3a218a8..a2cedcc87 100644 +index e1c97a481..d8724566a 100644 @@ -22 +23 @@ -@@ -1877,4 +1877,6 @@ static int +@@ -1717,4 +1717,6 @@ static int @@ -29 +30 @@ -@@ -1889,6 +1891,9 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) +@@ -1729,6 +1731,9 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)