From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D2128A0613 for ; Wed, 25 Sep 2019 18:10:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C7A11BE51; Wed, 25 Sep 2019 18:10:19 +0200 (CEST) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by dpdk.org (Postfix) with ESMTP id 351151BE3D for ; Wed, 25 Sep 2019 18:10:18 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id w10so32279pgj.7 for ; Wed, 25 Sep 2019 09:10:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kRJjoZ6w9zkVXMYffWjTcg7lZXj9gaYrCVD8rNgcd3I=; b=alcMRceL4NVk5m3ucvd1rsdtFB5BRYVpUqfEbFuzjNEpzOFJuFpr5y4qv5VE2NL//c oGCqghMtpzdX+Jo1mrjyaWISLjuoAZ5VFlvlO+vuCxUtmBi3upUpWavB1AEMqObJvNYJ NlOStxKrdZuwzhnQ9sWQcnnJRMsj1VP49aMvAKaIw+HfilzAkvAZQKoyV6TZsUJkYdQm pdyKkVk40MZl4x9n/P3pXpF2dgQlitVqUE10KmjEzyPEtnYLlVZulT3OFHLXoTWl5xeI hajOatGP38QRA1ZhYz6Fpv12Lem/LDzjATGPdV17sJB+r9+m29H2pnzw3WGxdWIr8MVN RGOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kRJjoZ6w9zkVXMYffWjTcg7lZXj9gaYrCVD8rNgcd3I=; b=eFddO81X4XuxI/RAxDEnRiOouDLa/UcOH29/ud3oL5G1UdXeSMwV9Q04Q3cqFcPvpF ndAR0g1ZG0ZQaOtIZkEWfuRL3AIBd735bqqRz5PtOhdAmN9YmuqchtSo6CL+KlZ5HI+h XItPVPgvEmm1vB8Z56NJOKXIuYsfSFhd2WTRZrTvfJWmBO8OYCWqw82cokSr5OhwvdTo fZxoCo8PuFxuaczg/PFYdtfem82YgEP+1cZi50EKuDd5KUlUzBx8ykTEllGKGwZqwYvd xGXDGLKXWf/9KuHcyVFwHxzfnm8gkUQsZBXtpiRFD0xaNjkAnOOeErK6GLmDTK/w1TYP 5xjQ== X-Gm-Message-State: APjAAAXm2eX1AGWME/R2FpfeDLvbcGsj1t6viY1jGf6C0TDCcMUqffmq NAmu/+/Nk4TR6Jl+5T/jWubklwPc/xI= X-Google-Smtp-Source: APXvYqwNRw8mNgAJCTR1sxe3Z/iWgwnOwM9hMBbeIIgPGAeJBY3SlU+Zx/y/+8a9aVHqZAUmmgm0zQ== X-Received: by 2002:a62:7911:: with SMTP id u17mr11118114pfc.162.1569427816995; Wed, 25 Sep 2019 09:10:16 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id d10sm7670200pfh.8.2019.09.25.09.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 09:10:15 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 25 Sep 2019 09:10:13 -0700 Message-Id: <20190925161013.3656-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v7] eal: make lcore_config private X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The internal structure of lcore_config is no longer be part of visible API/ABI. Make it private to EAL. Rearrange and resize the fields in the structure so it takes less memory (and cache footprint). Signed-off-by: Stephen Hemminger --- v7 - add eal_private.h to windows lib/librte_eal/common/eal_common_launch.c | 2 ++ lib/librte_eal/common/eal_private.h | 22 +++++++++++++++++++++ lib/librte_eal/common/include/rte_lcore.h | 24 ----------------------- lib/librte_eal/common/rte_service.c | 2 ++ lib/librte_eal/rte_eal_version.map | 1 - lib/librte_eal/windows/eal/eal_thread.c | 1 + 6 files changed, 27 insertions(+), 25 deletions(-) diff --git a/lib/librte_eal/common/eal_common_launch.c b/lib/librte_eal/common/eal_common_launch.c index fe0ba3f0d617..cf52d717f68e 100644 --- a/lib/librte_eal/common/eal_common_launch.c +++ b/lib/librte_eal/common/eal_common_launch.c @@ -15,6 +15,8 @@ #include #include +#include "eal_private.h" + /* * Wait until a lcore finished its job. */ diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index 798ede553b21..25e80547904f 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -10,6 +10,28 @@ #include #include +#include + +/** + * Structure storing internal configuration (per-lcore) + */ +struct lcore_config { + uint32_t core_id; /**< core number on socket for this lcore */ + uint32_t core_index; /**< relative index, starting from 0 */ + uint16_t socket_id; /**< physical socket id for this lcore */ + uint8_t core_role; /**< role of core eg: OFF, RTE, SERVICE */ + uint8_t detected; /**< true if lcore was detected */ + volatile enum rte_lcore_state_t state; /**< lcore state */ + rte_cpuset_t cpuset; /**< cpu set which the lcore affinity to */ + pthread_t thread_id; /**< pthread identifier */ + int pipe_master2slave[2]; /**< communication pipe with master */ + int pipe_slave2master[2]; /**< communication pipe with master */ + lcore_function_t * volatile f; /**< function to call */ + void * volatile arg; /**< argument of function */ + volatile int ret; /**< return value of function */ +}; + +extern struct lcore_config lcore_config[RTE_MAX_LCORE]; /** * Initialize the memzone subsystem (private to eal). diff --git a/lib/librte_eal/common/include/rte_lcore.h b/lib/librte_eal/common/include/rte_lcore.h index c86f72eb12a8..0c683919564e 100644 --- a/lib/librte_eal/common/include/rte_lcore.h +++ b/lib/librte_eal/common/include/rte_lcore.h @@ -66,30 +66,6 @@ typedef cpuset_t rte_cpuset_t; } while (0) #endif -/** - * Structure storing internal configuration (per-lcore) - */ -struct lcore_config { - unsigned detected; /**< true if lcore was detected */ - pthread_t thread_id; /**< pthread identifier */ - int pipe_master2slave[2]; /**< communication pipe with master */ - int pipe_slave2master[2]; /**< communication pipe with master */ - lcore_function_t * volatile f; /**< function to call */ - void * volatile arg; /**< argument of function */ - volatile int ret; /**< return value of function */ - volatile enum rte_lcore_state_t state; /**< lcore state */ - unsigned socket_id; /**< physical socket id for this lcore */ - unsigned core_id; /**< core number on socket for this lcore */ - int core_index; /**< relative index, starting from 0 */ - rte_cpuset_t cpuset; /**< cpu set which the lcore affinity to */ - uint8_t core_role; /**< role of core eg: OFF, RTE, SERVICE */ -}; - -/** - * Internal configuration (per-lcore) - */ -extern struct lcore_config lcore_config[RTE_MAX_LCORE]; - RTE_DECLARE_PER_LCORE(unsigned, _lcore_id); /**< Per thread "lcore id". */ RTE_DECLARE_PER_LCORE(rte_cpuset_t, _cpuset); /**< Per thread "cpuset". */ diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c index c3653ebae46c..6e21f549051b 100644 --- a/lib/librte_eal/common/rte_service.c +++ b/lib/librte_eal/common/rte_service.c @@ -21,6 +21,8 @@ #include #include +#include "eal_private.h" + #define RTE_SERVICE_NUM_MAX 64 #define SERVICE_F_REGISTERED (1 << 0) diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index 7cbf82d37b0a..aeedf397764f 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -4,7 +4,6 @@ DPDK_2.0 { __rte_panic; eal_parse_sysfs_value; eal_timer_source; - lcore_config; per_lcore__lcore_id; per_lcore__rte_errno; rte_calloc; diff --git a/lib/librte_eal/windows/eal/eal_thread.c b/lib/librte_eal/windows/eal/eal_thread.c index 906502f90982..0591d4c7fb06 100644 --- a/lib/librte_eal/windows/eal/eal_thread.c +++ b/lib/librte_eal/windows/eal/eal_thread.c @@ -12,6 +12,7 @@ #include #include +#include "eal_private.h" RTE_DEFINE_PER_LCORE(unsigned int, _lcore_id) = LCORE_ID_ANY; -- 2.20.1