@@ -350,7 +350,6 @@ struct logtype {
static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL, "lib.eal"},
{RTE_LOGTYPE_PMD, "pmd"},
- {RTE_LOGTYPE_PORT, "lib.port"},
{RTE_LOGTYPE_TABLE, "lib.table"},
{RTE_LOGTYPE_PIPELINE, "lib.pipeline"},
{RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"},
@@ -39,7 +39,7 @@ extern "C" {
/* was RTE_LOGTYPE_POWER */
/* was RTE_LOGTYPE_METER */
/* was RTE_LOGTYPE_SCHED */
-#define RTE_LOGTYPE_PORT 13 /**< Log related to port. */
+ /* was RTE_LOGTYPE_PORT */
#define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */
/* was RTE_LOGTYPE_MBUF */
@@ -5,11 +5,16 @@
#include <stdint.h>
#include <rte_mbuf.h>
+#include <rte_log.h>
#include <rte_ethdev.h>
#include <rte_malloc.h>
#include "rte_port_ethdev.h"
+RTE_LOG_REGISTER_SUFFIX(port_ethdev_logtype, "port.ethdev", INFO);
+#define RTE_PORT_ETHDEV_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, port_ethdev_logtype, \
+ "%s: " fmt "\n", __func__, ## args)
/*
* Port ETHDEV Reader
*/
@@ -43,7 +48,7 @@ rte_port_ethdev_reader_create(void *params, int socket_id)
/* Check input parameters */
if (conf == NULL) {
- RTE_LOG(ERR, PORT, "%s: params is NULL\n", __func__);
+ RTE_PORT_ETHDEV_LOG(ERR, "params is NULL");
return NULL;
}
@@ -51,7 +56,7 @@ rte_port_ethdev_reader_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_ETHDEV_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -78,7 +83,7 @@ static int
rte_port_ethdev_reader_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: port is NULL\n", __func__);
+ RTE_PORT_ETHDEV_LOG(ERR, "port is NULL");
return -EINVAL;
}
@@ -142,7 +147,7 @@ rte_port_ethdev_writer_create(void *params, int socket_id)
(conf->tx_burst_sz == 0) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->tx_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ RTE_PORT_ETHDEV_LOG(ERR, "Invalid input parameters");
return NULL;
}
@@ -150,7 +155,7 @@ rte_port_ethdev_writer_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_ETHDEV_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -257,7 +262,7 @@ static int
rte_port_ethdev_writer_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_ETHDEV_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -323,7 +328,7 @@ rte_port_ethdev_writer_nodrop_create(void *params, int socket_id)
(conf->tx_burst_sz == 0) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->tx_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ RTE_PORT_ETHDEV_LOG(ERR, "Invalid input parameters");
return NULL;
}
@@ -331,7 +336,7 @@ rte_port_ethdev_writer_nodrop_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_ETHDEV_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -470,7 +475,7 @@ static int
rte_port_ethdev_writer_nodrop_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_ETHDEV_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -5,11 +5,16 @@
#include <string.h>
#include <stdint.h>
+#include <rte_log.h>
#include <rte_mbuf.h>
#include <rte_malloc.h>
#include "rte_port_eventdev.h"
+RTE_LOG_REGISTER_SUFFIX(port_eventdev_logtype, "port.eventdev", INFO);
+#define RTE_PORT_EVENTDEV_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, port_eventdev_logtype, \
+ "%s: " fmt "\n", __func__, ## args)
/*
* Port EVENTDEV Reader
*/
@@ -45,7 +50,7 @@ rte_port_eventdev_reader_create(void *params, int socket_id)
/* Check input parameters */
if (conf == NULL) {
- RTE_LOG(ERR, PORT, "%s: params is NULL\n", __func__);
+ RTE_PORT_EVENTDEV_LOG(ERR, "params is NULL");
return NULL;
}
@@ -53,7 +58,7 @@ rte_port_eventdev_reader_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_EVENTDEV_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -85,7 +90,7 @@ static int
rte_port_eventdev_reader_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: port is NULL\n", __func__);
+ RTE_PORT_EVENTDEV_LOG(ERR, "port is NULL");
return -EINVAL;
}
@@ -155,7 +160,7 @@ rte_port_eventdev_writer_create(void *params, int socket_id)
(conf->enq_burst_sz == 0) ||
(conf->enq_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->enq_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ RTE_PORT_EVENTDEV_LOG(ERR, "Invalid input parameters");
return NULL;
}
@@ -163,7 +168,7 @@ rte_port_eventdev_writer_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_EVENTDEV_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -290,7 +295,7 @@ static int
rte_port_eventdev_writer_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_EVENTDEV_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -362,7 +367,7 @@ rte_port_eventdev_writer_nodrop_create(void *params, int socket_id)
(conf->enq_burst_sz == 0) ||
(conf->enq_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->enq_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ RTE_PORT_EVENTDEV_LOG(ERR, "Invalid input parameters");
return NULL;
}
@@ -370,7 +375,7 @@ rte_port_eventdev_writer_nodrop_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_EVENTDEV_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -530,7 +535,7 @@ static int
rte_port_eventdev_writer_nodrop_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_EVENTDEV_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -10,6 +10,10 @@
#include "rte_port_fd.h"
+RTE_LOG_REGISTER_SUFFIX(port_fd_logtype, "port.fd", INFO);
+#define RTE_PORT_FD_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, port_fd_logtype, \
+ "%s: " fmt "\n", __func__, ## args)
/*
* Port FD Reader
*/
@@ -43,19 +47,19 @@ rte_port_fd_reader_create(void *params, int socket_id)
/* Check input parameters */
if (conf == NULL) {
- RTE_LOG(ERR, PORT, "%s: params is NULL\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "params is NULL");
return NULL;
}
if (conf->fd < 0) {
- RTE_LOG(ERR, PORT, "%s: Invalid file descriptor\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "Invalid file descriptor");
return NULL;
}
if (conf->mtu == 0) {
- RTE_LOG(ERR, PORT, "%s: Invalid MTU\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "Invalid MTU");
return NULL;
}
if (conf->mempool == NULL) {
- RTE_LOG(ERR, PORT, "%s: Invalid mempool\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "Invalid mempool");
return NULL;
}
@@ -63,7 +67,7 @@ rte_port_fd_reader_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -109,7 +113,7 @@ static int
rte_port_fd_reader_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: port is NULL\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "port is NULL");
return -EINVAL;
}
@@ -171,7 +175,7 @@ rte_port_fd_writer_create(void *params, int socket_id)
(conf->tx_burst_sz == 0) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->tx_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "Invalid input parameters");
return NULL;
}
@@ -179,7 +183,7 @@ rte_port_fd_writer_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -279,7 +283,7 @@ static int
rte_port_fd_writer_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -344,7 +348,7 @@ rte_port_fd_writer_nodrop_create(void *params, int socket_id)
(conf->tx_burst_sz == 0) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->tx_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "Invalid input parameters");
return NULL;
}
@@ -352,7 +356,7 @@ rte_port_fd_writer_nodrop_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -464,7 +468,7 @@ static int
rte_port_fd_writer_nodrop_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_FD_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -7,6 +7,11 @@
#include "rte_port_frag.h"
+RTE_LOG_REGISTER_SUFFIX(port_frag_logtype, "port.frag", INFO);
+#define RTE_PORT_FRAG_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, port_frag_logtype, \
+ "%s: " fmt "\n", __func__, ## args)
+
/* Max number of fragments per packet allowed */
#define RTE_PORT_FRAG_MAX_FRAGS_PER_PACKET 0x80
@@ -62,25 +67,23 @@ rte_port_ring_reader_frag_create(void *params, int socket_id, int is_ipv4)
/* Check input parameters */
if (conf == NULL) {
- RTE_LOG(ERR, PORT, "%s: Parameter conf is NULL\n", __func__);
+ RTE_PORT_FRAG_LOG(ERR, "Parameter conf is NULL");
return NULL;
}
if (conf->ring == NULL) {
- RTE_LOG(ERR, PORT, "%s: Parameter ring is NULL\n", __func__);
+ RTE_PORT_FRAG_LOG(ERR, "Parameter ring is NULL");
return NULL;
}
if (conf->mtu == 0) {
- RTE_LOG(ERR, PORT, "%s: Parameter mtu is invalid\n", __func__);
+ RTE_PORT_FRAG_LOG(ERR, "Parameter mtu is invalid");
return NULL;
}
if (conf->pool_direct == NULL) {
- RTE_LOG(ERR, PORT, "%s: Parameter pool_direct is NULL\n",
- __func__);
+ RTE_PORT_FRAG_LOG(ERR, "Parameter pool_direct is NULL");
return NULL;
}
if (conf->pool_indirect == NULL) {
- RTE_LOG(ERR, PORT, "%s: Parameter pool_indirect is NULL\n",
- __func__);
+ RTE_PORT_FRAG_LOG(ERR, "Parameter pool_indirect is NULL");
return NULL;
}
@@ -88,7 +91,7 @@ rte_port_ring_reader_frag_create(void *params, int socket_id, int is_ipv4)
port = rte_zmalloc_socket("PORT", sizeof(*port), RTE_CACHE_LINE_SIZE,
socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: port is NULL\n", __func__);
+ RTE_PORT_FRAG_LOG(ERR, "port is NULL");
return NULL;
}
@@ -232,7 +235,7 @@ static int
rte_port_ring_reader_frag_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Parameter port is NULL\n", __func__);
+ RTE_PORT_FRAG_LOG(ERR, "Parameter port is NULL");
return -1;
}
@@ -9,6 +9,10 @@
#include "rte_port_kni.h"
+RTE_LOG_REGISTER_SUFFIX(port_kni_logtype, "port.kni", INFO);
+#define RTE_PORT_KNI_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, port_kni_logtype, \
+ "%s: " fmt "\n", __func__, ## args)
/*
* Port KNI Reader
*/
@@ -41,7 +45,7 @@ rte_port_kni_reader_create(void *params, int socket_id)
/* Check input parameters */
if (conf == NULL) {
- RTE_LOG(ERR, PORT, "%s: params is NULL\n", __func__);
+ RTE_PORT_KNI_LOG(ERR, "params is NULL");
return NULL;
}
@@ -49,7 +53,7 @@ rte_port_kni_reader_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_KNI_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -75,7 +79,7 @@ static int
rte_port_kni_reader_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: port is NULL\n", __func__);
+ RTE_PORT_KNI_LOG(ERR, "port is NULL");
return -EINVAL;
}
@@ -138,7 +142,7 @@ rte_port_kni_writer_create(void *params, int socket_id)
(conf->tx_burst_sz == 0) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->tx_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ RTE_PORT_KNI_LOG(ERR, "Invalid input parameters");
return NULL;
}
@@ -146,7 +150,7 @@ rte_port_kni_writer_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_KNI_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -250,7 +254,7 @@ static int
rte_port_kni_writer_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_KNI_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -315,7 +319,7 @@ rte_port_kni_writer_nodrop_create(void *params, int socket_id)
(conf->tx_burst_sz == 0) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->tx_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ RTE_PORT_KNI_LOG(ERR, "Invalid input parameters");
return NULL;
}
@@ -323,7 +327,7 @@ rte_port_kni_writer_nodrop_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_KNI_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -460,7 +464,7 @@ static int
rte_port_kni_writer_nodrop_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_KNI_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -21,6 +21,11 @@
#define RTE_PORT_RAS_N_ENTRIES (RTE_PORT_RAS_N_BUCKETS * RTE_PORT_RAS_N_ENTRIES_PER_BUCKET)
#endif
+RTE_LOG_REGISTER_SUFFIX(port_ras_logtype, "port.ras", INFO);
+#define RTE_PORT_RAS_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, port_ras_logtype, \
+ "%s: " fmt "\n", __func__, ## args)
+
#ifdef RTE_PORT_STATS_COLLECT
#define RTE_PORT_RING_WRITER_RAS_STATS_PKTS_IN_ADD(port, val) \
@@ -69,16 +74,16 @@ rte_port_ring_writer_ras_create(void *params, int socket_id, int is_ipv4)
/* Check input parameters */
if (conf == NULL) {
- RTE_LOG(ERR, PORT, "%s: Parameter conf is NULL\n", __func__);
+ RTE_PORT_RAS_LOG(ERR, "Parameter conf is NULL");
return NULL;
}
if (conf->ring == NULL) {
- RTE_LOG(ERR, PORT, "%s: Parameter ring is NULL\n", __func__);
+ RTE_PORT_RAS_LOG(ERR, "Parameter ring is NULL");
return NULL;
}
if ((conf->tx_burst_sz == 0) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX)) {
- RTE_LOG(ERR, PORT, "%s: Parameter tx_burst_sz is invalid\n",
+ RTE_PORT_RAS_LOG(ERR, "Parameter tx_burst_sz is invalid\n",
__func__);
return NULL;
}
@@ -87,7 +92,7 @@ rte_port_ring_writer_ras_create(void *params, int socket_id, int is_ipv4)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate socket\n", __func__);
+ RTE_PORT_RAS_LOG(ERR, "Failed to allocate socket");
return NULL;
}
@@ -103,7 +108,7 @@ rte_port_ring_writer_ras_create(void *params, int socket_id, int is_ipv4)
socket_id);
if (port->frag_tbl == NULL) {
- RTE_LOG(ERR, PORT, "%s: rte_ip_frag_table_create failed\n",
+ RTE_PORT_RAS_LOG(ERR, "rte_ip_frag_table_create failed\n",
__func__);
rte_free(port);
return NULL;
@@ -282,7 +287,7 @@ rte_port_ring_writer_ras_free(void *port)
port;
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Parameter port is NULL\n", __func__);
+ RTE_PORT_RAS_LOG(ERR, "Parameter port is NULL");
return -1;
}
@@ -10,6 +10,10 @@
#include "rte_port_ring.h"
+RTE_LOG_REGISTER_SUFFIX(port_ring_logtype, "port.ring", INFO);
+#define RTE_PORT_RING_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, port_ring_logtype, \
+ "%s: " fmt "\n", __func__, ## args)
/*
* Port RING Reader
*/
@@ -46,7 +50,7 @@ rte_port_ring_reader_create_internal(void *params, int socket_id,
(conf->ring == NULL) ||
(rte_ring_is_cons_single(conf->ring) && is_multi) ||
(!rte_ring_is_cons_single(conf->ring) && !is_multi)) {
- RTE_LOG(ERR, PORT, "%s: Invalid Parameters\n", __func__);
+ RTE_PORT_RING_LOG(ERR, "Invalid Parameters");
return NULL;
}
@@ -54,7 +58,7 @@ rte_port_ring_reader_create_internal(void *params, int socket_id,
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_RING_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -107,7 +111,7 @@ static int
rte_port_ring_reader_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: port is NULL\n", __func__);
+ RTE_PORT_RING_LOG(ERR, "port is NULL");
return -EINVAL;
}
@@ -174,7 +178,7 @@ rte_port_ring_writer_create_internal(void *params, int socket_id,
(rte_ring_is_prod_single(conf->ring) && is_multi) ||
(!rte_ring_is_prod_single(conf->ring) && !is_multi) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX)) {
- RTE_LOG(ERR, PORT, "%s: Invalid Parameters\n", __func__);
+ RTE_PORT_RING_LOG(ERR, "Invalid Parameters");
return NULL;
}
@@ -182,7 +186,7 @@ rte_port_ring_writer_create_internal(void *params, int socket_id,
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_RING_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -370,7 +374,7 @@ rte_port_ring_writer_free(void *port)
struct rte_port_ring_writer *p = port;
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_RING_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -443,7 +447,7 @@ rte_port_ring_writer_nodrop_create_internal(void *params, int socket_id,
(rte_ring_is_prod_single(conf->ring) && is_multi) ||
(!rte_ring_is_prod_single(conf->ring) && !is_multi) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX)) {
- RTE_LOG(ERR, PORT, "%s: Invalid Parameters\n", __func__);
+ RTE_PORT_RING_LOG(ERR, "Invalid Parameters");
return NULL;
}
@@ -451,7 +455,7 @@ rte_port_ring_writer_nodrop_create_internal(void *params, int socket_id,
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_RING_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -703,7 +707,7 @@ rte_port_ring_writer_nodrop_free(void *port)
port;
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_RING_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -7,6 +7,10 @@
#include "rte_port_sched.h"
+RTE_LOG_REGISTER_SUFFIX(port_sched_logtype, "port.sched", INFO);
+#define RTE_PORT_SCHED_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, port_sched_logtype, \
+ "%s: " fmt "\n", __func__, ##args)
/*
* Reader
*/
@@ -40,7 +44,7 @@ rte_port_sched_reader_create(void *params, int socket_id)
/* Check input parameters */
if ((conf == NULL) ||
(conf->sched == NULL)) {
- RTE_LOG(ERR, PORT, "%s: Invalid params\n", __func__);
+ RTE_PORT_SCHED_LOG(ERR, "Invalid params");
return NULL;
}
@@ -48,7 +52,7 @@ rte_port_sched_reader_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_SCHED_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -74,7 +78,7 @@ static int
rte_port_sched_reader_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: port is NULL\n", __func__);
+ RTE_PORT_SCHED_LOG(ERR, "port is NULL");
return -EINVAL;
}
@@ -139,7 +143,7 @@ rte_port_sched_writer_create(void *params, int socket_id)
(conf->tx_burst_sz == 0) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->tx_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid params\n", __func__);
+ RTE_PORT_SCHED_LOG(ERR, "Invalid params");
return NULL;
}
@@ -147,7 +151,7 @@ rte_port_sched_writer_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_SCHED_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -247,7 +251,7 @@ static int
rte_port_sched_writer_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: port is NULL\n", __func__);
+ RTE_PORT_SCHED_LOG(ERR, "port is NULL");
return -EINVAL;
}
@@ -15,6 +15,12 @@
#include "rte_port_source_sink.h"
+RTE_LOG_REGISTER_SUFFIX(port_source_logtype, "port.source", INFO);
+
+#define RTE_PORT_SOURCE_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, port_source_logtype, \
+ "%s: " fmt "\n", __func__, ##args)
+
/*
* Port SOURCE
*/
@@ -49,9 +55,9 @@ struct rte_port_source {
static int
pcap_source_load(struct rte_port_source *port,
- const char *file_name,
- uint32_t n_bytes_per_pkt,
- int socket_id)
+ const char *file_name,
+ uint32_t n_bytes_per_pkt,
+ int socket_id)
{
uint32_t n_pkts = 0;
uint32_t i;
@@ -64,8 +70,8 @@ pcap_source_load(struct rte_port_source *port,
const uint8_t *pkt;
uint8_t *buff = NULL;
uint32_t pktmbuf_maxlen = (uint32_t)
- (rte_pktmbuf_data_room_size(port->mempool) -
- RTE_PKTMBUF_HEADROOM);
+ (rte_pktmbuf_data_room_size(port->mempool) -
+ RTE_PKTMBUF_HEADROOM);
if (n_bytes_per_pkt == 0)
max_len = pktmbuf_maxlen;
@@ -75,8 +81,9 @@ pcap_source_load(struct rte_port_source *port,
/* first time open, get packet number */
pcap_handle = pcap_open_offline(file_name, pcap_errbuf);
if (pcap_handle == NULL) {
- RTE_LOG(ERR, PORT, "Failed to open pcap file "
- "'%s' for reading\n", file_name);
+ RTE_PORT_SOURCE_LOG(ERR,
+ "Failed to open pcap file '%s' for reading",
+ file_name);
goto error_exit;
}
@@ -86,31 +93,32 @@ pcap_source_load(struct rte_port_source *port,
pcap_close(pcap_handle);
port->pkt_len = rte_zmalloc_socket("PCAP",
- (sizeof(*port->pkt_len) * n_pkts), 0, socket_id);
+ (sizeof(*port->pkt_len) * n_pkts), 0, socket_id);
if (port->pkt_len == NULL) {
- RTE_LOG(ERR, PORT, "No enough memory\n");
+ RTE_PORT_SOURCE_LOG(ERR, "Not enough memory");
goto error_exit;
}
pkt_len_aligns = rte_malloc("PCAP",
- (sizeof(*pkt_len_aligns) * n_pkts), 0);
+ (sizeof(*pkt_len_aligns) * n_pkts), 0);
if (pkt_len_aligns == NULL) {
- RTE_LOG(ERR, PORT, "No enough memory\n");
+ RTE_PORT_SOURCE_LOG(ERR, "Not enough memory");
goto error_exit;
}
port->pkts = rte_zmalloc_socket("PCAP",
- (sizeof(*port->pkts) * n_pkts), 0, socket_id);
+ (sizeof(*port->pkts) * n_pkts), 0, socket_id);
if (port->pkts == NULL) {
- RTE_LOG(ERR, PORT, "No enough memory\n");
+ RTE_PORT_SOURCE_LOG(ERR, "Not enough memory");
goto error_exit;
}
/* open 2nd time, get pkt_len */
pcap_handle = pcap_open_offline(file_name, pcap_errbuf);
if (pcap_handle == NULL) {
- RTE_LOG(ERR, PORT, "Failed to open pcap file "
- "'%s' for reading\n", file_name);
+ RTE_PORT_SOURCE_LOG(ERR,
+ "Failed to open pcap file '%s' for reading",
+ file_name);
goto error_exit;
}
@@ -126,9 +134,9 @@ pcap_source_load(struct rte_port_source *port,
/* allocate a big trunk of data for pcap file load */
buff = rte_zmalloc_socket("PCAP",
- total_buff_len, 0, socket_id);
+ total_buff_len, 0, socket_id);
if (buff == NULL) {
- RTE_LOG(ERR, PORT, "No enough memory\n");
+ RTE_PORT_SOURCE_LOG(ERR, "Not enough memory");
goto error_exit;
}
@@ -137,8 +145,9 @@ pcap_source_load(struct rte_port_source *port,
/* open file one last time to copy the pkt content */
pcap_handle = pcap_open_offline(file_name, pcap_errbuf);
if (pcap_handle == NULL) {
- RTE_LOG(ERR, PORT, "Failed to open pcap file "
- "'%s' for reading\n", file_name);
+ RTE_PORT_SOURCE_LOG(ERR,
+ "Failed to open pcap file '%s' for reading",
+ file_name);
goto error_exit;
}
@@ -155,9 +164,9 @@ pcap_source_load(struct rte_port_source *port,
rte_free(pkt_len_aligns);
- RTE_LOG(INFO, PORT, "Successfully load pcap file "
- "'%s' with %u pkts\n",
- file_name, port->n_pkts);
+ RTE_PORT_SOURCE_LOG(INFO,
+ "Successfully load pcap file '%s' with %u pkts",
+ file_name, port->n_pkts);
return 0;
@@ -180,8 +189,8 @@ pcap_source_load(struct rte_port_source *port,
int _ret = 0; \
\
if (file_name) { \
- RTE_LOG(ERR, PORT, "Source port field " \
- "\"file_name\" is not NULL.\n"); \
+ RTE_PORT_SOURCE_LOG(ERR, "Source port field " \
+ "\"file_name\" is not NULL."); \
_ret = -1; \
} \
\
@@ -199,7 +208,7 @@ rte_port_source_create(void *params, int socket_id)
/* Check input arguments*/
if ((p == NULL) || (p->mempool == NULL)) {
- RTE_LOG(ERR, PORT, "%s: Invalid params\n", __func__);
+ RTE_PORT_SOURCE_LOG(ERR, "Invalid params");
return NULL;
}
@@ -207,7 +216,7 @@ rte_port_source_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_SOURCE_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -332,15 +341,16 @@ pcap_sink_open(struct rte_port_sink *port,
/** Open a dead pcap handler for opening dumper file */
tx_pcap = pcap_open_dead(DLT_EN10MB, 65535);
if (tx_pcap == NULL) {
- RTE_LOG(ERR, PORT, "Cannot open pcap dead handler\n");
+ RTE_PORT_SOURCE_LOG(ERR, "Cannot open pcap dead handler");
return -1;
}
/* The dumper is created using the previous pcap_t reference */
pcap_dumper = pcap_dump_open(tx_pcap, file_name);
if (pcap_dumper == NULL) {
- RTE_LOG(ERR, PORT, "Failed to open pcap file "
- "\"%s\" for writing\n", file_name);
+ RTE_PORT_SOURCE_LOG(ERR,
+ "Failed to open pcap file \"%s\" for writing",
+ file_name);
return -1;
}
@@ -349,8 +359,9 @@ pcap_sink_open(struct rte_port_sink *port,
port->pkt_index = 0;
port->dump_finish = 0;
- RTE_LOG(INFO, PORT, "Ready to dump packets to file \"%s\"\n",
- file_name);
+ RTE_PORT_SOURCE_LOG(INFO,
+ "Ready to dump packets to file \"%s\"",
+ file_name);
return 0;
}
@@ -402,8 +413,9 @@ pcap_sink_write_pkt(struct rte_port_sink *port, struct rte_mbuf *mbuf)
if ((port->max_pkts != 0) && (port->pkt_index >= port->max_pkts)) {
port->dump_finish = 1;
- RTE_LOG(INFO, PORT, "Dumped %u packets to file\n",
- port->pkt_index);
+ RTE_PORT_SOURCE_LOG(INFO,
+ "Dumped %u packets to file",
+ port->pkt_index);
}
}
@@ -433,7 +445,7 @@ do { \
int _ret = 0; \
\
if (file_name) { \
- RTE_LOG(ERR, PORT, "Sink port field " \
+ RTE_PORT_SOURCE_LOG(ERR, "Sink port field " \
"\"file_name\" is not NULL.\n"); \
_ret = -1; \
} \
@@ -459,7 +471,7 @@ rte_port_sink_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_SOURCE_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -8,6 +8,10 @@
#include "rte_port_sym_crypto.h"
+RTE_LOG_REGISTER_SUFFIX(port_crypto_logtype, "port.crypto", INFO);
+#define RTE_PORT_CRYPTO_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, port_crypto_logtype, \
+ "%s: " fmt "\n", __func__, ##args)
/*
* Port Crypto Reader
*/
@@ -44,7 +48,7 @@ rte_port_sym_crypto_reader_create(void *params, int socket_id)
/* Check input parameters */
if (conf == NULL) {
- RTE_LOG(ERR, PORT, "%s: params is NULL\n", __func__);
+ RTE_PORT_CRYPTO_LOG(ERR, "params is NULL");
return NULL;
}
@@ -52,7 +56,7 @@ rte_port_sym_crypto_reader_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_CRYPTO_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -100,7 +104,7 @@ static int
rte_port_sym_crypto_reader_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: port is NULL\n", __func__);
+ RTE_PORT_CRYPTO_LOG(ERR, "port is NULL");
return -EINVAL;
}
@@ -167,7 +171,7 @@ rte_port_sym_crypto_writer_create(void *params, int socket_id)
(conf->tx_burst_sz == 0) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->tx_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ RTE_PORT_CRYPTO_LOG(ERR, "Invalid input parameters");
return NULL;
}
@@ -175,7 +179,7 @@ rte_port_sym_crypto_writer_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_CRYPTO_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -285,7 +289,7 @@ static int
rte_port_sym_crypto_writer_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_CRYPTO_LOG(ERR, "Port is NULL");
return -EINVAL;
}
@@ -353,7 +357,7 @@ rte_port_sym_crypto_writer_nodrop_create(void *params, int socket_id)
(conf->tx_burst_sz == 0) ||
(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
(!rte_is_power_of_2(conf->tx_burst_sz))) {
- RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ RTE_PORT_CRYPTO_LOG(ERR, "Invalid input parameters");
return NULL;
}
@@ -361,7 +365,7 @@ rte_port_sym_crypto_writer_nodrop_create(void *params, int socket_id)
port = rte_zmalloc_socket("PORT", sizeof(*port),
RTE_CACHE_LINE_SIZE, socket_id);
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ RTE_PORT_CRYPTO_LOG(ERR, "Failed to allocate port");
return NULL;
}
@@ -497,7 +501,7 @@ static int
rte_port_sym_crypto_writer_nodrop_free(void *port)
{
if (port == NULL) {
- RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ RTE_PORT_CRYPTO_LOG(ERR, "Port is NULL");
return -EINVAL;
}