From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yong Wang Subject: [PATCH 1/2] vfio: fix pci_vfio_map_resource Date: Thu, 7 Jul 2016 15:26:36 -0700 Message-ID: <1467930397-39777-1-git-send-email-yongwang@vmware.com> Cc: dev@dpdk.org, Yong Wang , Ronghua Zhang To: anatoly.burakov@intel.com Return-path: Received: from smtp-outbound-1.vmware.com (smtp-outbound-1.vmware.com [208.91.2.12]) by dpdk.org (Postfix) with ESMTP id 2B1B3137D for ; Fri, 8 Jul 2016 00:43:03 +0200 (CEST) List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The offset of the 2nd mmap when mapping the region after msix_bar needs to take region address into consideration. This is exposed when using vfio-pci to manage vmxnet3 pmd. Fixes: 90a1633b2347 ("eal/linux: allow to map BARs with MSI-X tables") Signed-off-by: Yong Wang Signed-off-by: Ronghua Zhang --- lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c index f91b924..3729c35 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c @@ -896,7 +896,7 @@ pci_vfio_map_resource(struct rte_pci_device *dev) } else { memreg[0].offset = reg.offset; memreg[0].size = table_start; - memreg[1].offset = table_end; + memreg[1].offset = reg.offset + table_end; memreg[1].size = reg.size - table_end; RTE_LOG(DEBUG, EAL, @@ -939,7 +939,8 @@ pci_vfio_map_resource(struct rte_pci_device *dev) /* if there's a second part, try to map it */ if (map_addr != MAP_FAILED && memreg[1].offset && memreg[1].size) { - void *second_addr = RTE_PTR_ADD(bar_addr, memreg[1].offset); + void *second_addr = RTE_PTR_ADD(bar_addr, + memreg[1].offset - memreg[0].offset); map_addr = pci_map_resource(second_addr, vfio_dev_fd, memreg[1].offset, memreg[1].size, -- 1.9.1