From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <rkerur@gmail.com>
Received: from mail-pa0-f51.google.com (mail-pa0-f51.google.com
[209.85.220.51]) by dpdk.org (Postfix) with ESMTP id 8A59B95EE
for <dev@dpdk.org>; Thu, 25 Dec 2014 16:33:56 +0100 (CET)
Received: by mail-pa0-f51.google.com with SMTP id ey11so11953128pad.38
for <dev@dpdk.org>; Thu, 25 Dec 2014 07:33:56 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=from:to:cc:subject:date:message-id:in-reply-to:references;
bh=aP7szzRI3zcolsvKecq2K0lU1R+GfGlc0SHtuAUpfFM=;
b=yqXnM0yKBvVJafdpPs0JxejDGZ727vg0HnGfg/qR0NogBlvGaO6dJiN2+PnWE+qb8Q
buUamZUv12Nf4VatnDOYSZR3of6ApK5YYnJ8h3inb+iPAqTgKlRpb9FsZH/4KU5Xdb/G
fUVaVGEOGcHquZftsKOLcXY8I1ZLBVLDXY8B4O1p4eH/zI4hlVJDDZ5S22STBxIT7pOL
keU5Gaa3te7tcWeVV/ZwWsVf49j+LZYOF8Hc0juHbBWHdlXw40rSL1Z8iihF7zhcAmot
hp3W1CyDO30sOJVU1moiEo4BSAQzui0ZRf17Z46XqUVIxXrqgTPDJ8FesVlCqKWdbGXc
yTxA==
X-Received: by 10.70.91.142 with SMTP id ce14mr62696097pdb.138.1419521635961;
Thu, 25 Dec 2014 07:33:55 -0800 (PST)
Received: from iaas-l305162.englab.brocade.com ([144.49.130.148])
by mx.google.com with ESMTPSA id pe8sm25719713pdb.60.2014.12.25.07.33.55
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Thu, 25 Dec 2014 07:33:55 -0800 (PST)
From: Ravi Kerur <rkerur@gmail.com>
To: dev@dpdk.org
Date: Thu, 25 Dec 2014 10:33:17 -0500
Message-Id: <1419521597-31978-8-git-send-email-rkerur@gmail.com>
X-Mailer: git-send-email 1.9.1
In-Reply-To: <1419521597-31978-1-git-send-email-rkerur@gmail.com>
References: <1419521597-31978-1-git-send-email-rkerur@gmail.com>
Subject: [dpdk-dev] [PATCH 7/7] Move EAL common functions
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Dec 2014 15:33:57 -0000
Move common functions in eal_memory.c to librte_eal/common
directory.
Use RTE_EXEC_ENV_BSDAPP to differentiate minor differences in
common functions.
Fix checkpatch warnings and errors.
Signed-off-by: Ravi Kerur <rkerur@gmail.com>
---
lib/librte_eal/bsdapp/eal/eal_memory.c | 36 ++------------------------
lib/librte_eal/common/eal_common_memory.c | 43 +++++++++++++++++++++++++++++--
lib/librte_eal/common/eal_private.h | 28 ++++++++++++++++++++
lib/librte_eal/linuxapp/eal/eal_memory.c | 36 ++------------------------
4 files changed, 73 insertions(+), 70 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c
index 65ee87d..b192705 100644
--- a/lib/librte_eal/bsdapp/eal/eal_memory.c
+++ b/lib/librte_eal/bsdapp/eal/eal_memory.c
@@ -59,7 +59,7 @@ rte_mem_virt2phy(const void *virtaddr)
return RTE_BAD_PHYS_ADDR;
}
-static int
+int
rte_eal_contigmem_init(void)
{
struct rte_mem_config *mcfg;
@@ -130,7 +130,7 @@ rte_eal_contigmem_init(void)
return 0;
}
-static int
+int
rte_eal_contigmem_attach(void)
{
const struct hugepage_info *hpi;
@@ -190,35 +190,3 @@ error:
return -1;
}
-
-static int
-rte_eal_memdevice_init(void)
-{
- struct rte_config *config;
-
- if (rte_eal_process_type() == RTE_PROC_SECONDARY)
- return 0;
-
- config = rte_eal_get_configuration();
- config->mem_config->nchannel = internal_config.force_nchannel;
- config->mem_config->nrank = internal_config.force_nrank;
-
- return 0;
-}
-
-/* init memory subsystem */
-int
-rte_eal_memory_init(void)
-{
- RTE_LOG(INFO, EAL, "Setting up physically contiguous memory...\n");
- const int retval = rte_eal_process_type() == RTE_PROC_PRIMARY ?
- rte_eal_contigmem_init() :
- rte_eal_contigmem_attach();
- if (retval < 0)
- return -1;
-
- if (internal_config.no_shconf == 0 && rte_eal_memdevice_init() < 0)
- return -1;
-
- return 0;
-}
diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
index 77830f8..da7aa98 100644
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -46,6 +46,7 @@
#include <rte_log.h>
#include "eal_private.h"
+#include "eal_internal_cfg.h"
/*
* Return a pointer to a read-only table of struct rte_physmem_desc
@@ -70,7 +71,7 @@ rte_eal_get_physmem_size(void)
/* get pointer to global configuration */
mcfg = rte_eal_get_configuration()->mem_config;
- for (i=0; i<RTE_MAX_MEMSEG; i++) {
+ for (i = 0; i < RTE_MAX_MEMSEG; i++) {
if (mcfg->memseg[i].addr == NULL)
break;
@@ -90,7 +91,7 @@ rte_dump_physmem_layout(FILE *f)
/* get pointer to global configuration */
mcfg = rte_eal_get_configuration()->mem_config;
- for (i=0; i<RTE_MAX_MEMSEG; i++) {
+ for (i = 0; i < RTE_MAX_MEMSEG; i++) {
if (mcfg->memseg[i].addr == NULL)
break;
@@ -119,3 +120,41 @@ unsigned rte_memory_get_nrank(void)
{
return rte_eal_get_configuration()->mem_config->nrank;
}
+
+static int
+rte_eal_memdevice_init(void)
+{
+ struct rte_config *config;
+
+ if (rte_eal_process_type() == RTE_PROC_SECONDARY)
+ return 0;
+
+ config = rte_eal_get_configuration();
+ config->mem_config->nchannel = internal_config.force_nchannel;
+ config->mem_config->nrank = internal_config.force_nrank;
+
+ return 0;
+}
+
+/* init memory subsystem */
+int
+rte_eal_memory_init(void)
+{
+ RTE_LOG(INFO, EAL, "Setting up physically contiguous memory...\n");
+ const int retval = rte_eal_process_type() == RTE_PROC_PRIMARY ?
+#ifdef RTE_EXEC_ENV_BSDAPP
+ rte_eal_contigmem_init() :
+ rte_eal_contigmem_attach();
+#else /* RTE_EXEC_ENV_BSDAPP */
+ rte_eal_hugepage_init() :
+ rte_eal_hugepage_attach();
+#endif /* RTE_EXEC_ENV_BSDAPP */
+
+ if (retval < 0)
+ return -1;
+
+ if (internal_config.no_shconf == 0 && rte_eal_memdevice_init() < 0)
+ return -1;
+
+ return 0;
+}
diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h
index 19af23d..16338a2 100644
--- a/lib/librte_eal/common/eal_private.h
+++ b/lib/librte_eal/common/eal_private.h
@@ -286,6 +286,20 @@ int get_ncpus(void);
*/
int set_tsc_freq_from_sysctl(void);
+/**
+ * This function prepares physical memory mapping
+ *
+ * This function is private to the EAL.
+ */
+int rte_eal_contigmem_init(void);
+
+/**
+ * This function creates memory mapping in secondary
+ *
+ * This function is private to the EAL.
+ */
+int rte_eal_contigmem_attach(void);
+
#else /* RTE_EXEC_ENV_BSDAPP */
/**
* This function check if cpu is present
@@ -301,6 +315,20 @@ int cpu_detected(unsigned lcore_id);
*/
int set_tsc_freq_from_clock(void);
+/**
+ * This function prepares physical memory mapping
+ *
+ * This function is private to the EAL.
+ */
+int rte_eal_hugepage_init(void);
+
+/**
+ * This function creates memory mapping in secondary
+ *
+ * This function is private to the EAL.
+ */
+int rte_eal_hugepage_attach(void);
+
#endif /* RTE_EXEC_ENV_BSDAPP */
#endif /* _EAL_PRIVATE_H_ */
diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index bae2507..f4d91df 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -1031,7 +1031,7 @@ calc_num_pages_per_socket(uint64_t * memory,
* 6. unmap the first mapping
* 7. fill memsegs in configuration with contiguous zones
*/
-static int
+int
rte_eal_hugepage_init(void)
{
struct rte_mem_config *mcfg;
@@ -1369,7 +1369,7 @@ getFileSize(int fd)
* configuration and finds the hugepages which form that segment, mapping them
* in order to form a contiguous block in the virtual memory space
*/
-static int
+int
rte_eal_hugepage_attach(void)
{
const struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
@@ -1530,35 +1530,3 @@ error:
return -1;
}
-static int
-rte_eal_memdevice_init(void)
-{
- struct rte_config *config;
-
- if (rte_eal_process_type() == RTE_PROC_SECONDARY)
- return 0;
-
- config = rte_eal_get_configuration();
- config->mem_config->nchannel = internal_config.force_nchannel;
- config->mem_config->nrank = internal_config.force_nrank;
-
- return 0;
-}
-
-
-/* init memory subsystem */
-int
-rte_eal_memory_init(void)
-{
- RTE_LOG(INFO, EAL, "Setting up memory...\n");
- const int retval = rte_eal_process_type() == RTE_PROC_PRIMARY ?
- rte_eal_hugepage_init() :
- rte_eal_hugepage_attach();
- if (retval < 0)
- return -1;
-
- if (internal_config.no_shconf == 0 && rte_eal_memdevice_init() < 0)
- return -1;
-
- return 0;
-}
--
1.9.1