From patchwork Tue Sep 24 17:39:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 59686 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 947D02C16; Tue, 24 Sep 2019 19:40:01 +0200 (CEST) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by dpdk.org (Postfix) with ESMTP id 9AE772C12 for ; Tue, 24 Sep 2019 19:39:59 +0200 (CEST) Received: by mail-pf1-f196.google.com with SMTP id q12so1777234pff.9 for ; Tue, 24 Sep 2019 10:39:59 -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=vp1hd10LyJ8ffkYDNnTm0cNEzSb5tqYKs6+hRGVpl8M=; b=ybii5ZPi/HqQYKe1gnxa3hgW6gIUDEIYthbp/eEu9T+w5yMtWrw7+ci7K6RFRYPJNy Alont94dDSjAYaDjLuBbYSDZPyc/I1bDdrKXyI0CFuHV1kCWIVHWP2Z9/XXuNKBlOaLU ycYtrrE6xjiwO9XPj44kRZftTRLVLrggU2OUGoIN/bP3GMhw6kI3ePntCJVcnk0SbWtD il1nsH4+Pn3EMYjfa29s7mPi/6hMAklRKXJRwM250pcwZUplyHtbmZD5ULFgTHsBQZ6O VRtNa5k1xSwHfqOh9deDTxf6mvguGIlhnXb+UddBmFbPCL10zRuLUpKpMfx52gi/IkXM 7XXw== 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=vp1hd10LyJ8ffkYDNnTm0cNEzSb5tqYKs6+hRGVpl8M=; b=E9pA/+lttKyTIqIqf5CNsYIE2VPa2yLv4rNZIJrxwluTz/NI13eFW1lNImAxR19xMz tXNAm+mwx7xeTshYivU5tdLSkihW/LJEiCZ7UIfTsaUgfr4o+OXDm2eyes93Fh641ZFF tlOmFeTlfIPJq/F9f3y9uuMdNs1KsA7uNC9rw3RJCfcRRxo3zVHDlfD61POzpzPsV8G8 PmdkbUu6bD+lNSng6TNteZR8knjACpiGHlFw8FlIcL3JaV9gWHesT0IhOgHvzoWgf1j6 mZP1s/Cua4laifeMR6THRXznIUYqIa7DeGng2/x/Oh1WaohycoO0IHQFLgh9iO/Hzv7T WU+A== X-Gm-Message-State: APjAAAU1WKhPaN4yRlHBEQfFPw9c6q9LXTA7NKnV5BBC31KF+fyhF3a2 LeZRTDP1Q2o/N+tiReYMKjURKn0aKlk= X-Google-Smtp-Source: APXvYqywckOlzkhkYprilOsmcsQjda9OitxSYAvgovSs91WevHFPeCd5OYhMYzqdPS8Q90KxZ9TVXQ== X-Received: by 2002:a17:90a:8c14:: with SMTP id a20mr1320780pjo.45.1569346798210; Tue, 24 Sep 2019 10:39:58 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id i74sm4671714pfe.28.2019.09.24.10.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 10:39:56 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 24 Sep 2019 10:39:53 -0700 Message-Id: <20190924173953.25644-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6] 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 --- v6 - rebase for 19.11 follows my earlier efforts at hiding lcore_config which were then taken up by David Marchand. 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 - 5 files changed, 26 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;