From: Tetsuya Mukawa <mukawa@igel.co.jp> To: dev@dpdk.org Subject: [dpdk-dev] [PATCH v2 13/15] eal: Consolidate pci_map/unmap_resource() of linuxapp and bsdapp Date: Thu, 12 Mar 2015 19:17:52 +0900 Message-ID: <1426155474-1596-14-git-send-email-mukawa@igel.co.jp> (raw) In-Reply-To: <1426155474-1596-1-git-send-email-mukawa@igel.co.jp> 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 +/* 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 */ + /* 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 /* unmap IGB_UIO resource prototype */ void pci_uio_unmap_resource(struct rte_pci_device *dev); -- 1.9.1
next prev parent reply other threads:[~2015-03-12 10:18 UTC|newest] Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-04 3:11 [dpdk-dev] [PATCH 1/3] BSD: Support Port Hotplug function Tetsuya Mukawa 2015-03-04 3:11 ` [dpdk-dev] [PATCH 2/3] eal, ethdev: Remove CONFIG_RTE_LIBRTE_EAL_HOTPLUG Tetsuya Mukawa 2015-03-04 3:11 ` [dpdk-dev] [PATCH 3/3] doc: Remove BSD limitation from hotplug section of programmer's guide Tetsuya Mukawa 2015-03-06 10:32 ` [dpdk-dev] [PATCH 1/3] BSD: Support Port Hotplug function Iremonger, Bernard 2015-03-09 2:23 ` Tetsuya Mukawa 2015-03-12 10:24 ` Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 00/15] eal: Port Hotplug support for BSD Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 01/15] eal: Fix cording style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa 2015-03-12 10:48 ` Bruce Richardson 2015-03-12 10:57 ` Qiu, Michael 2015-03-12 11:09 ` Bruce Richardson 2015-03-13 0:25 ` Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 02/15] eal: Close file descriptor of uio configuration Tetsuya Mukawa 2015-03-13 13:54 ` Iremonger, Bernard 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 03/15] eal: Fix memory leak of pci_uio_map_resource() Tetsuya Mukawa 2015-03-13 14:04 ` Iremonger, Bernard 2015-03-17 9:30 ` [dpdk-dev] [PATCH 0/6] Clean up pci uio implementations Tetsuya Mukawa 2015-03-17 9:30 ` [dpdk-dev] [PATCH 1/6] eal: Fix cording style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa 2015-03-18 14:29 ` Bruce Richardson 2015-03-18 15:08 ` David Marchand 2015-03-17 9:30 ` [dpdk-dev] [PATCH 2/6] eal: Close file descriptor of uio configuration Tetsuya Mukawa 2015-03-18 15:19 ` David Marchand 2015-03-20 1:53 ` Tetsuya Mukawa 2015-03-19 16:04 ` Iremonger, Bernard 2015-03-20 1:54 ` Tetsuya Mukawa 2015-03-17 9:30 ` [dpdk-dev] [PATCH 3/6] eal: Fix memory leaks and needless incrementation of pci uio implementation Tetsuya Mukawa 2015-03-18 15:39 ` David Marchand 2015-03-20 1:53 ` Tetsuya Mukawa 2015-03-19 16:20 ` Iremonger, Bernard 2015-03-20 1:54 ` Tetsuya Mukawa 2015-03-17 9:30 ` [dpdk-dev] [PATCH 4/6] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa 2015-03-17 9:30 ` [dpdk-dev] [PATCH 5/6] eal: Use map_idx in pci_uio_map_resource() of bsdapp to work same as linuxapp Tetsuya Mukawa 2015-03-17 9:30 ` [dpdk-dev] [PATCH 6/6] eal: Fix interface of pci_map_resource() Tetsuya Mukawa 2015-03-20 9:53 ` Iremonger, Bernard 2015-03-24 4:18 ` Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 0/6] Clean up pci uio implementations Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 1/6] eal: Fix coding style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 2/6] eal: Close file descriptor of uio configuration Tetsuya Mukawa 2015-03-24 18:33 ` Stephen Hemminger 2015-03-25 3:17 ` Tetsuya Mukawa 2015-03-25 5:07 ` Stephen Hemminger 2015-03-26 4:19 ` Tetsuya Mukawa 2015-03-26 10:03 ` Iremonger, Bernard 2015-03-27 6:01 ` Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 3/6] eal: Fix memory leaks and needless increment of pci_map_addr Tetsuya Mukawa 2015-03-25 15:00 ` Iremonger, Bernard 2015-03-26 2:44 ` Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 4/6] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 5/6] eal: Use map_idx in pci_uio_map_resource() of bsdapp to work same as linuxapp Tetsuya Mukawa 2015-03-25 15:27 ` Iremonger, Bernard 2015-03-26 2:50 ` Tetsuya Mukawa 2015-03-26 10:41 ` Iremonger, Bernard 2015-03-27 8:19 ` Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 6/6] eal: Fix interface of pci_map_resource() Tetsuya Mukawa 2015-03-25 15:03 ` Iremonger, Bernard 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 0/5] Clean up pci uio implementations Tetsuya Mukawa 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 1/5] eal: Fix coding style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 2/5] eal: Close file descriptor of uio configuration Tetsuya Mukawa 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 3/5] eal: Fix memory leaks and needless increment of pci_map_addr Tetsuya Mukawa 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 4/5] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 5/5] eal: Fix uio mapping differences between linuxapp and bsdapp Tetsuya Mukawa 2015-04-21 13:15 ` [dpdk-dev] [PATCH v3 0/5] Clean up pci uio implementations Iremonger, Bernard 2015-04-23 4:23 ` Tetsuya Mukawa 2015-04-23 8:12 ` Iremonger, Bernard 2015-04-23 9:48 ` Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 04/15] eal: Fix needless incrementation of pci_map_addr Tetsuya Mukawa 2015-03-13 14:49 ` Iremonger, Bernard 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 05/15] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 06/15] eal: Use map_idx in pci_uio_map_resource() of bsdapp to work same as linuxapp Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 07/15] eal: Fix interface of pci_map_resource() of bsdapp Tetsuya Mukawa 2015-03-12 11:04 ` Bruce Richardson 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 08/15] eal: Add pci_uio_alloc_uio_resource() Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 09/15] eal: Add pci_uio_map_uio_resource_by_index() Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 10/15] eal: Consolidate pci_map and mapped_pci_resource of linuxapp and bsdapp Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 11/15] eal: Consolidate rte_eal_pci_probe/close_one_driver() " Tetsuya Mukawa 2015-03-13 15:03 ` Iremonger, Bernard 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 12/15] eal: Consolidate pci_map/unmap_device() " Tetsuya Mukawa 2015-03-13 15:10 ` Iremonger, Bernard 2015-03-12 10:17 ` Tetsuya Mukawa [this message] 2015-03-13 15:23 ` [dpdk-dev] [PATCH v2 13/15] eal: Consolidate pci_map/unmap_resource() " Iremonger, Bernard 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 14/15] eal: Consolidate pci uio functions " Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 15/15] eal: Enable Port Hotplug as default in Linux and BSD Tetsuya Mukawa 2015-03-13 15:47 ` Iremonger, Bernard 2015-03-17 8:08 ` Tetsuya Mukawa 2015-03-19 11:41 ` Iremonger, Bernard 2015-03-13 11:46 ` [dpdk-dev] [PATCH v2 00/15] eal: Port Hotplug support for BSD Iremonger, Bernard 2015-03-16 3:36 ` Tetsuya Mukawa
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1426155474-1596-14-git-send-email-mukawa@igel.co.jp \ --to=mukawa@igel.co.jp \ --cc=dev@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git