From patchwork Mon Aug 7 01:58:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ma, WenwuX" X-Patchwork-Id: 129921 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 C16F242FF3; Mon, 7 Aug 2023 04:06:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 01E1143247; Mon, 7 Aug 2023 04:06:34 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id C5D6740A8B; Mon, 7 Aug 2023 04:06:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691373991; x=1722909991; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Wtz360tZiki3va2vAU20c/9HtdWYOXBgdFLdCMTeQM0=; b=bdV14LdPRoWkMo+BaZ4R9y+Bq1mD/PlPkMbHlQQJel70NQN7zb6oQkmB hWyKsFng07vnZ5RiI6CF76OxxsdgT/AHtQZuqG+VcL5sUm+SrKqNDj/Za 3CWD6a+Hsm7knL3K1DLF3EZq3id0ADG9dLsJph7llYggIeNg5vZa11Wey O4Gsi/3R+LlSdZnyvRV1WL6/hEPFgznj71kyH6GFU8lO13gGmriQZiWwd X/20tKcJue6np8+BBo8U6XKhNOy/dVsaCnHF0VNosPANevMOV2pwt/PwJ BGS8VYcP4gL+FtFCNEGiqLQxyZOMkOQNJnsA2rFmq9ZJgF8M73+aa6fZe g==; X-IronPort-AV: E=McAfee;i="6600,9927,10794"; a="367892916" X-IronPort-AV: E=Sophos;i="6.01,261,1684825200"; d="scan'208";a="367892916" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2023 19:06:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10794"; a="977261810" X-IronPort-AV: E=Sophos;i="6.01,261,1684825200"; d="scan'208";a="977261810" Received: from unknown (HELO localhost.localdomain) ([10.239.252.251]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2023 19:06:26 -0700 From: Wenwu Ma 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 , stable@dpdk.org Subject: [PATCH] bus/pci: fix legacy device IO port map in secondary process Date: Mon, 7 Aug 2023 09:58:20 +0800 Message-Id: <20230807015820.1329972-1-wenwux.ma@intel.com> X-Mailer: git-send-email 2.25.1 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 --- drivers/bus/pci/linux/pci_vfio.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index e634de8322..eea1c9851e 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -1306,6 +1306,11 @@ int pci_vfio_ioport_map(struct rte_pci_device *dev, int bar, struct rte_pci_ioport *p) { + struct vfio_device_info device_info = { .argsz = sizeof(device_info) }; + char pci_addr[PATH_MAX] = {0}; + int vfio_dev_fd; + struct rte_pci_addr *loc = &dev->addr; + int ret; uint64_t size, offset; if (bar < VFIO_PCI_BAR0_REGION_INDEX || @@ -1314,6 +1319,22 @@ pci_vfio_ioport_map(struct rte_pci_device *dev, int bar, return -1; } + if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + /* 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;