From patchwork Tue Oct 24 02:00:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ma, WenwuX" X-Patchwork-Id: 133205 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 940FD431EB; Tue, 24 Oct 2023 04:00:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 21C51402CE; Tue, 24 Oct 2023 04:00:40 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id DF50E40298; Tue, 24 Oct 2023 04:00:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698112839; x=1729648839; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kRB9p+M8jALDt+gUYP4jQQHG7sPRbtS6Chhp+8tFXL0=; b=hSJESQnqtVZ+AyNrM9AWVtKuTGSM9nGdAOR4qaVtSKtu7pE5GLVL3rqp 0R+rTLDcN8MBhimldu6mV8xHCwQmtLlmu2zMvJJ7kuGP0JcULaQ43EsBB tOlzMv6Hyss7yK7PcugCCFujQfxDstAToOss28659i281zthBWOzFCBN2 KEekE+u4iZ1+YgnaXftEGHvo0zIM9OeQqAW6kR/kCKmYj2rrWSgxZKz2E RYcUzOk0wZZ01GybYtaPkOLGDl3GWkYmYcOjEsw5TBbQhHRton8pfgD47 hVok9jLrXNFEpoWwC72dDFadOzTYG6FaunxAj8RL/V7VAbmLP75UZethZ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10872"; a="389816568" X-IronPort-AV: E=Sophos;i="6.03,246,1694761200"; d="scan'208";a="389816568" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Oct 2023 19:00:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10872"; a="761947562" X-IronPort-AV: E=Sophos;i="6.03,246,1694761200"; d="scan'208";a="761947562" Received: from unknown (HELO dut220..) ([10.239.252.220]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Oct 2023 19:00:33 -0700 From: Wenwu Ma To: nipun.gupta@amd.com, anatoly.burakov@intel.com, dev@dpdk.org Cc: david.marchand@redhat.com, maxime.coquelin@redhat.com, linglix.chen@intel.com, Wenwu Ma , stable@dpdk.org Subject: [PATCH v5] bus/pci: fix legacy device IO port map in secondary process Date: Tue, 24 Oct 2023 10:00:21 +0800 Message-Id: <20231024020021.116278-1-wenwux.ma@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230807015820.1329972-1-wenwux.ma@intel.com> References: <20230807015820.1329972-1-wenwux.ma@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org When doing IO port mapping for legacy device in secondary process, the region information is missing, so, we need to refill it. Fixes: 4b741542ecde ("bus/pci: avoid depending on private kernel value") Cc: stable@dpdk.org Signed-off-by: Wenwu Ma --- v5: - adding checks to vfio setup v4: - adjusting commit log v3: - adjusting variable settings v2: - add release of device in pci_vfio_ioport_unmap --- drivers/bus/pci/linux/pci_vfio.c | 52 ++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index 3f3201daf2..a1f7cc2421 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -1230,6 +1230,36 @@ pci_vfio_ioport_map(struct rte_pci_device *dev, int bar, return -1; } + if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + struct vfio_device_info device_info = { .argsz = sizeof(device_info) }; + char pci_addr[PATH_MAX]; + int vfio_dev_fd; + struct rte_pci_addr *loc = &dev->addr; + /* store PCI address string */ + snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT, + loc->domain, loc->bus, loc->devid, loc->function); + + vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle); + if (vfio_dev_fd < 0) + return -1; + + if (vfio_dev_fd == 0) { + if (rte_vfio_setup_device(rte_pci_get_sysfs_path(), pci_addr, + &vfio_dev_fd, &device_info)) + return -1; + + /* we need save vfio_dev_fd, so it can be used during release */ + if (rte_intr_dev_fd_set(dev->intr_handle, vfio_dev_fd)) + return -1; + } else { + if (ioctl(vfio_dev_fd, VFIO_DEVICE_GET_INFO, &device_info)) + return -1; + } + + if (pci_vfio_fill_regions(dev, vfio_dev_fd, &device_info)) + return -1; + } + if (pci_vfio_get_region(dev, bar, &size, &offset) != 0) { RTE_LOG(ERR, EAL, "Cannot get offset of region %d.\n", bar); return -1; @@ -1277,8 +1307,26 @@ pci_vfio_ioport_write(struct rte_pci_ioport *p, int pci_vfio_ioport_unmap(struct rte_pci_ioport *p) { - RTE_SET_USED(p); - return -1; + char pci_addr[PATH_MAX] = {0}; + struct rte_pci_addr *loc = &p->dev->addr; + int ret, vfio_dev_fd; + + /* store PCI address string */ + snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT, + loc->domain, loc->bus, loc->devid, loc->function); + + vfio_dev_fd = rte_intr_dev_fd_get(p->dev->intr_handle); + if (vfio_dev_fd < 0) + return -1; + + ret = rte_vfio_release_device(rte_pci_get_sysfs_path(), pci_addr, + vfio_dev_fd); + if (ret < 0) { + RTE_LOG(ERR, EAL, "Cannot release VFIO device\n"); + return ret; + } + + return 0; } int