X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Feal_common_tailqs.c;h=d9551cdc4805a46ca5ba7d4887cdc94e982539ef;hb=95b6a46fa6ff789948fff578eb7139784da29f24;hp=e7b90c4f10ac2be01922b07c7778bb74dcc3d94f;hpb=591a9d7985c1230652d9f7ea1f9221e8c66ec188;p=dpdk.git diff --git a/lib/librte_eal/common/eal_common_tailqs.c b/lib/librte_eal/common/eal_common_tailqs.c index e7b90c4f10..d9551cdc48 100644 --- a/lib/librte_eal/common/eal_common_tailqs.c +++ b/lib/librte_eal/common/eal_common_tailqs.c @@ -1,13 +1,13 @@ /*- * 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 @@ -17,7 +17,7 @@ * * 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 @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -52,16 +51,17 @@ #include #include #include +#include #include "eal_private.h" -/** - * Name of tailq_head - */ -const char* rte_tailq_names[RTE_MAX_TAILQ] = { -#define rte_tailq_elem(idx, name) name, -#include -}; +TAILQ_HEAD(rte_tailq_elem_head, rte_tailq_elem); +/* local tailq list */ +static struct rte_tailq_elem_head rte_tailq_elem_head = + TAILQ_HEAD_INITIALIZER(rte_tailq_elem_head); + +/* number of tailqs registered, -1 before call to rte_eal_tailqs_init */ +static int rte_tailqs_count = -1; struct rte_tailq_head * rte_eal_tailq_lookup(const char *name) @@ -73,74 +73,130 @@ rte_eal_tailq_lookup(const char *name) return NULL; for (i = 0; i < RTE_MAX_TAILQ; i++) { - if (rte_tailq_names[i] == NULL) - continue; - if (!strncmp(name, rte_tailq_names[i], RTE_TAILQ_NAMESIZE-1)) + if (!strncmp(name, mcfg->tailq_head[i].name, + RTE_TAILQ_NAMESIZE-1)) return &mcfg->tailq_head[i]; } return NULL; } -inline struct rte_tailq_head * -rte_eal_tailq_lookup_by_idx(const unsigned tailq_idx) +void +rte_dump_tailq(FILE *f) { - struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config; + struct rte_mem_config *mcfg; + unsigned i = 0; - if (tailq_idx >= RTE_MAX_TAILQ) { - RTE_LOG(ERR, EAL, "%s(): No more room in config\n", __func__); - return NULL; + mcfg = rte_eal_get_configuration()->mem_config; + + rte_rwlock_read_lock(&mcfg->qlock); + for (i = 0; i < RTE_MAX_TAILQ; i++) { + const struct rte_tailq_head *tailq = &mcfg->tailq_head[i]; + const struct rte_tailq_entry_head *head = &tailq->tailq_head; + + fprintf(f, "Tailq %u: qname:<%s>, tqh_first:%p, tqh_last:%p\n", + i, tailq->name, head->tqh_first, head->tqh_last); + } + rte_rwlock_read_unlock(&mcfg->qlock); +} + +static struct rte_tailq_head * +rte_eal_tailq_create(const char *name) +{ + struct rte_tailq_head *head = NULL; + + if (!rte_eal_tailq_lookup(name) && + (rte_tailqs_count + 1 < RTE_MAX_TAILQ)) { + struct rte_mem_config *mcfg; + + mcfg = rte_eal_get_configuration()->mem_config; + head = &mcfg->tailq_head[rte_tailqs_count]; + snprintf(head->name, sizeof(head->name) - 1, "%s", name); + TAILQ_INIT(&head->tailq_head); + rte_tailqs_count++; } - return &mcfg->tailq_head[tailq_idx]; + return head; } -struct rte_tailq_head * -rte_eal_tailq_reserve(const char *name) +/* local register, used to store "early" tailqs before rte_eal_init() and to + * ensure secondary process only registers tailqs once. */ +static int +rte_eal_tailq_local_register(struct rte_tailq_elem *t) { - return rte_eal_tailq_lookup(name); + struct rte_tailq_elem *temp; + + TAILQ_FOREACH(temp, &rte_tailq_elem_head, next) { + if (!strncmp(t->name, temp->name, sizeof(temp->name))) + return -1; + } + + TAILQ_INSERT_TAIL(&rte_tailq_elem_head, t, next); + return 0; } -inline struct rte_tailq_head * -rte_eal_tailq_reserve_by_idx(const unsigned tailq_idx) +static void +rte_eal_tailq_update(struct rte_tailq_elem *t) { - return rte_eal_tailq_lookup_by_idx(tailq_idx); + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { + /* primary process is the only one that creates */ + t->head = rte_eal_tailq_create(t->name); + } else { + t->head = rte_eal_tailq_lookup(t->name); + } } -void -rte_dump_tailq(FILE *f) +int +rte_eal_tailq_register(struct rte_tailq_elem *t) { - struct rte_mem_config *mcfg; - unsigned i = 0; + if (rte_eal_tailq_local_register(t) < 0) { + rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL, + "%s tailq is already registered\n", t->name); + goto error; + } - mcfg = rte_eal_get_configuration()->mem_config; + /* if a register happens after rte_eal_tailqs_init(), then we can update + * tailq head */ + if (rte_tailqs_count >= 0) { + rte_eal_tailq_update(t); + if (t->head == NULL) { + rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL, + "Cannot initialize tailq: %s\n", t->name); + TAILQ_REMOVE(&rte_tailq_elem_head, t, next); + goto error; + } + } - rte_rwlock_read_lock(&mcfg->qlock); - for (i=0; i < RTE_MAX_TAILQ; i++) { - const struct rte_tailq_head *tailq = &mcfg->tailq_head[i]; - const struct rte_dummy_head *head = &tailq->tailq_head; + return 0; - fprintf(f, "Tailq %u: qname:<%s>, tqh_first:%p, tqh_last:%p\n", i, - (rte_tailq_names[i] != NULL ? rte_tailq_names[i]:"nil"), - head->tqh_first, head->tqh_last); - } - rte_rwlock_read_unlock(&mcfg->qlock); +error: + t->head = NULL; + return -1; } int rte_eal_tailqs_init(void) { - unsigned i; - struct rte_mem_config *mcfg = NULL; - - RTE_BUILD_BUG_ON(RTE_MAX_TAILQ < RTE_TAILQ_NUM); - - if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - mcfg = rte_eal_get_configuration()->mem_config; - for (i = 0; i < RTE_MAX_TAILQ; i++) - TAILQ_INIT(&mcfg->tailq_head[i].tailq_head); + struct rte_tailq_elem *t; + + rte_tailqs_count = 0; + + TAILQ_FOREACH(t, &rte_tailq_elem_head, next) { + /* second part of register job for "early" tailqs, see + * rte_eal_tailq_register and EAL_REGISTER_TAILQ */ + rte_eal_tailq_update(t); + if (t->head == NULL) { + rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL, + "Cannot initialize tailq: %s\n", t->name); + /* no need to TAILQ_REMOVE, we are going to panic in + * rte_eal_init() */ + goto fail; + } } return 0; -} +fail: + rte_dump_tailq(stderr); + return -1; +}