From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 3AF019A8C for ; Fri, 13 Mar 2015 16:23:30 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 13 Mar 2015 08:17:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,395,1422950400"; d="scan'208";a="540518147" Received: from irsmsx154.ger.corp.intel.com ([163.33.192.96]) by orsmga003.jf.intel.com with ESMTP; 13 Mar 2015 08:22:42 -0700 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.218]) by IRSMSX154.ger.corp.intel.com ([169.254.12.237]) with mapi id 14.03.0195.001; Fri, 13 Mar 2015 15:23:25 +0000 From: "Iremonger, Bernard" To: Tetsuya Mukawa , "dev@dpdk.org" Thread-Topic: [PATCH v2 13/15] eal: Consolidate pci_map/unmap_resource() of linuxapp and bsdapp Thread-Index: AQHQXK3+iTqRLe+IiUKkXhyzHU7Osp0aiM8A Date: Fri, 13 Mar 2015 15:23:24 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C2049F2A1E@IRSMSX108.ger.corp.intel.com> References: <1425438703-18895-1-git-send-email-mukawa@igel.co.jp> <1426155474-1596-1-git-send-email-mukawa@igel.co.jp> <1426155474-1596-14-git-send-email-mukawa@igel.co.jp> In-Reply-To: <1426155474-1596-14-git-send-email-mukawa@igel.co.jp> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.182] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2 13/15] eal: Consolidate pci_map/unmap_resource() of linuxapp and bsdapp X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2015 15:23:32 -0000 > -----Original Message----- > From: Tetsuya Mukawa [mailto:mukawa@igel.co.jp] > Sent: Thursday, March 12, 2015 10:18 AM > To: dev@dpdk.org > Cc: Iremonger, Bernard; Richardson, Bruce; Tetsuya Mukawa > Subject: [PATCH v2 13/15] eal: Consolidate pci_map/unmap_resource() of li= nuxapp and bsdapp >=20 > The patch consolidates below functions, and implemented in common eal cod= e. > - pci_map_resource() > - pci_unmap_resource() >=20 > Signed-off-by: Tetsuya Mukawa > --- > lib/librte_eal/bsdapp/eal/eal_pci.c | 24 ----------------- > lib/librte_eal/common/eal_common_pci.c | 43 ++++++++++++++++++++++++= ++++++ > lib/librte_eal/common/include/rte_pci.h | 11 ++++++++ > lib/librte_eal/linuxapp/eal/eal_pci.c | 42 ------------------------= ----- > lib/librte_eal/linuxapp/eal/eal_pci_init.h | 5 ---- > 5 files changed, 54 insertions(+), 71 deletions(-) >=20 > diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/= eal/eal_pci.c > index 1e42e42..d7d6439 100644 > --- a/lib/librte_eal/bsdapp/eal/eal_pci.c > +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c > @@ -46,7 +46,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -96,29 +95,6 @@ pci_unbind_kernel_driver(struct rte_pci_device *dev __= rte_unused) > return -ENOTSUP; > } >=20 > -/* map a particular resource from a file */ -static void * -pci_map_reso= urce(void *requested_addr, > int fd, off_t offset, size_t size, > - int additional_flags) > -{ > - void *mapaddr; > - > - /* Map the PCI memory resource of device */ > - mapaddr =3D mmap(requested_addr, size, PROT_READ | PROT_WRITE, > - MAP_SHARED | additional_flags, fd, offset); > - if (mapaddr =3D=3D MAP_FAILED) { > - RTE_LOG(ERR, EAL, > - "%s(): cannot mmap(%d, %p, 0x%lx, 0x%lx): %s (%p)\n", > - __func__, fd, requested_addr, > - (unsigned long)size, (unsigned long)offset, > - strerror(errno), mapaddr); > - } else { > - RTE_LOG(DEBUG, EAL, " PCI memory mapped at %p\n", mapaddr); > - } > - > - return mapaddr; > -} > - > static int > pci_uio_map_secondary(struct rte_pci_device *dev) { diff --git > a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_comm= on_pci.c > index 726026f..6d98194 100644 > --- a/lib/librte_eal/common/eal_common_pci.c > +++ b/lib/librte_eal/common/eal_common_pci.c > @@ -67,6 +67,7 @@ > #include > #include > #include > +#include >=20 > #include > #include > @@ -98,6 +99,48 @@ static struct rte_devargs *pci_devargs_lookup(struct r= te_pci_device *dev) > return NULL; > } >=20 > +/* map a particular resource from a file */ void * > +pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size= , > + int additional_flags) > +{ > + void *mapaddr; > + > + /* Map the PCI memory resource of device */ > + mapaddr =3D mmap(requested_addr, size, PROT_READ | PROT_WRITE, > + MAP_SHARED | additional_flags, fd, offset); > + if (mapaddr =3D=3D MAP_FAILED) { > + RTE_LOG(ERR, EAL, > + "%s(): cannot mmap(%d, %p, 0x%lx, 0x%lx): %s (%p)\n", > + __func__, fd, requested_addr, > + (unsigned long)size, (unsigned long)offset, > + strerror(errno), mapaddr); > + } else { > + RTE_LOG(DEBUG, EAL, " PCI memory mapped at %p\n", mapaddr); > + } > + > + return mapaddr; > +} > + > +#ifdef RTE_LIBRTE_EAL_HOTPLUG Hi Tetsuya, Can #ifdef RTE_LIBRTE_EAL_HOTPLUG be removed as code is now in eal_common_p= ci.c ? Regards, Bernard. > +/* unmap a particular resource */ > +void > +pci_unmap_resource(void *requested_addr, size_t size) { > + if (requested_addr =3D=3D NULL) > + return; > + > + /* Unmap the PCI memory resource of device */ > + if (munmap(requested_addr, size)) { > + RTE_LOG(ERR, EAL, "%s(): cannot munmap(%p, 0x%lx): %s\n", > + __func__, requested_addr, (unsigned long)size, > + strerror(errno)); > + } else > + RTE_LOG(DEBUG, EAL, " PCI memory unmapped at %p\n", > + requested_addr); > +} > +#endif /* RTE_LIBRTE_EAL_HOTPLUG */ Hi Tetsuya, Can #endif be removed too as code is now in eal_common_pci.c ? Regards, Bernard. > + > /* Map pci device */ > static int > pci_map_device(struct rte_pci_device *dev) diff --git a/lib/librte_eal/c= ommon/include/rte_pci.h > b/lib/librte_eal/common/include/rte_pci.h > index 47345b8..d3b883e 100644 > --- a/lib/librte_eal/common/include/rte_pci.h > +++ b/lib/librte_eal/common/include/rte_pci.h > @@ -363,8 +363,19 @@ int rte_eal_pci_scan(void); > */ > int rte_eal_pci_probe(void); >=20 > +/** > + * Map pci resouce. > + */ > +void *pci_map_resource(void *requested_addr, int fd, off_t offset, > + size_t size, int additional_flags); > + > #ifdef RTE_LIBRTE_EAL_HOTPLUG > /** > + * Map pci resouce. > + */ > +void pci_unmap_resource(void *requested_addr, size_t size); > + > +/** > * Probe the single PCI device. > * > * Scan the content of the PCI bus, and find the pci device specified by= pci diff --git > a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal= _pci.c > index 6a8153c..d072e98 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_pci.c > +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c > @@ -33,7 +33,6 @@ >=20 > #include > #include > -#include >=20 > #include > #include > @@ -142,47 +141,6 @@ pci_find_max_end_va(void) > return RTE_PTR_ADD(last->addr, last->len); } >=20 > - > -/* map a particular resource from a file */ -void * -pci_map_resource(vo= id *requested_addr, int fd, > off_t offset, size_t size, > - int additional_flags) > -{ > - void *mapaddr; > - > - /* Map the PCI memory resource of device */ > - mapaddr =3D mmap(requested_addr, size, PROT_READ | PROT_WRITE, > - MAP_SHARED | additional_flags, fd, offset); > - if (mapaddr =3D=3D MAP_FAILED) { > - RTE_LOG(ERR, EAL, > - "%s(): cannot mmap(%d, %p, 0x%lx, 0x%lx): %s (%p)\n", > - __func__, fd, requested_addr, > - (unsigned long)size, (unsigned long)offset, > - strerror(errno), mapaddr); > - } else { > - RTE_LOG(DEBUG, EAL, " PCI memory mapped at %p\n", mapaddr); > - } > - > - return mapaddr; > -} > - > -/* unmap a particular resource */ > -void > -pci_unmap_resource(void *requested_addr, size_t size) -{ > - if (requested_addr =3D=3D NULL) > - return; > - > - /* Unmap the PCI memory resource of device */ > - if (munmap(requested_addr, size)) { > - RTE_LOG(ERR, EAL, "%s(): cannot munmap(%p, 0x%lx): %s\n", > - __func__, requested_addr, (unsigned long)size, > - strerror(errno)); > - } else > - RTE_LOG(DEBUG, EAL, " PCI memory unmapped at %p\n", > - requested_addr); > -} > - > /* parse the "resource" sysfs file */ > static int > pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *de= v) diff --git > a/lib/librte_eal/linuxapp/eal/eal_pci_init.h b/lib/librte_eal/linuxapp/ea= l/eal_pci_init.h > index d9d1878..d426b27 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_pci_init.h > +++ b/lib/librte_eal/linuxapp/eal/eal_pci_init.h > @@ -42,14 +42,9 @@ > extern void *pci_map_addr; > void *pci_find_max_end_va(void); >=20 > -void *pci_map_resource(void *requested_addr, int fd, off_t offset, > - size_t size, int additional_flags); > - > /* map IGB_UIO resource prototype */ > int pci_uio_map_resource(struct rte_pci_device *dev); >=20 > -void pci_unmap_resource(void *requested_addr, size_t size); > - > #ifdef RTE_LIBRTE_EAL_HOTPLUG Hi Tetsuya, Can #ifdef RTE_LIBRTE_EAL_HOTPLUG be removed ? Regards, Bernard. > /* unmap IGB_UIO resource prototype */ > void pci_uio_unmap_resource(struct rte_pci_device *dev); > -- > 1.9.1