patch 'lib: use dedicated logtypes and macros' has been queued to stable release 23.11.1
Xueming Li
xuemingl at nvidia.com
Tue Mar 5 10:45:46 CET 2024
Hi,
FYI, your patch has been queued to stable release 23.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/31/24. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=e421bcd7085615de38888ea6e4e3e064fe835b93
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From e421bcd7085615de38888ea6e4e3e064fe835b93 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Wed, 6 Dec 2023 13:51:57 +0100
Subject: [PATCH] lib: use dedicated logtypes and macros
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit c07da8e381ef860e972abd90400f134c64f3f77a ]
No printf!
When a dedicated log helper exists, use it.
And no usurpation please: a library should log under its logtype
(see the eventdev rx adapter update for example).
Note: the RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET macro is renamed for
consistency with the rest of eventdev (private) macros.
Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
Reviewed-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
lib/cryptodev/rte_cryptodev.c | 2 +-
lib/ethdev/ethdev_driver.c | 4 ++--
lib/ethdev/ethdev_private.c | 2 +-
lib/ethdev/rte_class_eth.c | 2 +-
lib/eventdev/rte_event_dma_adapter.c | 4 ++--
lib/eventdev/rte_event_eth_rx_adapter.c | 12 ++++++------
lib/eventdev/rte_eventdev.c | 6 +++---
lib/mempool/rte_mempool_ops.c | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index b258827734..d8769f0b8d 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -2682,7 +2682,7 @@ rte_cryptodev_driver_id_get(const char *name)
int driver_id = -1;
if (name == NULL) {
- RTE_LOG(DEBUG, CRYPTODEV, "name pointer NULL");
+ CDEV_LOG_DEBUG("name pointer NULL");
return -1;
}
diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c
index fff4b7b4cd..55a9dcc565 100644
--- a/lib/ethdev/ethdev_driver.c
+++ b/lib/ethdev/ethdev_driver.c
@@ -487,7 +487,7 @@ rte_eth_devargs_parse(const char *dargs, struct rte_eth_devargs *eth_da)
pair = &args.pairs[i];
if (strcmp("representor", pair->key) == 0) {
if (eth_da->type != RTE_ETH_REPRESENTOR_NONE) {
- RTE_LOG(ERR, EAL, "duplicated representor key: %s\n",
+ RTE_ETHDEV_LOG(ERR, "duplicated representor key: %s\n",
dargs);
result = -1;
goto parse_cleanup;
@@ -713,7 +713,7 @@ rte_eth_representor_id_get(uint16_t port_id,
if (info->ranges[i].controller != controller)
continue;
if (info->ranges[i].id_end < info->ranges[i].id_base) {
- RTE_LOG(WARNING, EAL, "Port %hu invalid representor ID Range %u - %u, entry %d\n",
+ RTE_ETHDEV_LOG(WARNING, "Port %hu invalid representor ID Range %u - %u, entry %d\n",
port_id, info->ranges[i].id_base,
info->ranges[i].id_end, i);
continue;
diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
index e98b7188b0..0e1c7b23c1 100644
--- a/lib/ethdev/ethdev_private.c
+++ b/lib/ethdev/ethdev_private.c
@@ -182,7 +182,7 @@ rte_eth_devargs_parse_representor_ports(char *str, void *data)
RTE_DIM(eth_da->representor_ports));
done:
if (str == NULL)
- RTE_LOG(ERR, EAL, "wrong representor format: %s\n", str);
+ RTE_ETHDEV_LOG(ERR, "wrong representor format: %s\n", str);
return str == NULL ? -1 : 0;
}
diff --git a/lib/ethdev/rte_class_eth.c b/lib/ethdev/rte_class_eth.c
index b61dae849d..311beb17cb 100644
--- a/lib/ethdev/rte_class_eth.c
+++ b/lib/ethdev/rte_class_eth.c
@@ -165,7 +165,7 @@ eth_dev_iterate(const void *start,
valid_keys = eth_params_keys;
kvargs = rte_kvargs_parse(str, valid_keys);
if (kvargs == NULL) {
- RTE_LOG(ERR, EAL, "cannot parse argument list\n");
+ RTE_ETHDEV_LOG(ERR, "cannot parse argument list\n");
rte_errno = EINVAL;
return NULL;
}
diff --git a/lib/eventdev/rte_event_dma_adapter.c b/lib/eventdev/rte_event_dma_adapter.c
index af4b5ad388..cbf9405438 100644
--- a/lib/eventdev/rte_event_dma_adapter.c
+++ b/lib/eventdev/rte_event_dma_adapter.c
@@ -1046,7 +1046,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan,
sizeof(struct dma_vchan_info),
0, adapter->socket_id);
if (dev_info->vchanq == NULL) {
- printf("Queue pair add not supported\n");
+ RTE_EDEV_LOG_ERR("Queue pair add not supported");
return -ENOMEM;
}
}
@@ -1057,7 +1057,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan,
sizeof(struct dma_vchan_info),
0, adapter->socket_id);
if (dev_info->tqmap == NULL) {
- printf("tq pair add not supported\n");
+ RTE_EDEV_LOG_ERR("tq pair add not supported");
return -ENOMEM;
}
}
diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
index 6db03adf04..82ae31712d 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -314,9 +314,9 @@ rxa_event_buf_get(struct event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id,
} \
} while (0)
-#define RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(port_id, retval) do { \
+#define RTE_EVENT_ETH_RX_ADAPTER_PORTID_VALID_OR_GOTO_ERR_RET(port_id, retval) do { \
if (!rte_eth_dev_is_valid_port(port_id)) { \
- RTE_ETHDEV_LOG(ERR, "Invalid port_id=%u\n", port_id); \
+ RTE_EDEV_LOG_ERR("Invalid port_id=%u", port_id); \
ret = retval; \
goto error; \
} \
@@ -3671,7 +3671,7 @@ handle_rxa_get_queue_conf(const char *cmd __rte_unused,
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
- RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
+ RTE_EVENT_ETH_RX_ADAPTER_PORTID_VALID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
token = strtok(NULL, ",");
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
@@ -3743,7 +3743,7 @@ handle_rxa_get_queue_stats(const char *cmd __rte_unused,
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
- RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
+ RTE_EVENT_ETH_RX_ADAPTER_PORTID_VALID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
token = strtok(NULL, ",");
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
@@ -3813,7 +3813,7 @@ handle_rxa_queue_stats_reset(const char *cmd __rte_unused,
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
- RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
+ RTE_EVENT_ETH_RX_ADAPTER_PORTID_VALID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
token = strtok(NULL, ",");
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
@@ -3868,7 +3868,7 @@ handle_rxa_instance_get(const char *cmd __rte_unused,
/* Get device ID from parameter string */
eth_dev_id = strtoul(token, NULL, 10);
- RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
+ RTE_EVENT_ETH_RX_ADAPTER_PORTID_VALID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
token = strtok(NULL, ",");
RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index 0ca32d6721..ae50821a3f 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -1428,8 +1428,8 @@ rte_event_vector_pool_create(const char *name, unsigned int n,
int ret;
if (!nb_elem) {
- RTE_LOG(ERR, EVENTDEV,
- "Invalid number of elements=%d requested\n", nb_elem);
+ RTE_EDEV_LOG_ERR("Invalid number of elements=%d requested",
+ nb_elem);
rte_errno = EINVAL;
return NULL;
}
@@ -1444,7 +1444,7 @@ rte_event_vector_pool_create(const char *name, unsigned int n,
mp_ops_name = rte_mbuf_best_mempool_ops();
ret = rte_mempool_set_ops_byname(mp, mp_ops_name, NULL);
if (ret != 0) {
- RTE_LOG(ERR, EVENTDEV, "error setting mempool handler\n");
+ RTE_EDEV_LOG_ERR("error setting mempool handler");
goto err;
}
diff --git a/lib/mempool/rte_mempool_ops.c b/lib/mempool/rte_mempool_ops.c
index ae1d288f27..e871de9ec9 100644
--- a/lib/mempool/rte_mempool_ops.c
+++ b/lib/mempool/rte_mempool_ops.c
@@ -46,7 +46,7 @@ rte_mempool_register_ops(const struct rte_mempool_ops *h)
if (strlen(h->name) >= sizeof(ops->name) - 1) {
rte_spinlock_unlock(&rte_mempool_ops_table.sl);
- RTE_LOG(DEBUG, EAL, "%s(): mempool_ops <%s>: name too long\n",
+ RTE_LOG(DEBUG, MEMPOOL, "%s(): mempool_ops <%s>: name too long\n",
__func__, h->name);
rte_errno = EEXIST;
return -EEXIST;
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-03-05 17:39:31.244469409 +0800
+++ 0005-lib-use-dedicated-logtypes-and-macros.patch 2024-03-05 17:39:30.643566489 +0800
@@ -1 +1 @@
-From c07da8e381ef860e972abd90400f134c64f3f77a Mon Sep 17 00:00:00 2001
+From e421bcd7085615de38888ea6e4e3e064fe835b93 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit c07da8e381ef860e972abd90400f134c64f3f77a ]
@@ -14,2 +16,0 @@
-Cc: stable at dpdk.org
-
@@ -32 +33 @@
-index 25e3ec12d1..ead8c9a623 100644
+index b258827734..d8769f0b8d 100644
@@ -35 +36 @@
-@@ -2684,7 +2684,7 @@ rte_cryptodev_driver_id_get(const char *name)
+@@ -2682,7 +2682,7 @@ rte_cryptodev_driver_id_get(const char *name)
More information about the stable
mailing list