net/nfb: use dynamic logtype
All drivers should be using dynamic logtype.
This should have been caught during initial driver review.
Since this driver requires non-standard external library this patch can not be tested by me.
--- drivers/net/nfb/nfb_ethdev.c | 22 ++++++++++------------ drivers/net/nfb/nfb_log.h | 13 +++++++++++++ drivers/net/nfb/nfb_rx.c | 9 +++++---- drivers/net/nfb/nfb_rx.h | 2 +- drivers/net/nfb/nfb_tx.c | 8 ++++---- drivers/net/nfb/nfb_tx.h | 2 +- 6 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 drivers/net/nfb/nfb_log.h
drivers/net/nfb/nfb_ethdev.c +10 -12
@@ -12,6 +12,7 @@#include <ethdev_pci.h> #include <rte_kvargs.h> +#include "nfb_log.h" #include "nfb_stats.h" #include "nfb_rx.h" #include "nfb_tx.h"
@@ -192,8 +193,7 @@ nfb_eth_dev_configure(struct rte_eth_dev *dev __rte_unused) (&nfb_timestamp_dynfield_offset, &nfb_timestamp_rx_dynflag);if (ret !=0 ) { -RTE_LOG (ERR ,PMD ,"Cannot register Rx timestamp" -" field/flag %d\n" , ret); +NFB_LOG (ERR ,"Cannot register Rx timestamp field/flag %d" , ret);nfb_close (internals->nfb);return -rte_errno; }
@@ -520,7 +520,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)struct rte_ether_addr eth_addr_init;struct rte_kvargs *kvlist; -RTE_LOG (INFO ,PMD ,"Initializing NFB device (" PCI_PRI_FMT ")\n" , +NFB_LOG (INFO ,"Initializing NFB device (" PCI_PRI_FMT ")" , pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function);
@@ -536,7 +536,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) kvlist =rte_kvargs_parse (dev->device->devargs->args,VALID_KEYS );if (kvlist ==NULL ) { -RTE_LOG (ERR ,PMD ,"Failed to parse device arguments %s" , +NFB_LOG (ERR ,"Failed to parse device arguments %s" , dev->device->devargs->args);rte_kvargs_free (kvlist);return -EINVAL ;
@@ -551,14 +551,13 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)*/ internals->nfb =nfb_open (internals->nfb_dev);if (internals->nfb ==NULL ) { -RTE_LOG (ERR ,PMD ,"nfb_open(): failed to open %s" , - internals->nfb_dev); +NFB_LOG (ERR ,"nfb_open(): failed to open %s" , internals->nfb_dev);return -EINVAL ; } data->nb_rx_queues =ndp_get_rx_queue_available_count (internals->nfb); data->nb_tx_queues =ndp_get_tx_queue_available_count (internals->nfb); -RTE_LOG (INFO ,PMD ,"Available NDP queues RX: %u TX: %u\n" , +NFB_LOG (INFO ,"Available NDP queues RX: %u TX: %u" , data->nb_rx_queues, data->nb_tx_queues); nfb_nc_rxmac_init(internals->nfb,
@@ -583,7 +582,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) data->mac_addrs =rte_zmalloc (data->name,sizeof (struct rte_ether_addr ) * mac_count,RTE_CACHE_LINE_SIZE );if (data->mac_addrs ==NULL ) { -RTE_LOG (ERR ,PMD ,"Could not alloc space for MAC address!\n" ); +NFB_LOG (ERR ,"Could not alloc space for MAC address" );nfb_close (internals->nfb);return -EINVAL ; }
@@ -601,8 +600,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) dev->data->dev_flags |=RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS ; -RTE_LOG (INFO ,PMD ,"NFB device (" -PCI_PRI_FMT ") successfully initialized\n" , +NFB_LOG (INFO ,"NFB device (" PCI_PRI_FMT ") successfully initialized" , pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function);
@@ -626,8 +624,7 @@ nfb_eth_dev_uninit(struct rte_eth_dev *dev)nfb_eth_dev_close (dev); -RTE_LOG (INFO ,PMD ,"NFB device (" -PCI_PRI_FMT ") successfully uninitialized\n" , +NFB_LOG (INFO ,"NFB device (" PCI_PRI_FMT ") successfully uninitialized" , pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function);
@@ -690,3 +687,4 @@ static struct rte_pci_driver nfb_eth_driver = {RTE_PMD_REGISTER_PCI (RTE_NFB_DRIVER_NAME , nfb_eth_driver);RTE_PMD_REGISTER_PCI_TABLE (RTE_NFB_DRIVER_NAME , nfb_pci_id_table);RTE_PMD_REGISTER_KMOD_DEP (RTE_NFB_DRIVER_NAME ,"* nfb" ); +RTE_LOG_REGISTER_DEFAULT (nfb_logtype,NOTICE );
drivers/net/nfb/nfb_log.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause +*/ + +#ifndef _NFB_STATS_H_ +#define _NFB_STATS_H_ + +extern int nfb_logtype; + +#define NFB_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, nfb_logtype, "%s(): " fmt "\n", \ + __func__, ## args) + +#endif /* _NFB_STATS_H_ */
drivers/net/nfb/nfb_rx.c +5 -4
@@ -6,6 +6,7 @@#include <rte_kvargs.h> +#include "nfb_log.h" #include "nfb_rx.h" #include "nfb.h"
@@ -19,7 +20,7 @@ nfb_eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id)int ret;if (rxq->queue ==NULL ) { -RTE_LOG (ERR ,PMD ,"RX NDP queue is NULL!\n" ); +NFP_LOG (ERR ,"RX NDP queue is NULL" );return -EINVAL ; }
@@ -40,7 +41,7 @@ nfb_eth_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rxq_id)int ret;if (rxq->queue ==NULL ) { -RTE_LOG (ERR ,PMD ,"RX NDP queue is NULL!\n" ); +NFB_LOG (ERR ,"RX NDP queue is NULL" );return -EINVAL ; }
@@ -70,8 +71,8 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev, RTE_CACHE_LINE_SIZE, socket_id);if (rxq ==NULL ) { -RTE_LOG (ERR ,PMD ,"rte_zmalloc_socket() failed for rx queue id " -"%" PRIu16"!\n" , rx_queue_id); +NFB_LOG (ERR ,"rte_zmalloc_socket() failed for rx queue id %" PRIu16, + rx_queue_id);return -ENOMEM ; }
drivers/net/nfb/nfb_rx.h +1 -1
@@ -156,7 +156,7 @@ nfb_eth_ndp_rx(void *queue,struct rte_mbuf *mbufs[nb_pkts];if (unlikely (ndp->queue ==NULL || nb_pkts ==0 )) { -RTE_LOG (ERR ,PMD ,"RX invalid arguments!\n" ); +NFB_LOG (ERR ,"RX invalid arguments" );return 0 ; }
drivers/net/nfb/nfb_tx.c +4 -4
@@ -14,7 +14,7 @@ nfb_eth_tx_queue_start(struct rte_eth_dev *dev, uint16_t txq_id)int ret;if (txq->queue ==NULL ) { -RTE_LOG (ERR ,PMD ,"RX NDP queue is NULL!\n" ); +NFB_LOG (ERR ,"RX NDP queue is NULL" );return -EINVAL ; }
@@ -35,7 +35,7 @@ nfb_eth_tx_queue_stop(struct rte_eth_dev *dev, uint16_t txq_id)int ret;if (txq->queue ==NULL ) { -RTE_LOG (ERR ,PMD ,"TX NDP queue is NULL!\n" ); +NFB_LOG (ERR ,"TX NDP queue is NULL" );return -EINVAL ; }
@@ -62,8 +62,8 @@ nfb_eth_tx_queue_setup(struct rte_eth_dev *dev, RTE_CACHE_LINE_SIZE, socket_id);if (txq ==NULL ) { -RTE_LOG (ERR ,PMD ,"rte_zmalloc_socket() failed for tx queue id " -"%" PRIu16"!\n" , tx_queue_id); +NFB_LOG (ERR ,"rte_zmalloc_socket() failed for tx queue id %" PRIu16, + tx_queue_id);return -ENOMEM ; }
drivers/net/nfb/nfb_tx.h +1 -1
@@ -140,7 +140,7 @@ nfb_eth_ndp_tx(void *queue,return 0 ;if (unlikely (ndp->queue ==NULL )) { -RTE_LOG (ERR ,PMD ,"TX invalid arguments!\n" ); +NFB_LOG (ERR ,"TX invalid arguments" );return 0 ; }
Signature · 1 line
2.42.0
Thanks for patch! There are some issues.
drivers/net/nfb/nfb_log.h line 5
Quoted 12 lines · Stephen Hemminger
drivers/net/nfb/nfb_log.h new file +5
-0@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause +*/ + +#ifndef _NFB_STATS_H_ +#define _NFB_STATS_H_
use the _NFB_LOG_H_ guards
drivers/net/nfb/nfb_log.h line 13
Quoted 8 lines
drivers/net/nfb/nfb_log.h new file +8
-0+ +extern int nfb_logtype; + +#define NFB_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, nfb_logtype, "%s(): " fmt "\n", \ + __func__, ## args) + +#endif /* _NFB_STATS_H_ */
use the _NFB_LOG_H_ guard
drivers/net/nfb/nfb_rx.c nfb_eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id) · line 23
Quoted 11 lines
drivers/net/nfb/nfb_rx.c +1
-1@@ -19,7 +20,7 @@ nfb_eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id)int ret;if (rxq->queue ==NULL ) { -RTE_LOG (ERR ,PMD ,"RX NDP queue is NULL!\n" ); +NFP_LOG (ERR ,"RX NDP queue is NULL" );
typo, should be NFB_LOG instead of NFP_LOG
drivers/net/nfb/nfb_rx.c nfb_eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id) · line 26
Quoted 4 lines
drivers/net/nfb/nfb_rx.c +0
-0return -EINVAL ; }
Also, the nfb_rx.h and nfb_tx.h files use the macro NFB_LOG inside, please add '#include "nfb_log.h"' into them (then the include in nfb_rx.c will be duplicate). Otherwise, all .c sources, which include main nfb.h, don't compile.
With these changes, the driver works.
Thank you!
Martin
Quoted 9 lines · On Thu, 07 Dec 2023 11:37:52 +0100 Martin Spinler <[email protected]> wrote:
Also, the
nfb_rx.handnfb_tx.hfiles use the macroNFB_LOGinside, please add '#include "nfb_log.h"' into them (then the include innfb_rx.cwill be duplicate). Otherwise, all .c sources, which include mainnfb.h, don't compile.With these changes, the driver works.
Thank you!
Martin
I found a few more leftover bits in nfb driver.
Will make a new patchset, and it looks like can build test in a Redhat VM.
cover net/nfb: driver cleanups
In reply to Stephen HemmingerReplace static logtype with dynamic logtype and
remove dead code. Compile tested on Fedora.
Stephen Hemminger (3):
net/nfb: remove unused device args net/nfb: make device path local to init function net/nfb: use dynamic logtype
drivers/net/nfb/nfb.h | 10 ++++---- drivers/net/nfb/nfb_ethdev.c | 44 ++++++++++-------------------------- drivers/net/nfb/nfb_rx.c | 9 ++++---- drivers/net/nfb/nfb_rx.h | 2 +- drivers/net/nfb/nfb_tx.c | 9 ++++---- drivers/net/nfb/nfb_tx.h | 2 +- 6 files changed, 27 insertions(+), 49 deletions(-)
Signature · 1 line
2.42.0
PATCH 1/3 net/nfb: remove unused device args
The driver has no entries in VALID_KEYS array so there are no device args. And after parsing it just frees the result. Looks like it was copy/pasted from some other driver.
--- drivers/net/nfb/nfb.h | 2 -- drivers/net/nfb/nfb_ethdev.c | 16 ---------------- 2 files changed, 18 deletions(-)
drivers/net/nfb/nfb.h +0 -2
@@ -36,8 +36,6 @@#define RTE_NFB_DRIVER_NAME net_nfb -/* Device arguments */ -static const char *const VALID_KEYS [] = {NULL };struct pmd_internals {uint16_t max_rxmac;
drivers/net/nfb/nfb_ethdev.c +0 -16
@@ -518,7 +518,6 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);struct rte_pci_addr *pci_addr = &pci_dev->addr;struct rte_ether_addr eth_addr_init; -struct rte_kvargs *kvlist; RTE_LOG(INFO, PMD, "Initializing NFB device (" PCI_PRI_FMT ")\n", pci_addr->domain, pci_addr->bus, pci_addr->devid,
@@ -529,21 +528,6 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); -/* Check validity of device args */ -if (dev->device->devargs !=NULL && - dev->device->devargs->args !=NULL && -strlen (dev->device->devargs->args) >0 ) { - kvlist =rte_kvargs_parse (dev->device->devargs->args, -VALID_KEYS ); -if (kvlist ==NULL ) { -RTE_LOG (ERR ,PMD ,"Failed to parse device arguments %s" , - dev->device->devargs->args); -rte_kvargs_free (kvlist); -return -EINVAL ; - } -rte_kvargs_free (kvlist); - } -/* * Get number of available DMA RX and TX queues, which is maximum * number of queues that can be created and store it in private device
Signature · 1 line
2.42.0
PATCH 2/3 net/nfb: make device path local to init function
In reply to Stephen HemmingerThe device path is only used to call nfb_open() it does not have to be stored in internal structure.
--- drivers/net/nfb/nfb.h | 2 -- drivers/net/nfb/nfb_ethdev.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-)
drivers/net/nfb/nfb.h +0 -2
@@ -42,8 +42,6 @@ struct pmd_internals {uint16_t max_txmac;struct nc_rxmac *rxmac[RTE_MAX_NC_RXMAC ];struct nc_txmac *txmac[RTE_MAX_NC_TXMAC ]; - -char nfb_dev[PATH_MAX ];struct nfb_device *nfb; };
drivers/net/nfb/nfb_ethdev.c +4 -4
@@ -518,12 +518,13 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);struct rte_pci_addr *pci_addr = &pci_dev->addr;struct rte_ether_addr eth_addr_init; +char nfb_dev[PATH_MAX ];RTE_LOG (INFO ,PMD ,"Initializing NFB device (" PCI_PRI_FMT ")\n" , pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); -snprintf (internals->nfb_dev,PATH_MAX , +snprintf (nfb_dev,sizeof (nfb_dev),"/dev/nfb/by-pci-slot/" PCI_PRI_FMT , pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function);
@@ -533,10 +534,9 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)* number of queues that can be created and store it in private device * data structure. */ - internals->nfb =nfb_open (internals->nfb_dev); + internals->nfb =nfb_open (nfb_dev);if (internals->nfb ==NULL ) { -RTE_LOG (ERR ,PMD ,"nfb_open(): failed to open %s" , - internals->nfb_dev); +RTE_LOG (ERR ,PMD ,"nfb_open(): failed to open %s" , nfb_dev);return -EINVAL ; } data->nb_rx_queues =ndp_get_rx_queue_available_count (internals->nfb);
Signature · 1 line
2.42.0
PATCH 3/3 net/nfb: use dynamic logtype
In reply to Stephen HemmingerAll drivers should be using dynamic logtype.
--- drivers/net/nfb/nfb.h | 6 +++++- drivers/net/nfb/nfb_ethdev.c | 22 +++++++++------------- drivers/net/nfb/nfb_rx.c | 9 ++++----- drivers/net/nfb/nfb_rx.h | 2 +- drivers/net/nfb/nfb_tx.c | 9 ++++----- drivers/net/nfb/nfb_tx.h | 2 +- 6 files changed, 24 insertions(+), 26 deletions(-)
drivers/net/nfb/nfb.h +5 -1
@@ -12,6 +12,11 @@#include <netcope/rxmac.h> #include <netcope/txmac.h> +extern int nfb_logtype; +#define NFB_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, nfb_logtype, "%s(): " fmt "\n", \ + __func__, ## args) +#include "nfb_rx.h" #include "nfb_tx.h"
@@ -36,7 +41,6 @@#define RTE_NFB_DRIVER_NAME net_nfb -struct pmd_internals {uint16_t max_rxmac;uint16_t max_txmac;
drivers/net/nfb/nfb_ethdev.c +9 -13
@@ -12,11 +12,9 @@#include <ethdev_pci.h> #include <rte_kvargs.h> +#include "nfb.h" #include "nfb_stats.h" -#include "nfb_rx.h" -#include "nfb_tx.h" #include "nfb_rxmode.h" -#include "nfb.h" /** * Default MAC addr
@@ -192,8 +190,7 @@ nfb_eth_dev_configure(struct rte_eth_dev *dev __rte_unused) (&nfb_timestamp_dynfield_offset, &nfb_timestamp_rx_dynflag);if (ret !=0 ) { -RTE_LOG (ERR ,PMD ,"Cannot register Rx timestamp" -" field/flag %d\n" , ret); +NFB_LOG (ERR ,"Cannot register Rx timestamp field/flag %d" , ret);nfb_close (internals->nfb);return -rte_errno; }
@@ -520,7 +517,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)struct rte_ether_addr eth_addr_init;char nfb_dev[PATH_MAX ]; -RTE_LOG (INFO ,PMD ,"Initializing NFB device (" PCI_PRI_FMT ")\n" , +NFB_LOG (INFO ,"Initializing NFB device (" PCI_PRI_FMT ")" , pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function);
@@ -536,13 +533,13 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)*/ internals->nfb =nfb_open (nfb_dev);if (internals->nfb ==NULL ) { -RTE_LOG (ERR ,PMD ,"nfb_open(): failed to open %s" , nfb_dev); +NFB_LOG (ERR ,"nfb_open(): failed to open %s" , nfb_dev);return -EINVAL ; } data->nb_rx_queues =ndp_get_rx_queue_available_count (internals->nfb); data->nb_tx_queues =ndp_get_tx_queue_available_count (internals->nfb); -RTE_LOG (INFO ,PMD ,"Available NDP queues RX: %u TX: %u\n" , +NFB_LOG (INFO ,"Available NDP queues RX: %u TX: %u\n" , data->nb_rx_queues, data->nb_tx_queues); nfb_nc_rxmac_init(internals->nfb,
@@ -567,7 +564,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) data->mac_addrs =rte_zmalloc (data->name,sizeof (struct rte_ether_addr ) * mac_count,RTE_CACHE_LINE_SIZE );if (data->mac_addrs ==NULL ) { -RTE_LOG (ERR ,PMD ,"Could not alloc space for MAC address!\n" ); +NFB_LOG (ERR ,"Could not alloc space for MAC address" );nfb_close (internals->nfb);return -EINVAL ; }
@@ -585,8 +582,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) dev->data->dev_flags |=RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS ; -RTE_LOG (INFO ,PMD ,"NFB device (" -PCI_PRI_FMT ") successfully initialized\n" , +NFB_LOG (INFO ,"NFB device (" PCI_PRI_FMT ") successfully initialized" , pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function);
@@ -610,8 +606,7 @@ nfb_eth_dev_uninit(struct rte_eth_dev *dev)nfb_eth_dev_close (dev); -RTE_LOG (INFO ,PMD ,"NFB device (" -PCI_PRI_FMT ") successfully uninitialized\n" , +NFB_LOG (INFO ,"NFB device (" PCI_PRI_FMT ") successfully uninitialized" , pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function);
@@ -674,3 +669,4 @@ static struct rte_pci_driver nfb_eth_driver = {RTE_PMD_REGISTER_PCI (RTE_NFB_DRIVER_NAME , nfb_eth_driver);RTE_PMD_REGISTER_PCI_TABLE (RTE_NFB_DRIVER_NAME , nfb_pci_id_table);RTE_PMD_REGISTER_KMOD_DEP (RTE_NFB_DRIVER_NAME ,"* nfb" ); +RTE_LOG_REGISTER_DEFAULT (nfb_logtype,NOTICE );
drivers/net/nfb/nfb_rx.c +4 -5
@@ -6,7 +6,6 @@#include <rte_kvargs.h> -#include "nfb_rx.h" #include "nfb.h" uint64_t nfb_timestamp_rx_dynflag;
@@ -19,7 +18,7 @@ nfb_eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id)int ret;if (rxq->queue ==NULL ) { -RTE_LOG (ERR ,PMD ,"RX NDP queue is NULL!\n" ); +NFB_LOG (ERR ,"RX NDP queue is NULL" );return -EINVAL ; }
@@ -40,7 +39,7 @@ nfb_eth_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rxq_id)int ret;if (rxq->queue ==NULL ) { -RTE_LOG (ERR ,PMD ,"RX NDP queue is NULL!\n" ); +NFB_LOG (ERR ,"RX NDP queue is NULL" );return -EINVAL ; }
@@ -70,8 +69,8 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev, RTE_CACHE_LINE_SIZE, socket_id);if (rxq ==NULL ) { -RTE_LOG (ERR ,PMD ,"rte_zmalloc_socket() failed for rx queue id " -"%" PRIu16"!\n" , rx_queue_id); +NFB_LOG (ERR ,"rte_zmalloc_socket() failed for rx queue id %" PRIu16, + rx_queue_id);return -ENOMEM ; }
drivers/net/nfb/nfb_rx.h +1 -1
@@ -156,7 +156,7 @@ nfb_eth_ndp_rx(void *queue,struct rte_mbuf *mbufs[nb_pkts];if (unlikely (ndp->queue ==NULL || nb_pkts ==0 )) { -RTE_LOG (ERR ,PMD ,"RX invalid arguments!\n" ); +NFB_LOG (ERR ,"RX invalid arguments" );return 0 ; }
drivers/net/nfb/nfb_tx.c +4 -5
@@ -4,7 +4,6 @@* All rights reserved. */ -#include "nfb_tx.h" #include "nfb.h" int
@@ -14,7 +13,7 @@ nfb_eth_tx_queue_start(struct rte_eth_dev *dev, uint16_t txq_id)int ret;if (txq->queue ==NULL ) { -RTE_LOG (ERR ,PMD ,"RX NDP queue is NULL!\n" ); +NFB_LOG (ERR ,"RX NDP queue is NULL" );return -EINVAL ; }
@@ -35,7 +34,7 @@ nfb_eth_tx_queue_stop(struct rte_eth_dev *dev, uint16_t txq_id)int ret;if (txq->queue ==NULL ) { -RTE_LOG (ERR ,PMD ,"TX NDP queue is NULL!\n" ); +NFB_LOG (ERR ,"TX NDP queue is NULL" );return -EINVAL ; }
@@ -62,8 +61,8 @@ nfb_eth_tx_queue_setup(struct rte_eth_dev *dev, RTE_CACHE_LINE_SIZE, socket_id);if (txq ==NULL ) { -RTE_LOG (ERR ,PMD ,"rte_zmalloc_socket() failed for tx queue id " -"%" PRIu16"!\n" , tx_queue_id); +NFB_LOG (ERR ,"rte_zmalloc_socket() failed for tx queue id %" PRIu16, + tx_queue_id);return -ENOMEM ; }
drivers/net/nfb/nfb_tx.h +1 -1
@@ -140,7 +140,7 @@ nfb_eth_ndp_tx(void *queue,return 0 ;if (unlikely (ndp->queue ==NULL )) { -RTE_LOG (ERR ,PMD ,"TX invalid arguments!\n" ); +NFB_LOG (ERR ,"TX invalid arguments" );return 0 ; }
Signature · 1 line
2.42.0
Quoted 4 lines · Stephen Hemminger
All drivers should be using dynamic logtype.
Fixes 6435f9a0ac22 ("net/nfb: add new netcope driver")Signed-off-by Stephen Hemminger <[email protected]>
Re: [PATCH 0/3] net/nfb: driver cleanups
In reply to Stephen HemmingerQuoted 9 lines · Stephen Hemminger
Replace static logtype with dynamic logtype and
remove dead code. Compile tested on Fedora.Stephen Hemminger (3):
net/nfb: remove unused device args net/nfb: make device path local to init function net/nfb: use dynamic logtype
Hi Martin,
Can you please review the set?
Re: [PATCH 0/3] net/nfb: driver cleanups
---
Hi! Thanks for the cleanup. I've tested that patchset and works fine.
I'm just not sure, if the "net/nfb: use dynamic logtype" patch merges with the "Remove uses of PMD logtype" series as they slightly differs (both links below).
Stephen, would it make sense to remove the last patch from this series?
https://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
https://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
Quoted 14 lines · Ferruh Yigit
Quoted 9 lines · Stephen Hemminger
Replace static logtype with dynamic logtype and
remove dead code. Compile tested on Fedora.Stephen Hemminger (3):
net/nfb: remove unused device args net/nfb: make device path local to init function net/nfb: use dynamic logtypeHi Martin,
Can you please review the set?
Re: [PATCH 0/3] net/nfb: driver cleanups
Quoted 7 lines · Martin Spinler
Tested-by Martin Spinler <[email protected]>Acked-by Martin Spinler <[email protected]>---
Hi! Thanks for the cleanup. I've tested that patchset and works fine.
Quoted 8 lines
I'm just not sure, if the "net/nfb: use dynamic logtype" patch merges with the "Remove uses of PMD logtype" series as they slightly differs (both links below).
Stephen, would it make sense to remove the last patch from this series?https://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
https://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
Second one is larger set with multiple components involved, this one is more specific, I will proceed with this one.
@Thomas may drop the nfp patch in that series.
Quoted 17 lines · Ferruh Yigit
Quoted 14 lines · Stephen Hemminger
Quoted 9 lines
Replace static logtype with dynamic logtype and
remove dead code. Compile tested on Fedora.Stephen Hemminger (3):
net/nfb: remove unused device args net/nfb: make device path local to init function net/nfb: use dynamic logtypeHi Martin,
Can you please review the set?
Re: [PATCH 0/3] net/nfb: driver cleanups
In reply to Stephen HemmingerQuoted 8 lines · Stephen Hemminger
Replace static logtype with dynamic logtype and
remove dead code. Compile tested on Fedora.Stephen Hemminger (3):
net/nfb: remove unused device args net/nfb: make device path local to init function net/nfb: use dynamic logtype
Moving ack from other thread:
Series applied to dpdk-next-net/main, thanks.