From patchwork Tue Jan 6 17:26:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ravi Kerur X-Patchwork-Id: 2208 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id CF8475A74; Tue, 6 Jan 2015 18:27:27 +0100 (CET) Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) by dpdk.org (Postfix) with ESMTP id 6C0635A42 for ; Tue, 6 Jan 2015 18:27:19 +0100 (CET) Received: by mail-pa0-f50.google.com with SMTP id bj1so31410694pad.37 for ; Tue, 06 Jan 2015 09:27:18 -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=cmip5T6D/Dahb4VX3MGTS2pSkaWN/jJONvzWR2lnNn0=; b=gdlZOxhvLKZ+7oIuiOdfOS3yzH4mOm3y0jLYegxnyCsitLbS6c8PokJlVD08gkXbRH XuOe+wfSarfVAURdH54gJiCNsLETy2l3327crC41xSiZ8w6//ox2MdqbdaXC6xK7V5W3 n3eje3bISEXulbzCHd4rwrtViaVjUUDMk76PWGHBvKElk7w6B0FWIO5ihBTh2wDFLnLa lprVLuasoqvuvG50BhkXUbZwwa+OhklkzZ6nH9kRxuk26fGSd4KNewpTClKID4ePpVqf 5WTnMspbJkOI2xYdmk3rc+ugBXeRxYgPKpOrn92cKRczM0UM5GSrhEFq1LqPRyZ0JlDW FjLw== X-Received: by 10.68.69.109 with SMTP id d13mr157836887pbu.57.1420565238608; Tue, 06 Jan 2015 09:27:18 -0800 (PST) Received: from iaas-l305162.englab.brocade.com ([144.49.130.148]) by mx.google.com with ESMTPSA id nl14sm46887340pdb.81.2015.01.06.09.27.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Jan 2015 09:27:18 -0800 (PST) From: Ravi Kerur To: dev@dpdk.org Date: Tue, 6 Jan 2015 12:26:52 -0500 Message-Id: <1420565213-17429-6-git-send-email-rkerur@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1420565213-17429-1-git-send-email-rkerur@gmail.com> References: <1420565170-17365-1-git-send-email-rkerur@gmail.com> <1420565213-17429-1-git-send-email-rkerur@gmail.com> Subject: [dpdk-dev] [PATCH v4 6/7] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Changes in v4 Make rte_eal_hugepage_init and rte_eal_hugepage_attach as wrapper functions for BSD. Changes in v3 Changed subject to be more explicit on file name inclusion. 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 --- lib/librte_eal/bsdapp/eal/eal_memory.c | 47 +++++++++++-------------------- lib/librte_eal/common/eal_common_memory.c | 38 +++++++++++++++++++++++-- lib/librte_eal/common/eal_private.h | 22 +++++++++++++++ lib/librte_eal/linuxapp/eal/eal_memory.c | 36 ++--------------------- 4 files changed, 76 insertions(+), 67 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c index 65ee87d..7a7d9d7 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 +static inline int rte_eal_contigmem_init(void) { struct rte_mem_config *mcfg; @@ -130,7 +130,16 @@ rte_eal_contigmem_init(void) return 0; } -static int +/* + * Wrapper function to initialize contigmem. + */ +int +rte_eal_hugepage_init(void) +{ + return rte_eal_contigmem_init(); +} + +static inline int rte_eal_contigmem_attach(void) { const struct hugepage_info *hpi; @@ -190,35 +199,11 @@ 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 */ +/* + * Wrapper function to attach contigmem. + */ int -rte_eal_memory_init(void) +rte_eal_hugepage_attach(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; + return rte_eal_contigmem_attach(); } 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 #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; imemseg[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; imemseg[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 f907e79..71ba5fd 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -326,4 +326,26 @@ int set_tsc_freq_from_clock(void); */ void rte_set_tsc_hz(uint64_t tsc_hz); +/** + * This function prepares physical memory mapping + * i.e. hugepages on Linux and + * contigmem on BSD. + * It is a wrapper function for BSD which will + * internally call contigmem_init. + * + * 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. + * It is a wrapper function for BSD which will + * internally call contigmem_attach. + * + * This function is private to the EAL. + */ +int rte_eal_hugepage_attach(void); + #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; -}