From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: Re: [PATCH 1/2] vfio: fix pci_vfio_map_resource Date: Thu, 14 Jul 2016 15:25:37 +0200 Message-ID: <3677701.6a7nRcOOV2@xps13> References: <1467930397-39777-1-git-send-email-yongwang@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Cc: Yong Wang , anatoly.burakov@intel.com, Ronghua Zhang To: dev@dpdk.org Return-path: Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 1BCF13978 for ; Thu, 14 Jul 2016 15:25:40 +0200 (CEST) Received: by mail-wm0-f47.google.com with SMTP id o80so113197523wme.1 for ; Thu, 14 Jul 2016 06:25:40 -0700 (PDT) In-Reply-To: <1467930397-39777-1-git-send-email-yongwang@vmware.com> 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" Someone to review this patch please? It can be integrated in RC3 if we are sure it doesn't break anything. 2016-07-07 15:26, Yong Wang: > 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, >