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 3745141F53 for ; Tue, 29 Aug 2023 10:09:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3E270402AB; Tue, 29 Aug 2023 10:09:59 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 39145402A9 for ; Tue, 29 Aug 2023 10:09:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693296598; x=1724832598; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=U7+CBXIGYN0MiWdvB1owiRL44zNqEaFtyyae/OWXN8g=; b=UW9GS7IPIzHYeVGEtNAzyQTsDl6fpvIild4F1Fbn9YulvlpLE07yiLTo mhca3mVLYmcbC7/TtPEYtXl1B0aNUVGKwuQrInuKPj6bUrqCo3Qxf6/Lf LOw3sH/On0P7HpdFBlXGSOeV1ZSWGYRdhGW5fOz8KxuffFgE7EWI297hl nID+ehi8JCfwBa2y3n59aJz9Mp5dwsXiiYGo+BpfkKLs3scM6x0vFmJLx vFKEUAH53uURITXDWwXFpWYPWJJsVdXRPWHQ5bTvxP+Wxapi9pNd9Mi5p a0Zhbio0OKgJ0QxezsDESdyVX3Mmiqg/D1a5LIWhbQHGSa/bFMKHliip7 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10816"; a="379080335" X-IronPort-AV: E=Sophos;i="6.02,210,1688454000"; d="scan'208";a="379080335" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2023 01:09:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10816"; a="804017495" X-IronPort-AV: E=Sophos;i="6.02,210,1688454000"; d="scan'208";a="804017495" Received: from dpdk-nsit-master.sh.intel.com ([10.67.116.165]) by fmsmga008.fm.intel.com with ESMTP; 29 Aug 2023 01:09:56 -0700 From: xinfeng zhao To: wenwux.ma@intel.com Cc: stable@dpdk.org Subject: [PATCH v4] bus/pci: fix legacy device IO port map in secondary process Date: Tue, 29 Aug 2023 16:09:53 +0800 Message-Id: <20230829080953.379353-1-xinfengx.zhao@intel.com> X-Mailer: git-send-email 2.25.1 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org From: Wenwu Ma 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 --- drivers/bus/pci/linux/pci_vfio.c | 43 ++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index e634de8322..5ef26c98d1 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -1314,6 +1314,27 @@ 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; + int ret; + /* store PCI address string */ + snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT, + loc->domain, loc->bus, loc->devid, loc->function); + + ret = rte_vfio_setup_device(rte_pci_get_sysfs_path(), pci_addr, + &vfio_dev_fd, &device_info); + if (ret) + return -1; + + ret = pci_vfio_fill_regions(dev, vfio_dev_fd, &device_info); + if (ret) + 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; @@ -1361,8 +1382,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 -- 2.25.1