Re: [dpdk-dev] [PATCH v2 13/15] eal: Consolidate pci_map/unmap_resource() of linuxapp and bsdapp

["Iremonger, Bernard" <bernard.iremonger@intel.com>]

> -----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 linuxapp and bsdapp
> 
> The patch consolidates below functions, and implemented in common eal code.
>  - pci_map_resource()
>  - pci_unmap_resource()
> 
> Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
> ---
>  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(-)
> 
> 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 <dirent.h>
>  #include <limits.h>
>  #include <sys/queue.h>
> -#include <sys/mman.h>
>  #include <sys/ioctl.h>
>  #include <sys/pciio.h>
>  #include <dev/pci/pcireg.h>
> @@ -96,29 +95,6 @@ pci_unbind_kernel_driver(struct rte_pci_device *dev __rte_unused)
>  	return -ENOTSUP;
>  }
> 
> -/* map a particular resource from a file */ -static 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 = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
> -			MAP_SHARED | additional_flags, fd, offset);
> -	if (mapaddr == 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_common_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 <stdlib.h>
>  #include <stdio.h>
>  #include <sys/queue.h>
> +#include <sys/mman.h>
> 
>  #include <rte_interrupts.h>
>  #include <rte_log.h>
> @@ -98,6 +99,48 @@ static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev)
>  	return NULL;
>  }
> 
> +/* 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 = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
> +			MAP_SHARED | additional_flags, fd, offset);
> +	if (mapaddr == 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_pci.c ?

Regards,

Bernard.

> +/* unmap a particular resource */
> +void
> +pci_unmap_resource(void *requested_addr, size_t size) {
> +	if (requested_addr == 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/common/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);
> 
> +/**
> + * 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 @@
> 
>  #include <string.h>
>  #include <dirent.h>
> -#include <sys/mman.h>
> 
>  #include <rte_log.h>
>  #include <rte_pci.h>
> @@ -142,47 +141,6 @@ pci_find_max_end_va(void)
>  	return RTE_PTR_ADD(last->addr, last->len);  }
> 
> -
> -/* 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 = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
> -			MAP_SHARED | additional_flags, fd, offset);
> -	if (mapaddr == 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 == 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 *dev) diff --git
> a/lib/librte_eal/linuxapp/eal/eal_pci_init.h b/lib/librte_eal/linuxapp/eal/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);
> 
> -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);
> 
> -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