From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id ED6C641FC8;
Wed, 30 Aug 2023 07:07:27 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id CFC104027F;
Wed, 30 Aug 2023 07:07:27 +0200 (CEST)
Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20])
by mails.dpdk.org (Postfix) with ESMTP id 3DA5E40277;
Wed, 30 Aug 2023 07:07:25 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1693372045; x=1724908045;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=QPQHrCZvUxhJkmo/2/kJmbcTS9mC4tS7r+3koAmolPk=;
b=gZngnaZJa3+CIyvgG6jLZZrPz2SIsxtI4LFzB7QUppmalLWvcO3dEFA0
jYXJPdOcgaSdhuXtPr7Uskh6PQ+wqRjKcU5ugwP5Wiwsa0pFTQx52ErXY
wmmybyyTkLlUU0qAQKceCLRO4vlyqe3wGlsADxp1mjPHQ0JXmFrbnSvwJ
3FX8NfrbCfskILoLA+19h3cFHK3/VmqiZnO80D8Vj0+S1GJIzGSWVURxu
AQ6J8sWabXk8JnR2a1uG0QeOJK2TaFpbVm0vWEyuYJQNSZvbQJgJK2Mrg
WPD4mxYSyjuLJlUD5rQgqB7xMVDoPHRJZWEDDkHQcJifSWga+z8qu/480 w==;
X-IronPort-AV: E=McAfee;i="6600,9927,10817"; a="365752951"
X-IronPort-AV: E=Sophos;i="6.02,212,1688454000"; d="scan'208";a="365752951"
Received: from orsmga004.jf.intel.com ([10.7.209.38])
by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
29 Aug 2023 22:07:24 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=McAfee;i="6600,9927,10817"; a="862474261"
X-IronPort-AV: E=Sophos;i="6.02,212,1688454000"; d="scan'208";a="862474261"
Received: from unknown (HELO dut220..) ([10.239.252.220])
by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
29 Aug 2023 22:07:21 -0700
From: Wenwu Ma <wenwux.ma@intel.com>
To: nipun.gupta@amd.com,
dev@dpdk.org
Cc: david.marchand@redhat.com, maxime.coquelin@redhat.com,
chenbo.xia@intel.com, miao.li@intel.com, weix.ling@intel.com,
Wenwu Ma <wenwux.ma@intel.com>, stable@dpdk.org
Subject: [PATCH v4] bus/pci: fix legacy device IO port map in secondary process
Date: Wed, 30 Aug 2023 13:07:13 +0800
Message-Id: <20230830050713.58247-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
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=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 <wenwux.ma@intel.com>
---
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 | 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.34.1