DPDK patches and discussions
 help / color / mirror / Atom feed
From: Tetsuya Mukawa <mukawa@igel.co.jp>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v9 08/12] eal: Consolidate pci_map and mapped_pci_resource of linuxapp and bsdapp
Date: Wed,  8 Jul 2015 19:34:49 +0900	[thread overview]
Message-ID: <1436351693-2349-9-git-send-email-mukawa@igel.co.jp> (raw)
In-Reply-To: <1436351693-2349-1-git-send-email-mukawa@igel.co.jp>

From: "Tetsuya.Mukawa" <mukawa@igel.co.jp>

This patch consolidates below structures, and defines them in common code.
 - struct pci_map
 - strucy mapped_pci_resouces

Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
Acked-by: David Marchand <david.marchand@6wind.com>
---
 lib/librte_eal/bsdapp/eal/eal_pci.c        | 24 ------------------------
 lib/librte_eal/common/include/rte_pci.h    | 29 +++++++++++++++++++++++++++++
 lib/librte_eal/linuxapp/eal/eal_pci_init.h | 23 -----------------------
 3 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c
index 1dfcb82..83c8d0c 100644
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -83,30 +83,6 @@
  * network card, only providing access to PCI BAR to applications, and
  * enabling bus master.
  */
-
-struct pci_map {
-	void *addr;
-	char *path;
-	uint64_t offset;
-	uint64_t size;
-	uint64_t phaddr;
-};
-
-/*
- * For multi-process we need to reproduce all PCI mappings in secondary
- * processes, so save them in a tailq.
- */
-struct mapped_pci_resource {
-	TAILQ_ENTRY(mapped_pci_resource) next;
-
-	struct rte_pci_addr pci_addr;
-	char path[PATH_MAX];
-	int nb_maps;
-	struct pci_map maps[PCI_MAX_RESOURCE];
-};
-
-TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource);
-
 static struct rte_tailq_elem rte_uio_tailq = {
 	.name = "UIO_RESOURCE_LIST",
 };
diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h
index 7801fa0..d95747e 100644
--- a/lib/librte_eal/common/include/rte_pci.h
+++ b/lib/librte_eal/common/include/rte_pci.h
@@ -2,6 +2,7 @@
  *   BSD LICENSE
  *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2015 IGEL Co., Ltd.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -220,6 +221,34 @@ struct rte_pci_driver {
 /** Device driver supports detaching capability */
 #define RTE_PCI_DRV_DETACHABLE	0x0010
 
+/**
+ * A structure describing a PCI mapping.
+ */
+struct pci_map {
+	void *addr;
+	char *path;
+	uint64_t offset;
+	uint64_t size;
+	uint64_t phaddr;
+};
+
+/**
+ * A structure describing a mapped PCI resource.
+ * For multi-process we need to reproduce all PCI mappings in secondary
+ * processes, so save them in a tailq.
+ */
+struct mapped_pci_resource {
+	TAILQ_ENTRY(mapped_pci_resource) next;
+
+	struct rte_pci_addr pci_addr;
+	char path[PATH_MAX];
+	int nb_maps;
+	struct pci_map maps[PCI_MAX_RESOURCE];
+};
+
+/** mapped pci device list */
+TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource);
+
 /**< Internal use only - Macro used by pci addr parsing functions **/
 #define GET_PCIADDR_FIELD(in, fd, lim, dlm)                   \
 do {                                                               \
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_init.h b/lib/librte_eal/linuxapp/eal/eal_pci_init.h
index aa7b755..d9d1878 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci_init.h
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_init.h
@@ -36,29 +36,6 @@
 
 #include "eal_vfio.h"
 
-struct pci_map {
-	void *addr;
-	char *path;
-	uint64_t offset;
-	uint64_t size;
-	uint64_t phaddr;
-};
-
-/*
- * For multi-process we need to reproduce all PCI mappings in secondary
- * processes, so save them in a tailq.
- */
-struct mapped_pci_resource {
-	TAILQ_ENTRY(mapped_pci_resource) next;
-
-	struct rte_pci_addr pci_addr;
-	char path[PATH_MAX];
-	int nb_maps;
-	struct pci_map maps[PCI_MAX_RESOURCE];
-};
-
-TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource);
-
 /*
  * Helper function to map PCI resources right after hugepages in virtual memory
  */
-- 
2.1.4

  parent reply	other threads:[~2015-07-08 10:35 UTC|newest]

Thread overview: 120+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-19  5:54 [dpdk-dev] [PATCH v4 0/5] Clean up pci uio implementations Tetsuya Mukawa
2015-05-19  5:54 ` [dpdk-dev] [PATCH v4 1/5] eal: Fix coding style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa
2015-05-19 14:51   ` Stephen Hemminger
2015-06-25  3:19   ` [dpdk-dev] [PATCH v5 0/5] Clean up pci uio implementations Tetsuya Mukawa
2015-06-25  3:19     ` [dpdk-dev] [PATCH v5 1/5] eal: Fix coding style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa
2015-06-25  9:16       ` David Marchand
2015-06-25  3:19     ` [dpdk-dev] [PATCH v5 2/5] eal: Close file descriptor of uio configuration Tetsuya Mukawa
2015-06-25  3:19     ` [dpdk-dev] [PATCH v5 3/5] eal: Fix memory leaks and needless increment of pci_map_addr Tetsuya Mukawa
2015-06-25  9:16       ` David Marchand
2015-06-26  1:30         ` Tetsuya Mukawa
2015-06-25  9:18       ` David Marchand
2015-06-26  1:35         ` Tetsuya Mukawa
2015-06-26  8:18       ` [dpdk-dev] [PATCH v6 0/5] Clean up pci uio implementations Tetsuya Mukawa
2015-06-26  8:18         ` [dpdk-dev] [PATCH v6 1/5] eal: Fix coding style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa
2015-06-26 14:30           ` Iremonger, Bernard
2015-06-26  8:18         ` [dpdk-dev] [PATCH v6 2/5] eal: Close file descriptor of uio configuration Tetsuya Mukawa
2015-06-26 14:32           ` Iremonger, Bernard
2015-06-26  8:18         ` [dpdk-dev] [PATCH v6 3/5] eal: Fix memory leaks and needless increment of pci_map_addr Tetsuya Mukawa
2015-06-26 14:34           ` Iremonger, Bernard
2015-06-30  8:24           ` [dpdk-dev] [PATCH v7 00/12] Clean up pci uio implementations Tetsuya Mukawa
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 01/12] eal: Fix coding style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 02/12] eal: Close file descriptor of uio configuration Tetsuya Mukawa
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 03/12] eal: Fix memory leaks and needless increment of pci_map_addr Tetsuya Mukawa
2015-06-30 12:33               ` Iremonger, Bernard
2015-07-02  9:57               ` Bruce Richardson
2015-07-03  8:51                 ` Tetsuya Mukawa
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 04/12] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa
2015-06-30 12:36               ` Iremonger, Bernard
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 05/12] eal: Fix uio mapping differences between linuxapp and bsdapp Tetsuya Mukawa
2015-06-30 12:51               ` Iremonger, Bernard
2015-07-02 10:20               ` Bruce Richardson
2015-07-03  8:51                 ` Tetsuya Mukawa
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 06/12] eal: Add pci_uio_alloc_resource() Tetsuya Mukawa
2015-07-02 10:46               ` Bruce Richardson
2015-07-03  8:52                 ` Tetsuya Mukawa
2015-07-03  9:45                   ` Bruce Richardson
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 07/12] eal: Add pci_uio_map_resource_by_index() Tetsuya Mukawa
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 08/12] eal: Consolidate pci_map and mapped_pci_resource of linuxapp and bsdapp Tetsuya Mukawa
2015-06-30 14:25               ` Iremonger, Bernard
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 09/12] eal: Consolidate pci_map/unmap_resource() " Tetsuya Mukawa
2015-06-30 14:28               ` Iremonger, Bernard
2015-07-02 11:11               ` Bruce Richardson
2015-07-03  8:52                 ` Tetsuya Mukawa
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 10/12] eal: Consolidate pci uio functions " Tetsuya Mukawa
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 11/12] eal: Consolidate pci_map/unmap_device() " Tetsuya Mukawa
2015-06-30 14:45               ` Iremonger, Bernard
2015-07-06  6:24               ` [dpdk-dev] [PATCH v8 00/12] Clean up pci uio implementations Tetsuya Mukawa
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 01/12] eal: Fix coding style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa
2015-07-07  8:04                   ` David Marchand
2015-07-08  2:42                     ` Tetsuya Mukawa
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 02/12] eal: Close file descriptor of uio configuration Tetsuya Mukawa
2015-07-07  8:04                   ` David Marchand
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 03/12] eal: Fix memory leaks and needless increment of pci_map_addr Tetsuya Mukawa
2015-07-07  8:04                   ` David Marchand
2015-07-08  2:42                     ` Tetsuya Mukawa
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 04/12] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa
2015-07-07  8:04                   ` David Marchand
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 05/12] eal: Fix uio mapping differences between linuxapp and bsdapp Tetsuya Mukawa
2015-07-07  8:04                   ` David Marchand
2015-07-08  2:42                     ` Tetsuya Mukawa
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 06/12] eal: Add pci_uio_alloc_resource() Tetsuya Mukawa
2015-07-07  8:04                   ` David Marchand
2015-07-08  2:42                     ` Tetsuya Mukawa
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 07/12] eal: Add pci_uio_map_resource_by_index() Tetsuya Mukawa
2015-07-07  8:05                   ` David Marchand
2015-07-08  2:42                     ` Tetsuya Mukawa
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 08/12] eal: Consolidate pci_map and mapped_pci_resource of linuxapp and bsdapp Tetsuya Mukawa
2015-07-07  8:05                   ` David Marchand
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 09/12] eal: Consolidate pci_map/unmap_resource() " Tetsuya Mukawa
2015-07-07  8:05                   ` David Marchand
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 10/12] eal: Consolidate pci uio functions " Tetsuya Mukawa
2015-07-07  8:07                   ` David Marchand
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 11/12] eal: Consolidate pci_map/unmap_device() " Tetsuya Mukawa
2015-07-07  8:06                   ` David Marchand
2015-07-08  2:42                     ` Tetsuya Mukawa
2015-07-08  8:27                       ` Thomas Monjalon
2015-07-08  8:50                         ` Tetsuya Mukawa
2015-07-06  6:24                 ` [dpdk-dev] [PATCH v8 12/12] eal: Consolidate rte_eal_pci_probe/close_one_driver() " Tetsuya Mukawa
2015-07-07  8:07                   ` David Marchand
2015-07-08 10:34               ` [dpdk-dev] [PATCH v9 00/12] Clean up pci uio implementations Tetsuya Mukawa
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 01/12] eal: Fix coding style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa
2015-07-08 16:09                   ` Stephen Hemminger
2015-07-08 20:30                     ` Thomas Monjalon
2015-07-09  1:09                       ` Tetsuya Mukawa
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 02/12] eal: Close file descriptor of uio configuration Tetsuya Mukawa
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 03/12] eal: Fix memory leaks and needless increment of pci_map_addr Tetsuya Mukawa
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 04/12] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 05/12] eal: Fix uio mapping differences between linuxapp and bsdapp Tetsuya Mukawa
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 06/12] eal: Add pci_uio_alloc/free_resource() Tetsuya Mukawa
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 07/12] eal: Add pci_uio_map_resource_by_index() Tetsuya Mukawa
2015-07-08 10:34                 ` Tetsuya Mukawa [this message]
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 09/12] eal: Consolidate pci_map/unmap_resource() of linuxapp and bsdapp Tetsuya Mukawa
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 10/12] eal: Consolidate pci uio functions " Tetsuya Mukawa
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 11/12] eal: Consolidate pci_map/unmap_device() " Tetsuya Mukawa
2015-07-08 10:34                 ` [dpdk-dev] [PATCH v9 12/12] eal: Consolidate rte_eal_pci_probe/close_one_driver() " Tetsuya Mukawa
2015-07-08 12:36                 ` [dpdk-dev] [PATCH v9 00/12] Clean up pci uio implementations David Marchand
2015-07-08 21:52                   ` Thomas Monjalon
2015-06-30  8:24             ` [dpdk-dev] [PATCH v7 12/12] eal: Consolidate rte_eal_pci_probe/close_one_driver() of linuxapp and bsdapp Tetsuya Mukawa
2015-06-30 14:56               ` Iremonger, Bernard
2015-07-01  6:39                 ` Tetsuya Mukawa
2015-07-02 11:32             ` [dpdk-dev] [PATCH v7 00/12] Clean up pci uio implementations Bruce Richardson
2015-07-03  8:52               ` Tetsuya Mukawa
2015-06-26  8:18         ` [dpdk-dev] [PATCH v6 4/5] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa
2015-06-26 14:36           ` Iremonger, Bernard
2015-06-26  8:18         ` [dpdk-dev] [PATCH v6 5/5] eal: Fix uio mapping differences between linuxapp and bsdapp Tetsuya Mukawa
2015-06-26 14:42           ` Iremonger, Bernard
2015-06-25  3:19     ` [dpdk-dev] [PATCH v5 4/5] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa
2015-06-25  9:19       ` David Marchand
2015-06-25  3:19     ` [dpdk-dev] [PATCH v5 5/5] eal: Fix uio mapping differences between linuxapp and bsdapp Tetsuya Mukawa
2015-05-19  5:54 ` [dpdk-dev] [PATCH v4 2/5] eal: Close file descriptor of uio configuration Tetsuya Mukawa
2015-05-19 16:02   ` Stephen Hemminger
2015-05-19  5:54 ` [dpdk-dev] [PATCH v4 3/5] eal: Fix memory leaks and needless increment of pci_map_addr Tetsuya Mukawa
2015-06-15 14:29   ` Iremonger, Bernard
2015-06-15 15:05     ` Iremonger, Bernard
2015-05-19  5:54 ` [dpdk-dev] [PATCH v4 4/5] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa
2015-05-19  5:54 ` [dpdk-dev] [PATCH v4 5/5] eal: Fix uio mapping differences between linuxapp and bsdapp Tetsuya Mukawa
2015-06-15 14:31   ` Iremonger, Bernard
2015-06-15 15:08     ` Iremonger, Bernard
2015-06-15 15:17       ` Thomas Monjalon
2015-05-19  5:57 ` [dpdk-dev] [PATCH v4 0/5] Clean up pci uio implementations 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=1436351693-2349-9-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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).