git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virtio: use one way barrier for split vring avail index
[dpdk.git]
/
lib
/
librte_pdump
/
rte_pdump.c
diff --git
a/lib/librte_pdump/rte_pdump.c
b/lib/librte_pdump/rte_pdump.c
index
7816c72
..
f96709f
100644
(file)
--- a/
lib/librte_pdump/rte_pdump.c
+++ b/
lib/librte_pdump/rte_pdump.c
@@
-13,8
+13,12
@@
#include "rte_pdump.h"
#define DEVICE_ID_SIZE 64
#include "rte_pdump.h"
#define DEVICE_ID_SIZE 64
-/* Macros for printing using RTE_LOG */
-#define RTE_LOGTYPE_PDUMP RTE_LOGTYPE_USER1
+
+/* Macro for printing using RTE_LOG */
+static int pdump_logtype;
+#define PDUMP_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, pdump_logtype, "%s(): " fmt, \
+ __func__, ## args)
/* Used for the multi-process communication */
#define PDUMP_MP "mp_pdump"
/* Used for the multi-process communication */
#define PDUMP_MP "mp_pdump"
@@
-88,7
+92,7
@@
pdump_copy(struct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params)
ring_enq = rte_ring_enqueue_burst(ring, (void *)dup_bufs, d_pkts, NULL);
if (unlikely(ring_enq < d_pkts)) {
ring_enq = rte_ring_enqueue_burst(ring, (void *)dup_bufs, d_pkts, NULL);
if (unlikely(ring_enq < d_pkts)) {
-
RTE_LOG(DEBUG, PDUMP
,
+
PDUMP_LOG(DEBUG
,
"only %d of packets enqueued to ring\n", ring_enq);
do {
rte_pktmbuf_free(dup_bufs[ring_enq]);
"only %d of packets enqueued to ring\n", ring_enq);
do {
rte_pktmbuf_free(dup_bufs[ring_enq]);
@@
-127,7
+131,7
@@
pdump_register_rx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue,
cbs = &rx_cbs[port][qid];
if (cbs && operation == ENABLE) {
if (cbs->cb) {
cbs = &rx_cbs[port][qid];
if (cbs && operation == ENABLE) {
if (cbs->cb) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"failed to add rx callback for port=%d "
"and queue=%d, callback already exists\n",
port, qid);
"failed to add rx callback for port=%d "
"and queue=%d, callback already exists\n",
port, qid);
@@
-138,7
+142,7
@@
pdump_register_rx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue,
cbs->cb = rte_eth_add_first_rx_callback(port, qid,
pdump_rx, cbs);
if (cbs->cb == NULL) {
cbs->cb = rte_eth_add_first_rx_callback(port, qid,
pdump_rx, cbs);
if (cbs->cb == NULL) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"failed to add rx callback, errno=%d\n",
rte_errno);
return rte_errno;
"failed to add rx callback, errno=%d\n",
rte_errno);
return rte_errno;
@@
-148,7
+152,7
@@
pdump_register_rx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue,
int ret;
if (cbs->cb == NULL) {
int ret;
if (cbs->cb == NULL) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"failed to delete non existing rx "
"callback for port=%d and queue=%d\n",
port, qid);
"failed to delete non existing rx "
"callback for port=%d and queue=%d\n",
port, qid);
@@
-156,7
+160,7
@@
pdump_register_rx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue,
}
ret = rte_eth_remove_rx_callback(port, qid, cbs->cb);
if (ret < 0) {
}
ret = rte_eth_remove_rx_callback(port, qid, cbs->cb);
if (ret < 0) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"failed to remove rx callback, errno=%d\n",
-ret);
return ret;
"failed to remove rx callback, errno=%d\n",
-ret);
return ret;
@@
-182,7
+186,7
@@
pdump_register_tx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue,
cbs = &tx_cbs[port][qid];
if (cbs && operation == ENABLE) {
if (cbs->cb) {
cbs = &tx_cbs[port][qid];
if (cbs && operation == ENABLE) {
if (cbs->cb) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"failed to add tx callback for port=%d "
"and queue=%d, callback already exists\n",
port, qid);
"failed to add tx callback for port=%d "
"and queue=%d, callback already exists\n",
port, qid);
@@
-193,7
+197,7
@@
pdump_register_tx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue,
cbs->cb = rte_eth_add_tx_callback(port, qid, pdump_tx,
cbs);
if (cbs->cb == NULL) {
cbs->cb = rte_eth_add_tx_callback(port, qid, pdump_tx,
cbs);
if (cbs->cb == NULL) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"failed to add tx callback, errno=%d\n",
rte_errno);
return rte_errno;
"failed to add tx callback, errno=%d\n",
rte_errno);
return rte_errno;
@@
-203,7
+207,7
@@
pdump_register_tx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue,
int ret;
if (cbs->cb == NULL) {
int ret;
if (cbs->cb == NULL) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"failed to delete non existing tx "
"callback for port=%d and queue=%d\n",
port, qid);
"failed to delete non existing tx "
"callback for port=%d and queue=%d\n",
port, qid);
@@
-211,7
+215,7
@@
pdump_register_tx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue,
}
ret = rte_eth_remove_tx_callback(port, qid, cbs->cb);
if (ret < 0) {
}
ret = rte_eth_remove_tx_callback(port, qid, cbs->cb);
if (ret < 0) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"failed to remove tx callback, errno=%d\n",
-ret);
return ret;
"failed to remove tx callback, errno=%d\n",
-ret);
return ret;
@@
-240,7
+244,7
@@
set_pdump_rxtx_cbs(const struct pdump_request *p)
ret = rte_eth_dev_get_port_by_name(p->data.en_v1.device,
&port);
if (ret < 0) {
ret = rte_eth_dev_get_port_by_name(p->data.en_v1.device,
&port);
if (ret < 0) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"failed to get port id for device id=%s\n",
p->data.en_v1.device);
return -EINVAL;
"failed to get port id for device id=%s\n",
p->data.en_v1.device);
return -EINVAL;
@@
-252,7
+256,7
@@
set_pdump_rxtx_cbs(const struct pdump_request *p)
ret = rte_eth_dev_get_port_by_name(p->data.dis_v1.device,
&port);
if (ret < 0) {
ret = rte_eth_dev_get_port_by_name(p->data.dis_v1.device,
&port);
if (ret < 0) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"failed to get port id for device id=%s\n",
p->data.dis_v1.device);
return -EINVAL;
"failed to get port id for device id=%s\n",
p->data.dis_v1.device);
return -EINVAL;
@@
-268,7
+272,7
@@
set_pdump_rxtx_cbs(const struct pdump_request *p)
ret = rte_eth_dev_info_get(port, &dev_info);
if (ret != 0) {
ret = rte_eth_dev_info_get(port, &dev_info);
if (ret != 0) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"Error during getting device (port %u) info: %s\n",
port, strerror(-ret));
return ret;
"Error during getting device (port %u) info: %s\n",
port, strerror(-ret));
return ret;
@@
-277,18
+281,18
@@
set_pdump_rxtx_cbs(const struct pdump_request *p)
nb_rx_q = dev_info.nb_rx_queues;
nb_tx_q = dev_info.nb_tx_queues;
if (nb_rx_q == 0 && flags & RTE_PDUMP_FLAG_RX) {
nb_rx_q = dev_info.nb_rx_queues;
nb_tx_q = dev_info.nb_tx_queues;
if (nb_rx_q == 0 && flags & RTE_PDUMP_FLAG_RX) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"number of rx queues cannot be 0\n");
return -EINVAL;
}
if (nb_tx_q == 0 && flags & RTE_PDUMP_FLAG_TX) {
"number of rx queues cannot be 0\n");
return -EINVAL;
}
if (nb_tx_q == 0 && flags & RTE_PDUMP_FLAG_TX) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"number of tx queues cannot be 0\n");
return -EINVAL;
}
if ((nb_tx_q == 0 || nb_rx_q == 0) &&
flags == RTE_PDUMP_FLAG_RXTX) {
"number of tx queues cannot be 0\n");
return -EINVAL;
}
if ((nb_tx_q == 0 || nb_rx_q == 0) &&
flags == RTE_PDUMP_FLAG_RXTX) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"both tx&rx queues must be non zero\n");
return -EINVAL;
}
"both tx&rx queues must be non zero\n");
return -EINVAL;
}
@@
-324,7
+328,7
@@
pdump_server(const struct rte_mp_msg *mp_msg, const void *peer)
/* recv client requests */
if (mp_msg->len_param != sizeof(*cli_req)) {
/* recv client requests */
if (mp_msg->len_param != sizeof(*cli_req)) {
-
RTE_LOG(ERR, PDUMP
, "failed to recv from client\n");
+
PDUMP_LOG(ERR
, "failed to recv from client\n");
resp->err_value = -EINVAL;
} else {
cli_req = (const struct pdump_request *)mp_msg->param;
resp->err_value = -EINVAL;
} else {
cli_req = (const struct pdump_request *)mp_msg->param;
@@
-337,8
+341,8
@@
pdump_server(const struct rte_mp_msg *mp_msg, const void *peer)
mp_resp.len_param = sizeof(*resp);
mp_resp.num_fds = 0;
if (rte_mp_reply(&mp_resp, peer) < 0) {
mp_resp.len_param = sizeof(*resp);
mp_resp.num_fds = 0;
if (rte_mp_reply(&mp_resp, peer) < 0) {
-
RTE_LOG(ERR, PDUMP, "failed to send to client:%s, %s:%d
\n",
-
strerror(rte_errno), __func__, __LINE__
);
+
PDUMP_LOG(ERR, "failed to send to client:%s
\n",
+
strerror(rte_errno)
);
return -1;
}
return -1;
}
@@
-366,19
+370,18
@@
static int
pdump_validate_ring_mp(struct rte_ring *ring, struct rte_mempool *mp)
{
if (ring == NULL || mp == NULL) {
pdump_validate_ring_mp(struct rte_ring *ring, struct rte_mempool *mp)
{
if (ring == NULL || mp == NULL) {
- RTE_LOG(ERR, PDUMP, "NULL ring or mempool are passed %s:%d\n",
- __func__, __LINE__);
+ PDUMP_LOG(ERR, "NULL ring or mempool\n");
rte_errno = EINVAL;
return -1;
}
if (mp->flags & MEMPOOL_F_SP_PUT || mp->flags & MEMPOOL_F_SC_GET) {
rte_errno = EINVAL;
return -1;
}
if (mp->flags & MEMPOOL_F_SP_PUT || mp->flags & MEMPOOL_F_SC_GET) {
-
RTE_LOG(ERR, PDUMP
, "mempool with either SP or SC settings"
+
PDUMP_LOG(ERR
, "mempool with either SP or SC settings"
" is not valid for pdump, should have MP and MC settings\n");
rte_errno = EINVAL;
return -1;
}
" is not valid for pdump, should have MP and MC settings\n");
rte_errno = EINVAL;
return -1;
}
- if (r
ing->prod.single || ring->cons.single
) {
-
RTE_LOG(ERR, PDUMP
, "ring with either SP or SC settings"
+ if (r
te_ring_is_prod_single(ring) || rte_ring_is_cons_single(ring)
) {
+
PDUMP_LOG(ERR
, "ring with either SP or SC settings"
" is not valid for pdump, should have MP and MC settings\n");
rte_errno = EINVAL;
return -1;
" is not valid for pdump, should have MP and MC settings\n");
rte_errno = EINVAL;
return -1;
@@
-392,7
+395,7
@@
pdump_validate_flags(uint32_t flags)
{
if (flags != RTE_PDUMP_FLAG_RX && flags != RTE_PDUMP_FLAG_TX &&
flags != RTE_PDUMP_FLAG_RXTX) {
{
if (flags != RTE_PDUMP_FLAG_RX && flags != RTE_PDUMP_FLAG_TX &&
flags != RTE_PDUMP_FLAG_RXTX) {
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"invalid flags, should be either rx/tx/rxtx\n");
rte_errno = EINVAL;
return -1;
"invalid flags, should be either rx/tx/rxtx\n");
rte_errno = EINVAL;
return -1;
@@
-407,17
+410,15
@@
pdump_validate_port(uint16_t port, char *name)
int ret = 0;
if (port >= RTE_MAX_ETHPORTS) {
int ret = 0;
if (port >= RTE_MAX_ETHPORTS) {
- RTE_LOG(ERR, PDUMP, "Invalid port id %u, %s:%d\n", port,
- __func__, __LINE__);
+ PDUMP_LOG(ERR, "Invalid port id %u\n", port);
rte_errno = EINVAL;
return -1;
}
ret = rte_eth_dev_get_name_by_port(port, name);
if (ret < 0) {
rte_errno = EINVAL;
return -1;
}
ret = rte_eth_dev_get_name_by_port(port, name);
if (ret < 0) {
- RTE_LOG(ERR, PDUMP,
- "port id to name mapping failed for port id=%u, %s:%d\n",
- port, __func__, __LINE__);
+ PDUMP_LOG(ERR, "port %u to name mapping failed\n",
+ port);
rte_errno = EINVAL;
return -1;
}
rte_errno = EINVAL;
return -1;
}
@@
-472,7
+473,7
@@
pdump_prepare_client_request(char *device, uint16_t queue,
}
if (ret < 0)
}
if (ret < 0)
-
RTE_LOG(ERR, PDUMP
,
+
PDUMP_LOG(ERR
,
"client request for pdump enable/disable failed\n");
return ret;
}
"client request for pdump enable/disable failed\n");
return ret;
}
@@
-559,3
+560,10
@@
rte_pdump_disable_by_deviceid(char *device_id, uint16_t queue,
return ret;
}
return ret;
}
+
+RTE_INIT(pdump_log)
+{
+ pdump_logtype = rte_log_register("lib.pdump");
+ if (pdump_logtype >= 0)
+ rte_log_set_level(pdump_logtype, RTE_LOG_NOTICE);
+}