From mboxrd@z Thu Jan 1 00:00:00 1970 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zm4zPqGD08F0Nsn/nk8+B8mKHlBtKa6MqGpk7f82ERs=; b=QXilV6xyLLu9J21vTDioW6PLF5Fg/uGHgU76xyZZ8lAYpdd6/63oWLdEZOFyFMxOPq RGTYS+le5QFZWs3X45RY+sz0d9EN/Ngr8BYUfqek12cLdgivKpUDDTsdHZCCxgfCBRtx zipYdIgw+ifLgQXOIe3hLUfKSr2nC+1ESBB7CvWto0u3K5+IhXmdQRcu80bCzgZVHiJE 8JgfANIivgCN0CXe+N7kvVXirs+9+2rP9d+o0q8IhR5otrh8+ZJgrSvtSDGpPIZ+/6Tg +3db9SlFxXlJBS7XknEuiYW001t3QzDAN3/hV3jZ/O1FtxecKlfVIr0wjoDXxteU94Uf bIwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=zm4zPqGD08F0Nsn/nk8+B8mKHlBtKa6MqGpk7f82ERs=; b=Z2r0uCEkKLkMK/W8kJTT12DCNVWKYk4Mq7QRjupjVRK5AO/TdO16N8pg7oNBj+m0JM YWuFzs/OAxvvOWZJAJd4Bhiu62L1u6P8tFsK9r4guFDZXeUpShEvyOfwz2Jp6nj/HYLZ vaoVW9RLC/T9Qx2Ckjav7NKJkjtncqp/MZVyn93OFZfabX1E7mWB5RTEjdjeje0XlO0I AkBSTJyn50CB4u4Ys+c5vhDaBEVJVRIP2e92BOuVEJgLfRPog3Dml2NK/2AaACAM02WY U5EaSOjPvdFBbm6iVe/fg/rcAxCIIMcscuwadsf/y8x214aKqFxBAa7QjAeFM63Zvxxm MiMQ== X-Gm-Message-State: AMke39lQ2gTXhypvuy2UFWJprWyPuDywQdzbghqY9h8dRHX8vlSTBBfoFsg9IvNZJCshOA== X-Received: by 10.28.45.197 with SMTP id t188mr7735866wmt.15.1487152943247; Wed, 15 Feb 2017 02:02:23 -0800 (PST) Received: from weierstrass.local.net ([91.200.109.169]) by smtp.gmail.com with ESMTPSA id k195sm4716061wmd.7.2017.02.15.02.02.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 02:02:22 -0800 (PST) Sender: Jan Blunck From: Jan Blunck To: dev@dpdk.org Cc: shreyansh.jain@nxp.com Date: Wed, 15 Feb 2017 11:02:03 +0100 Message-Id: <1487152929-23627-2-git-send-email-jblunck@infradead.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487152929-23627-1-git-send-email-jblunck@infradead.org> References: <1487152929-23627-1-git-send-email-jblunck@infradead.org> Subject: [dpdk-dev] [PATCH 1/7] eal: use different constructor priorities for initcalls 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: , X-List-Received-Date: Wed, 15 Feb 2017 10:02:23 -0000 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