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 48F4AA0032 for ; Fri, 24 Jun 2022 17:02:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4314B40A8A; Fri, 24 Jun 2022 17:02:57 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6B8F1400EF for ; Fri, 24 Jun 2022 17:02:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656082976; 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=EFi2aFIVXHi4KaBbear03stBlGKT7mH1+RvZGiGKPuU=; b=FwCCINJVAr8Kvsb3jq1GcCB46b5zlPrziJ7SWI8UFGH2sOCIrQuyR+a9kFITVFrdn+iWB2 y1zkav3CiwLL64SyeLGwVBglfohheABR8nc7R2/mgTB0yiPs1z3dMOGdYmMec0tJ3SIM4j 4K3veT3e9DtejfQXkGnAs6C3g57K2c8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-518-izwTG9EfNe-6RSb9MRC4kQ-1; Fri, 24 Jun 2022 11:02:53 -0400 X-MC-Unique: izwTG9EfNe-6RSb9MRC4kQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9EF222919EB9; Fri, 24 Jun 2022 15:02:52 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7626B9D63; Fri, 24 Jun 2022 15:02:51 +0000 (UTC) From: Kevin Traynor To: Yuan Wang Cc: Wei Ling , Chenbo Xia , dpdk stable Subject: patch 'net/virtio: unmap PCI device in secondary process' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 16:01:48 +0100 Message-Id: <20220624150148.1855580-40-ktraynor@redhat.com> In-Reply-To: <20220624150148.1855580-1-ktraynor@redhat.com> References: <20220624150148.1855580-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 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/22. 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/7b610e0a8db8b27fe2ee988aed96a13e867ed192 Thanks. Kevin --- >From 7b610e0a8db8b27fe2ee988aed96a13e867ed192 Mon Sep 17 00:00:00 2001 From: Yuan Wang Date: Mon, 6 Jun 2022 23:55:43 +0800 Subject: [PATCH] net/virtio: unmap PCI device in secondary process [ upstream commit 5729407fa4d612b93ceefacef13f57c1de2ceaa6 ] In multi-process, the secondary process will remap PCI during initialization, but the mapping is not removed in the uninit path, the device is not closed, and the device busy error will be reported when the device is hotplugged. This patch unmaps PCI device at secondary process uninitialization based on virtio_rempa_pci. Fixes: 36a7a2e7a53f ("net/virtio: move PCI device init in dedicated file") Signed-off-by: Yuan Wang Tested-by: Wei Ling Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_pci_ethdev.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c index 54645dc62e..1f6bdeddda 100644 --- a/drivers/net/virtio/virtio_pci_ethdev.c +++ b/drivers/net/virtio/virtio_pci_ethdev.c @@ -123,8 +123,18 @@ eth_virtio_pci_uninit(struct rte_eth_dev *eth_dev) { int ret; + struct virtio_pci_dev *dev; + struct virtio_hw *hw; PMD_INIT_FUNC_TRACE(); - if (rte_eal_process_type() == RTE_PROC_SECONDARY) + if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + dev = eth_dev->data->dev_private; + hw = &dev->hw; + + if (dev->modern) + rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev)); + else + vtpci_legacy_ioport_unmap(hw); return 0; + } ret = virtio_dev_stop(eth_dev); -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 15:51:10.094772409 +0100 +++ 0045-net-virtio-unmap-PCI-device-in-secondary-process.patch 2022-06-24 15:51:08.935984254 +0100 @@ -1 +1 @@ -From 5729407fa4d612b93ceefacef13f57c1de2ceaa6 Mon Sep 17 00:00:00 2001 +From 7b610e0a8db8b27fe2ee988aed96a13e867ed192 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5729407fa4d612b93ceefacef13f57c1de2ceaa6 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org