@@ -351,7 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL, "lib.eal"},
{RTE_LOGTYPE_PMD, "pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
- {RTE_LOGTYPE_LPM, "lib.lpm"},
{RTE_LOGTYPE_KNI, "lib.kni"},
{RTE_LOGTYPE_METER, "lib.meter"},
{RTE_LOGTYPE_SCHED, "lib.sched"},
@@ -33,7 +33,7 @@ extern "C" {
/* was RTE_LOGTYPE_TIMER */
#define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */
#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
-#define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */
+ /* was RTE_LOGTYPE_LPM */
#define RTE_LOGTYPE_KNI 8 /**< Log related to KNI. */
/* was RTE_LOGTYPE_ACL */
/* was RTE_LOGTYPE_POWER */
@@ -8,6 +8,7 @@
#include <rte_eal_memconfig.h>
#include <rte_errno.h>
+#include <rte_log.h>
#include <rte_malloc.h>
#include <rte_string_fns.h>
#include <rte_tailq.h>
@@ -17,6 +18,12 @@
#include "dir24_8.h"
+RTE_LOG_REGISTER_DEFAULT(fib_logtype, INFO);
+
+#define FIB_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, fib_logtype, \
+ "%s(): " fmt "\n", __func__, ##args)
+
TAILQ_HEAD(rte_fib_list, rte_tailq_entry);
static struct rte_tailq_elem rte_fib_tailq = {
.name = "RTE_FIB",
@@ -167,8 +174,8 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)
rib = rte_rib_create(name, socket_id, &rib_conf);
if (rib == NULL) {
- RTE_LOG(ERR, LPM,
- "Can not allocate RIB %s\n", name);
+ FIB_LOG(ERR,
+ "Can not allocate RIB %s", name);
return NULL;
}
@@ -192,8 +199,8 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)
/* allocate tailq entry */
te = rte_zmalloc("FIB_TAILQ_ENTRY", sizeof(*te), 0);
if (te == NULL) {
- RTE_LOG(ERR, LPM,
- "Can not allocate tailq entry for FIB %s\n", name);
+ FIB_LOG(ERR,
+ "Can not allocate tailq entry for FIB %s", name);
rte_errno = ENOMEM;
goto exit;
}
@@ -202,7 +209,7 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)
fib = rte_zmalloc_socket(mem_name,
sizeof(struct rte_fib), RTE_CACHE_LINE_SIZE, socket_id);
if (fib == NULL) {
- RTE_LOG(ERR, LPM, "FIB %s memory allocation failed\n", name);
+ FIB_LOG(ERR, "FIB %s memory allocation failed", name);
rte_errno = ENOMEM;
goto free_te;
}
@@ -213,9 +220,9 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)
fib->def_nh = conf->default_nh;
ret = init_dataplane(fib, socket_id, conf);
if (ret < 0) {
- RTE_LOG(ERR, LPM,
- "FIB dataplane struct %s memory allocation failed "
- "with err %d\n", name, ret);
+ FIB_LOG(ERR,
+ "FIB dataplane struct %s memory allocation failed with err %d",
+ name, ret);
rte_errno = -ret;
goto free_fib;
}
@@ -9,6 +9,7 @@
#include <rte_eal_memconfig.h>
#include <rte_tailq.h>
#include <rte_errno.h>
+#include <rte_log.h>
#include <rte_malloc.h>
#include <rte_string_fns.h>
@@ -17,6 +18,12 @@
#include "trie.h"
+RTE_LOG_REGISTER_SUFFIX(fib6_logtype, "fib6", INFO);
+
+#define FIB_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, fib6_logtype, \
+ "%s(): " fmt "\n", __func__, ##args)
+
TAILQ_HEAD(rte_fib6_list, rte_tailq_entry);
static struct rte_tailq_elem rte_fib6_tailq = {
.name = "RTE_FIB6",
@@ -168,8 +175,8 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
rib = rte_rib6_create(name, socket_id, &rib_conf);
if (rib == NULL) {
- RTE_LOG(ERR, LPM,
- "Can not allocate RIB %s\n", name);
+ FIB_LOG(ERR,
+ "Can not allocate RIB %s", name);
return NULL;
}
@@ -193,8 +200,8 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
/* allocate tailq entry */
te = rte_zmalloc("FIB_TAILQ_ENTRY", sizeof(*te), 0);
if (te == NULL) {
- RTE_LOG(ERR, LPM,
- "Can not allocate tailq entry for FIB %s\n", name);
+ FIB_LOG(ERR,
+ "Can not allocate tailq entry for FIB %s", name);
rte_errno = ENOMEM;
goto exit;
}
@@ -203,7 +210,7 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
fib = rte_zmalloc_socket(mem_name,
sizeof(struct rte_fib6), RTE_CACHE_LINE_SIZE, socket_id);
if (fib == NULL) {
- RTE_LOG(ERR, LPM, "FIB %s memory allocation failed\n", name);
+ FIB_LOG(ERR, "FIB %s memory allocation failed", name);
rte_errno = ENOMEM;
goto free_te;
}
@@ -214,8 +221,8 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
fib->def_nh = conf->default_nh;
ret = init_dataplane(fib, socket_id, conf);
if (ret < 0) {
- RTE_LOG(ERR, LPM,
- "FIB dataplane struct %s memory allocation failed\n",
+ FIB_LOG(ERR,
+ "FIB dataplane struct %s memory allocation failed",
name);
rte_errno = -ret;
goto free_fib;
@@ -19,6 +19,12 @@
#include "rte_lpm.h"
+RTE_LOG_REGISTER_DEFAULT(lpm_logtype, INFO);
+
+#define LPM_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, lpm_logtype, \
+ "%s(): " fmt "\n", __func__, ##args)
+
TAILQ_HEAD(rte_lpm_list, rte_tailq_entry);
static struct rte_tailq_elem rte_lpm_tailq = {
@@ -189,7 +195,7 @@ rte_lpm_create(const char *name, int socket_id,
/* allocate tailq entry */
te = rte_zmalloc("LPM_TAILQ_ENTRY", sizeof(*te), 0);
if (te == NULL) {
- RTE_LOG(ERR, LPM, "Failed to allocate tailq entry\n");
+ LPM_LOG(ERR, "Failed to allocate tailq entry");
rte_errno = ENOMEM;
goto exit;
}
@@ -198,7 +204,7 @@ rte_lpm_create(const char *name, int socket_id,
i_lpm = rte_zmalloc_socket(mem_name, mem_size,
RTE_CACHE_LINE_SIZE, socket_id);
if (i_lpm == NULL) {
- RTE_LOG(ERR, LPM, "LPM memory allocation failed\n");
+ LPM_LOG(ERR, "LPM memory allocation failed");
rte_free(te);
rte_errno = ENOMEM;
goto exit;
@@ -208,7 +214,7 @@ rte_lpm_create(const char *name, int socket_id,
(size_t)rules_size, RTE_CACHE_LINE_SIZE, socket_id);
if (i_lpm->rules_tbl == NULL) {
- RTE_LOG(ERR, LPM, "LPM rules_tbl memory allocation failed\n");
+ LPM_LOG(ERR, "LPM rules_tbl memory allocation failed");
rte_free(i_lpm);
i_lpm = NULL;
rte_free(te);
@@ -220,7 +226,7 @@ rte_lpm_create(const char *name, int socket_id,
(size_t)tbl8s_size, RTE_CACHE_LINE_SIZE, socket_id);
if (i_lpm->lpm.tbl8 == NULL) {
- RTE_LOG(ERR, LPM, "LPM tbl8 memory allocation failed\n");
+ LPM_LOG(ERR, "LPM tbl8 memory allocation failed");
rte_free(i_lpm->rules_tbl);
rte_free(i_lpm);
i_lpm = NULL;
@@ -335,7 +341,7 @@ rte_lpm_rcu_qsbr_add(struct rte_lpm *lpm, struct rte_lpm_rcu_config *cfg)
params.v = cfg->v;
i_lpm->dq = rte_rcu_qsbr_dq_create(¶ms);
if (i_lpm->dq == NULL) {
- RTE_LOG(ERR, LPM, "LPM defer queue creation failed\n");
+ LPM_LOG(ERR, "LPM defer queue creation failed");
return 1;
}
} else {
@@ -562,7 +568,7 @@ tbl8_free(struct __rte_lpm *i_lpm, uint32_t tbl8_group_start)
status = rte_rcu_qsbr_dq_enqueue(i_lpm->dq,
(void *)&tbl8_group_start);
if (status == 1) {
- RTE_LOG(ERR, LPM, "Failed to push QSBR FIFO\n");
+ LPM_LOG(ERR, "Failed to push QSBR FIFO");
return -rte_errno;
}
}
@@ -45,6 +45,12 @@ enum valid_flag {
VALID
};
+RTE_LOG_REGISTER_SUFFIX(lpm6_logtype, "lpm6", INFO);
+
+#define LPM_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, lpm6_logtype, \
+ "%s(): " fmt "\n", __func__, ##args)
+
TAILQ_HEAD(rte_lpm6_list, rte_tailq_entry);
static struct rte_tailq_elem rte_lpm6_tailq = {
@@ -279,8 +285,9 @@ rte_lpm6_create(const char *name, int socket_id,
rules_tbl = rte_hash_create(&rule_hash_tbl_params);
if (rules_tbl == NULL) {
- RTE_LOG(ERR, LPM, "LPM rules hash table allocation failed: %s (%d)",
- rte_strerror(rte_errno), rte_errno);
+ LPM_LOG(ERR,
+ "LPM rules hash table allocation failed: %s (%d)",
+ rte_strerror(rte_errno), rte_errno);
goto fail_wo_unlock;
}
@@ -289,8 +296,9 @@ rte_lpm6_create(const char *name, int socket_id,
sizeof(uint32_t) * config->number_tbl8s,
RTE_CACHE_LINE_SIZE);
if (tbl8_pool == NULL) {
- RTE_LOG(ERR, LPM, "LPM tbl8 pool allocation failed: %s (%d)",
- rte_strerror(rte_errno), rte_errno);
+ LPM_LOG(ERR,
+ "LPM tbl8 pool allocation failed: %s (%d)",
+ rte_strerror(rte_errno), rte_errno);
rte_errno = ENOMEM;
goto fail_wo_unlock;
}
@@ -300,8 +308,9 @@ rte_lpm6_create(const char *name, int socket_id,
sizeof(struct rte_lpm_tbl8_hdr) * config->number_tbl8s,
RTE_CACHE_LINE_SIZE);
if (tbl8_hdrs == NULL) {
- RTE_LOG(ERR, LPM, "LPM tbl8 headers allocation failed: %s (%d)",
- rte_strerror(rte_errno), rte_errno);
+ LPM_LOG(ERR,
+ "LPM tbl8 headers allocation failed: %s (%d)",
+ rte_strerror(rte_errno), rte_errno);
rte_errno = ENOMEM;
goto fail_wo_unlock;
}
@@ -329,7 +338,7 @@ rte_lpm6_create(const char *name, int socket_id,
/* allocate tailq entry */
te = rte_zmalloc("LPM6_TAILQ_ENTRY", sizeof(*te), 0);
if (te == NULL) {
- RTE_LOG(ERR, LPM, "Failed to allocate tailq entry!\n");
+ LPM_LOG(ERR, "Failed to allocate tailq entry!");
rte_errno = ENOMEM;
goto fail;
}
@@ -339,7 +348,7 @@ rte_lpm6_create(const char *name, int socket_id,
RTE_CACHE_LINE_SIZE, socket_id);
if (lpm == NULL) {
- RTE_LOG(ERR, LPM, "LPM memory allocation failed\n");
+ LPM_LOG(ERR, "LPM memory allocation failed");
rte_free(te);
rte_errno = ENOMEM;
goto fail;
@@ -15,6 +15,12 @@
#include <rte_rib.h>
+RTE_LOG_REGISTER_DEFAULT(rib_logtype, INFO);
+
+#define RIB_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, rib_logtype, \
+ "%s(): " fmt "\n", __func__, ##args)
+
TAILQ_HEAD(rte_rib_list, rte_tailq_entry);
static struct rte_tailq_elem rte_rib_tailq = {
.name = "RTE_RIB",
@@ -412,8 +418,7 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)
NULL, NULL, NULL, NULL, socket_id, 0);
if (node_pool == NULL) {
- RTE_LOG(ERR, LPM,
- "Can not allocate mempool for RIB %s\n", name);
+ RIB_LOG(ERR, "Can not allocate mempool for RIB %s", name);
return NULL;
}
@@ -437,8 +442,7 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)
/* allocate tailq entry */
te = rte_zmalloc("RIB_TAILQ_ENTRY", sizeof(*te), 0);
if (unlikely(te == NULL)) {
- RTE_LOG(ERR, LPM,
- "Can not allocate tailq entry for RIB %s\n", name);
+ RIB_LOG(ERR, "Can not allocate tailq entry for RIB %s", name);
rte_errno = ENOMEM;
goto exit;
}
@@ -447,7 +451,7 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)
rib = rte_zmalloc_socket(mem_name,
sizeof(struct rte_rib), RTE_CACHE_LINE_SIZE, socket_id);
if (unlikely(rib == NULL)) {
- RTE_LOG(ERR, LPM, "RIB %s memory allocation failed\n", name);
+ RIB_LOG(ERR, "RIB %s memory allocation failed", name);
rte_errno = ENOMEM;
goto free_te;
}
@@ -8,6 +8,7 @@
#include <rte_eal_memconfig.h>
#include <rte_errno.h>
+#include <rte_log.h>
#include <rte_malloc.h>
#include <rte_mempool.h>
#include <rte_string_fns.h>
@@ -15,6 +16,12 @@
#include <rte_rib6.h>
+RTE_LOG_REGISTER_SUFFIX(rib6_logtype, "rib6", INFO);
+
+#define RIB_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, rib6_logtype, \
+ "%s(): " fmt "\n", __func__, ##args)
+
#define RTE_RIB_VALID_NODE 1
#define RIB6_MAXDEPTH 128
/* Maximum length of a RIB6 name. */
@@ -481,8 +488,7 @@ rte_rib6_create(const char *name, int socket_id,
NULL, NULL, NULL, NULL, socket_id, 0);
if (node_pool == NULL) {
- RTE_LOG(ERR, LPM,
- "Can not allocate mempool for RIB6 %s\n", name);
+ RIB_LOG(ERR, "Can not allocate mempool for RIB6 %s", name);
return NULL;
}
@@ -506,8 +512,8 @@ rte_rib6_create(const char *name, int socket_id,
/* allocate tailq entry */
te = rte_zmalloc("RIB6_TAILQ_ENTRY", sizeof(*te), 0);
if (unlikely(te == NULL)) {
- RTE_LOG(ERR, LPM,
- "Can not allocate tailq entry for RIB6 %s\n", name);
+ RIB_LOG(ERR,
+ "Can not allocate tailq entry for RIB6 %s", name);
rte_errno = ENOMEM;
goto exit;
}
@@ -516,7 +522,7 @@ rte_rib6_create(const char *name, int socket_id,
rib = rte_zmalloc_socket(mem_name,
sizeof(struct rte_rib6), RTE_CACHE_LINE_SIZE, socket_id);
if (unlikely(rib == NULL)) {
- RTE_LOG(ERR, LPM, "RIB6 %s memory allocation failed\n", name);
+ RIB_LOG(ERR, "RIB6 %s memory allocation failed", name);
rte_errno = ENOMEM;
goto free_te;
}