From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com [209.85.192.178]) by dpdk.org (Postfix) with ESMTP id 03E495A08 for ; Tue, 30 Dec 2014 17:37:44 +0100 (CET) Received: by mail-pd0-f178.google.com with SMTP id r10so19329130pdi.23 for ; Tue, 30 Dec 2014 08:37:43 -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=Gtd32KhJIvoGmdEEmQ6nOE4iRt3AvIfnv2CKF0UmJ28=; b=yuHK8toGHaWTRZHY/jlK+ZJSDdmDTNIThKQ0Sg3l2A/De57QF4NG5qHZAXmaRVUNGV DcmK9SxqorUs6hh9XdrqK7ku06e67ovP6Fa/9BHBxAJYs+sjeGnMrMeyPlTEcS6zbxJd xMKpUkzTm3w0EX68FKf2f596lCjh22DBZgMiqlx/kknFGtvK+3YYJ6cF/8G6JU+Rlcro kTJBidXxObaG+K3ujJPdZ0kB3loIREvRgq/+Cb24/yEwNZFCXvm/7CstnQAlX1gy+ePZ YF8WVQQXX0DL0wK96UhboHn5eOAoQD/Mp/nEYpxBN/aMXk1Y7azDluJesfDdMZ5Z80tB 4BUg== X-Received: by 10.70.128.173 with SMTP id np13mr99108439pdb.15.1419957463435; Tue, 30 Dec 2014 08:37:43 -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.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Dec 2014 08:37:42 -0800 (PST) From: Ravi Kerur To: dev@dpdk.org Date: Tue, 30 Dec 2014 11:37:18 -0500 Message-Id: <1419957440-11767-4-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 4/6] Move common functions in eal_lcore.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: , X-List-Received-Date: Tue, 30 Dec 2014 16:37:45 -0000 Changes in v3 Changed subject line to explicitly include file name Commit log includes function names moved to common directory. Changes in v2 None Changes in v1 Move common function in eal_lcore.c to librte_eal/common/ eal_common_lcore.c file. Following function is moved to eal_common_lcore.c file int rte_eal_cpu_init(void); Use RTE_EXEC_ENV_BSDAPP to differentiate minor differences in common function. Makefile changes to reflect new file added. Fix checkpatch warnings and errors. Signed-off-by: Ravi Kerur --- lib/librte_eal/bsdapp/eal/Makefile | 1 + lib/librte_eal/bsdapp/eal/eal_lcore.c | 62 ++++-------------- lib/librte_eal/common/eal_common_lcore.c | 106 +++++++++++++++++++++++++++++++ lib/librte_eal/common/eal_private.h | 32 ++++++++++ lib/librte_eal/linuxapp/eal/Makefile | 1 + lib/librte_eal/linuxapp/eal/eal_lcore.c | 55 +--------------- 6 files changed, 155 insertions(+), 102 deletions(-) create mode 100644 lib/librte_eal/common/eal_common_lcore.c diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index 050d70b..560b7a3 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -74,6 +74,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_dev.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_options.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_debug.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_thread.c +SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_lcore.c CFLAGS_eal.o := -D_GNU_SOURCE #CFLAGS_eal_common_thread.o := -D_GNU_SOURCE diff --git a/lib/librte_eal/bsdapp/eal/eal_lcore.c b/lib/librte_eal/bsdapp/eal/eal_lcore.c index 662f024..874fd88 100644 --- a/lib/librte_eal/bsdapp/eal/eal_lcore.c +++ b/lib/librte_eal/bsdapp/eal/eal_lcore.c @@ -43,10 +43,19 @@ #include "eal_private.h" /* No topology information available on FreeBSD including NUMA info */ -#define cpu_core_id(X) 0 -#define cpu_socket_id(X) 0 +unsigned +cpu_core_id(__attribute__((unused)) unsigned lcore_id) +{ + return 0; +} + +unsigned +cpu_socket_id(__attribute__((unused)) unsigned lcore_id) +{ + return 0; +} -static int +int get_ncpus(void) { int mib[2] = {CTL_HW, HW_NCPU}; @@ -58,50 +67,3 @@ get_ncpus(void) return ncpu; } -/* - * fill the cpu_info structure with as much info as we can get. - * code is similar to linux version, but sadly available info is less. - */ -int -rte_eal_cpu_init(void) -{ - /* pointer to global configuration */ - struct rte_config *config = rte_eal_get_configuration(); - unsigned lcore_id; - unsigned count = 0; - - const unsigned ncpus = get_ncpus(); - /* - * Parse the maximum set of logical cores, detect the subset of running - * ones and enable them by default. - */ - for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { - lcore_config[lcore_id].detected = (lcore_id < ncpus); - if (lcore_config[lcore_id].detected == 0) { - config->lcore_role[lcore_id] = ROLE_OFF; - continue; - } - /* By default, each detected core is enabled */ - config->lcore_role[lcore_id] = ROLE_RTE; - lcore_config[lcore_id].core_id = cpu_core_id(lcore_id); - lcore_config[lcore_id].socket_id = cpu_socket_id(lcore_id); - if (lcore_config[lcore_id].socket_id >= RTE_MAX_NUMA_NODES) -#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID - lcore_config[lcore_id].socket_id = 0; -#else - rte_panic("Socket ID (%u) is greater than " - "RTE_MAX_NUMA_NODES (%d)\n", - lcore_config[lcore_id].socket_id, RTE_MAX_NUMA_NODES); -#endif - RTE_LOG(DEBUG, EAL, "Detected lcore %u\n", - lcore_id); - count++; - } - /* Set the count of enabled logical cores of the EAL configuration */ - config->lcore_count = count; - RTE_LOG(DEBUG, EAL, "Support maximum %u logical core(s) by configuration.\n", - RTE_MAX_LCORE); - RTE_LOG(DEBUG, EAL, "Detected %u lcore(s)\n", config->lcore_count); - - return 0; -} diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/librte_eal/common/eal_common_lcore.c new file mode 100644 index 0000000..af19d00 --- /dev/null +++ b/lib/librte_eal/common/eal_common_lcore.c @@ -0,0 +1,106 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +#include +#include +#include +#include +#include + +#include "eal_private.h" + +/* + * fill the cpu_info structure with as much info as we can get. + * code is similar to linux version, but sadly available info is less. + */ +int +rte_eal_cpu_init(void) +{ + /* pointer to global configuration */ + struct rte_config *config = rte_eal_get_configuration(); + unsigned lcore_id; + unsigned count = 0; + + /* + * Parse the maximum set of logical cores, detect the subset of running + * ones and enable them by default. + */ + for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { +#ifdef RTE_EXEC_ENV_BSDAPP + const unsigned ncpus = get_ncpus(); + + lcore_config[lcore_id].detected = (lcore_id < ncpus); +#else /* RTE_EXEC_ENV_BSDAPP */ + lcore_config[lcore_id].detected = cpu_detected(lcore_id); +#endif /* RTE_EXEC_ENV_BSDAPP */ + if (lcore_config[lcore_id].detected == 0) { + config->lcore_role[lcore_id] = ROLE_OFF; + continue; + } + /* By default, each detected core is enabled */ + config->lcore_role[lcore_id] = ROLE_RTE; + lcore_config[lcore_id].core_id = cpu_core_id(lcore_id); + lcore_config[lcore_id].socket_id = cpu_socket_id(lcore_id); + if (lcore_config[lcore_id].socket_id >= RTE_MAX_NUMA_NODES) +#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID + lcore_config[lcore_id].socket_id = 0; +#else + rte_panic("Socket ID (%u) is greater than " + "RTE_MAX_NUMA_NODES (%d)\n", + lcore_config[lcore_id].socket_id, + RTE_MAX_NUMA_NODES); +#endif + +#ifdef RTE_EXEC_ENV_BSDAPP + RTE_LOG(DEBUG, EAL, "Detected lcore %u\n", + lcore_id); +#else /* RTE_EXEC_ENV_BSDAPP */ + RTE_LOG(DEBUG, EAL, "Detected lcore %u as " + "core %u on socket %u\n", + lcore_id, lcore_config[lcore_id].core_id, + lcore_config[lcore_id].socket_id); +#endif /* RTE_EXEC_ENV_BSDAPP */ + count++; + } + /* Set the count of enabled logical cores of the EAL configuration */ + config->lcore_count = count; + RTE_LOG(DEBUG, EAL, + "Support maximum %u logical core(s) by configuration.\n", + RTE_MAX_LCORE); + RTE_LOG(DEBUG, EAL, "Detected %u lcore(s)\n", config->lcore_count); + + return 0; +} diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index b1d68bc..9fe91b3 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -250,4 +250,36 @@ void rte_eal_config_attach(void); */ void rte_eal_config_reattach(void); +/** + * This function gets cpu socket_id + * + * This function is private to the EAL. + */ +unsigned cpu_socket_id(unsigned lcore_id); + +/** + * This function gets cpu core_id + * + * This function is private to the EAL. + */ +unsigned cpu_core_id(unsigned lcore_id); + +#ifdef RTE_EXEC_ENV_BSDAPP +/** + * This function gets no. of cpus + * + * This function is private to the EAL. + */ +int get_ncpus(void); + +#else /* RTE_EXEC_ENV_BSDAPP */ +/** + * This function check if cpu is present + * + * This function is private to the EAL. + */ +int cpu_detected(unsigned lcore_id); + +#endif /* RTE_EXEC_ENV_BSDAPP */ + #endif /* _EAL_PRIVATE_H_ */ diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index 60cc448..ff185fd 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -86,6 +86,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_dev.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_options.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_debug.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_thread.c +SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_lcore.c CFLAGS_eal.o := -D_GNU_SOURCE CFLAGS_eal_common_thread.o := -D_GNU_SOURCE diff --git a/lib/librte_eal/linuxapp/eal/eal_lcore.c b/lib/librte_eal/linuxapp/eal/eal_lcore.c index c67e0e6..4fe2a53 100644 --- a/lib/librte_eal/linuxapp/eal/eal_lcore.c +++ b/lib/librte_eal/linuxapp/eal/eal_lcore.c @@ -51,7 +51,7 @@ #define PHYS_PKG_FILE "topology/physical_package_id" /* Check if a cpu is present by the presence of the cpu information for it */ -static int +int cpu_detected(unsigned lcore_id) { char path[PATH_MAX]; @@ -71,7 +71,7 @@ cpu_detected(unsigned lcore_id) * Note: physical package id != NUMA node, but we use it as a * fallback for kernels which don't create a nodeY link */ -static unsigned +unsigned cpu_socket_id(unsigned lcore_id) { const char node_prefix[] = "node"; @@ -121,7 +121,7 @@ err: } /* Get the cpu core id value from the /sys/.../cpuX core_id value */ -static unsigned +unsigned cpu_core_id(unsigned lcore_id) { char path[PATH_MAX]; @@ -140,52 +140,3 @@ err: return 0; } -/* - * Parse /sys/devices/system/cpu to get the number of physical and logical - * processors on the machine. The function will fill the cpu_info - * structure. - */ -int -rte_eal_cpu_init(void) -{ - /* pointer to global configuration */ - struct rte_config *config = rte_eal_get_configuration(); - unsigned lcore_id; - unsigned count = 0; - - /* - * Parse the maximum set of logical cores, detect the subset of running - * ones and enable them by default. - */ - for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { - lcore_config[lcore_id].detected = cpu_detected(lcore_id); - if (lcore_config[lcore_id].detected == 0) { - config->lcore_role[lcore_id] = ROLE_OFF; - continue; - } - /* By default, each detected core is enabled */ - config->lcore_role[lcore_id] = ROLE_RTE; - lcore_config[lcore_id].core_id = cpu_core_id(lcore_id); - lcore_config[lcore_id].socket_id = cpu_socket_id(lcore_id); - if (lcore_config[lcore_id].socket_id >= RTE_MAX_NUMA_NODES) -#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID - lcore_config[lcore_id].socket_id = 0; -#else - rte_panic("Socket ID (%u) is greater than " - "RTE_MAX_NUMA_NODES (%d)\n", - lcore_config[lcore_id].socket_id, RTE_MAX_NUMA_NODES); -#endif - RTE_LOG(DEBUG, EAL, "Detected lcore %u as core %u on socket %u\n", - lcore_id, - lcore_config[lcore_id].core_id, - lcore_config[lcore_id].socket_id); - count ++; - } - /* Set the count of enabled logical cores of the EAL configuration */ - config->lcore_count = count; - RTE_LOG(DEBUG, EAL, "Support maximum %u logical core(s) by configuration.\n", - RTE_MAX_LCORE); - RTE_LOG(DEBUG, EAL, "Detected %u lcore(s)\n", config->lcore_count); - - return 0; -} -- 1.9.1