From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <rkerur@gmail.com>
Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com
[209.85.192.178]) by dpdk.org (Postfix) with ESMTP id 7E2245A26
for <dev@dpdk.org>; Tue, 30 Dec 2014 17:37:45 +0100 (CET)
Received: by mail-pd0-f178.google.com with SMTP id r10so19420392pdi.37
for <dev@dpdk.org>; Tue, 30 Dec 2014 08:37:44 -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=xoYnGZ1iuKVB5PXB3i6fk2V8tFQu2bsjTqWg+iV/zug=;
b=lPGImMUh+jsh4H3FqkDvTwQI+pOJ6VgCRCgbsNp/U4ebNWFu/AGvoj7r1XFg5dd/57
wVOrj1yQ572iqXQlV/8n0ZipgD0Nxt2UYVzU1Q3R9OPNTMJ13J/GxOPnIKL74KfHTA3w
x+SlMufULMPER8bStmrYxD4BuDm6u0IQuhTd36pTTUFyP/qfi4ifwVrKTMCY9KUcgX8Z
rEq2Gzv1kBkOCANNQmAZ3eowWCUEtDLhFQtVcBHMg0mvt6Olb+nk8ef6nE642RCwtM4h
DouYA38M99F4AuvBoWZrPyvqPUBK/v0g7OJarJIt48lNa+p+sArJ7qLX1Kz4QNqc4Owp
35qw==
X-Received: by 10.70.90.39 with SMTP id bt7mr98604607pdb.52.1419957464880;
Tue, 30 Dec 2014 08:37:44 -0800 (PST)
Received: from iaas-l305162.englab.brocade.com ([144.49.130.148])
by mx.google.com with ESMTPSA id pb6sm38901162pbb.13.2014.12.30.08.37.44
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Tue, 30 Dec 2014 08:37:44 -0800 (PST)
From: Ravi Kerur <rkerur@gmail.com>
To: dev@dpdk.org
Date: Tue, 30 Dec 2014 11:37:20 -0500
Message-Id: <1419957440-11767-6-git-send-email-rkerur@gmail.com>
X-Mailer: git-send-email 1.9.1
In-Reply-To: <1419957440-11767-1-git-send-email-rkerur@gmail.com>
References: <1419957384-11693-1-git-send-email-rkerur@gmail.com>
<1419957440-11767-1-git-send-email-rkerur@gmail.com>
Subject: [dpdk-dev] [PATCH v3 6/6] Move common functions in eal_memory.c
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: Tue, 30 Dec 2014 16:37:46 -0000
Changes in v3
Changed subject line to explicitly include file name
Commit log includes function names moved to common directory.
Changes in v2
Use common function names rte_eal_hugepage_init and
rte_eal_hugepage_attach for BSD and Linux.
Update comments about its actuality in function declaration.
Changes in v1
Move common functions in eal_memory.c to librte_eal/common/
eal_common_memory.c file.
Following functions are moved to eal_common_memory.c file
static int rte_eal_memdevice_init(void);
int rte_eal_memory_init(void);
Fix checkpatch warnings and errors.
Signed-off-by: Ravi Kerur <rkerur@gmail.com>
---
lib/librte_eal/bsdapp/eal/eal_memory.c | 40 ++++---------------------------
lib/librte_eal/common/eal_common_memory.c | 38 +++++++++++++++++++++++++++--
lib/librte_eal/common/eal_private.h | 18 ++++++++++++++
lib/librte_eal/linuxapp/eal/eal_memory.c | 36 ++--------------------------
4 files changed, 60 insertions(+), 72 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c
index 65ee87d..0b62d6d 100644
--- a/lib/librte_eal/bsdapp/eal/eal_memory.c
+++ b/lib/librte_eal/bsdapp/eal/eal_memory.c
@@ -59,8 +59,8 @@ rte_mem_virt2phy(const void *virtaddr)
return RTE_BAD_PHYS_ADDR;
}
-static int
-rte_eal_contigmem_init(void)
+int
+rte_eal_hugepage_init(void)
{
struct rte_mem_config *mcfg;
uint64_t total_mem = 0;
@@ -130,8 +130,8 @@ rte_eal_contigmem_init(void)
return 0;
}
-static int
-rte_eal_contigmem_attach(void)
+int
+rte_eal_hugepage_attach(void)
{
const struct hugepage_info *hpi;
int fd_hugepage_info, fd_hugepage = -1;
@@ -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..cb27930 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,36 @@ 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 ?
+ 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;
+}
diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h
index 98a08f0..82a724d 100644
--- a/lib/librte_eal/common/eal_private.h
+++ b/lib/librte_eal/common/eal_private.h
@@ -279,6 +279,24 @@ void set_tsc_freq(void);
*/
int set_tsc_freq_from_sysctl(void);
+/**
+ * This function prepares physical memory mapping
+ * i.e. hugepages on Linux and
+ * contigmem on BSD.
+ *
+ * This function is private to the EAL.
+ */
+int rte_eal_hugepage_init(void);
+
+/**
+ * This function creates memory mapping in secondary
+ * i.e. hugepages on Linux and
+ * contigmem on BSD.
+ *
+ * This function is private to the EAL.
+ */
+int rte_eal_hugepage_attach(void);
+
#ifdef RTE_EXEC_ENV_BSDAPP
/**
* This function gets no. of cpus
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