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 94AF7430B7 for ; Mon, 21 Aug 2023 03:35:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BEBF42BC9; Mon, 21 Aug 2023 03:35:33 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id AF30440A7D; Mon, 21 Aug 2023 03:35: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=1692581731; x=1724117731; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dtxEzW/fxNpJFSDd7ueEz+v0DP8pcD80l088GRNds88=; b=UnBOdafgyFwpMxJWdKcr/Zg25B2FkTBWH6XDyCAqkyNyb142/lQTs2sx etpHCMBlk/5M3imRcdPVefdB9H8L0Y5YpbhopSP8Yp9AJgHKRWyGZcURV IWEg933jkz3iJsPTL+MfA6+b1RtFXp4KX6Krl9eOchGXbCJaVCn8q7Jaj l35cy+MUEfm0QCva/sADdgbyjFScAFBe7uXdA4E8HWk06xMfv90a94BEv LlE0qW53Y3hWRQaRuhB9IZn15AZ3k/OyMHAx+Aw5wV2IMv6d53dZr/smG UMlYFUKMyjG0D2DUJ98JWqvZdg56BwWt6q+/Sjydza8bEExkkNJdIBZaD Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10808"; a="376227375" X-IronPort-AV: E=Sophos;i="6.01,189,1684825200"; d="scan'208";a="376227375" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Aug 2023 18:35:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10808"; a="770772854" X-IronPort-AV: E=Sophos;i="6.01,189,1684825200"; d="scan'208";a="770772854" Received: from unknown (HELO localhost.localdomain) ([10.239.252.251]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Aug 2023 18:35: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 v2] bus/pci: fix legacy device IO port map in secondary process Date: Mon, 21 Aug 2023 09:27:07 +0800 Message-Id: <20230821012707.315173-1-wenwux.ma@intel.com> X-Mailer: git-send-email 2.25.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: 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 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 --- 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..f2cc55c431 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; @@ -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