From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Blunck Subject: [PATCH 1/7] eal: use different constructor priorities for initcalls Date: Wed, 15 Feb 2017 11:02:03 +0100 Message-ID: <1487152929-23627-2-git-send-email-jblunck@infradead.org> References: <1487152929-23627-1-git-send-email-jblunck@infradead.org> Cc: shreyansh.jain@nxp.com To: dev@dpdk.org Return-path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id A23F32BA4 for ; Wed, 15 Feb 2017 11:02:23 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id v77so7323671wmv.0 for ; Wed, 15 Feb 2017 02:02:23 -0800 (PST) In-Reply-To: <1487152929-23627-1-git-send-email-jblunck@infradead.org> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This introduces different initcall macros to allow for late registration of the virtual device bus. Signed-off-by: Jan Blunck --- lib/librte_eal/common/include/rte_bus.h | 17 ++++++++++++++++- lib/librte_eal/common/include/rte_eal.h | 12 ++++++++++-- lib/librte_eal/common/include/rte_tailq.h | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h index 7c36969..9f161f2 100644 --- a/lib/librte_eal/common/include/rte_bus.h +++ b/lib/librte_eal/common/include/rte_bus.h @@ -50,6 +50,7 @@ extern "C" { #include #include +#include #include #include @@ -145,7 +146,21 @@ void rte_bus_dump(FILE *f); * The constructor has higher priority than PMD constructors. */ #define RTE_REGISTER_BUS(nm, bus) \ -static void __attribute__((constructor(101), used)) businitfn_ ##nm(void) \ +RTE_EAL_INIT(businitfn_ ##nm); \ +static void businitfn_ ##nm(void) \ +{\ + (bus).name = RTE_STR(nm);\ + rte_bus_register(&bus); \ +} + +/** + * Helper for late Bus registration. + * The constructor still has higher priority than PMD constructors but has + * lower priority than RTE_REGISTER_BUS. + */ +#define RTE_REGISTER_BUS_LATE(nm, bus) \ +RTE_POST_EAL_INIT(businitfn_ ##nm); \ +static void businitfn_ ##nm(void) \ {\ (bus).name = RTE_STR(nm);\ rte_bus_register(&bus); \ diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h index 03fee50..3a6bd71 100644 --- a/lib/librte_eal/common/include/rte_eal.h +++ b/lib/librte_eal/common/include/rte_eal.h @@ -258,8 +258,16 @@ static inline int rte_gettid(void) return RTE_PER_LCORE(_thread_id); } -#define RTE_INIT(func) \ -static void __attribute__((constructor, used)) func(void) +#define RTE_EAL_INIT(func) \ +static void __attribute__((constructor(101), used)) func(void) + +#define RTE_POST_EAL_INIT(func) \ +static void __attribute__((constructor(102), used)) func(void) + +#define RTE_DEV_INIT(func) \ +static void __attribute__((constructor(103), used)) func(void) + +#define RTE_INIT(func) RTE_DEV_INIT(func) #ifdef __cplusplus } diff --git a/lib/librte_eal/common/include/rte_tailq.h b/lib/librte_eal/common/include/rte_tailq.h index 3aae098..07ceec1 100644 --- a/lib/librte_eal/common/include/rte_tailq.h +++ b/lib/librte_eal/common/include/rte_tailq.h @@ -148,7 +148,7 @@ struct rte_tailq_head *rte_eal_tailq_lookup(const char *name); int rte_eal_tailq_register(struct rte_tailq_elem *t); #define EAL_REGISTER_TAILQ(t) \ -RTE_INIT(tailqinitfn_ ##t); \ +RTE_EAL_INIT(tailqinitfn_ ##t); \ static void tailqinitfn_ ##t(void) \ { \ if (rte_eal_tailq_register(&t) < 0) \ -- 2.7.4