d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/nfp: implement dynamic logging

Browse Source 
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

---
v2: remove unsed macro RTE_LIBRTE_NFP_NET_DEBUG_INIT
This commit is contained in:
Stephen Hemminger 2017-12-18 22:38:36 -08:00 committed by Ferruh Yigit
parent 0062818856
commit c73f9b2662
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/common_base
View File

@ -266,7 +266,8 @@ CONFIG_RTE_LIBRTE_ENIC_DEBUG_FLOW=n
# Compile burst-oriented Netronome NFP PMD driver
#
CONFIG_RTE_LIBRTE_NFP_PMD=n
CONFIG_RTE_LIBRTE_NFP_DEBUG=n
CONFIG_RTE_LIBRTE_NFP_DEBUG_TX=n
CONFIG_RTE_LIBRTE_NFP_DEBUG_RX=n
#
# Compile Marvell PMD driver

14
drivers/net/nfp/nfp_net.c
View File

@ -3085,6 +3085,9 @@ nfpu_error:
return ret;
}
int nfp_logtype_init;
int nfp_logtype_driver;
static const struct rte_pci_id pci_id_nfp_pf_net_map[] = {
{
RTE_PCI_DEVICE(PCI_VENDOR_ID_NETRONOME,
@ -3158,6 +3161,17 @@ RTE_PMD_REGISTER_PCI_TABLE(net_nfp_vf, pci_id_nfp_vf_net_map);
RTE_PMD_REGISTER_KMOD_DEP(net_nfp_pf, "* igb_uio | uio_pci_generic | vfio");
RTE_PMD_REGISTER_KMOD_DEP(net_nfp_vf, "* igb_uio | uio_pci_generic | vfio");
RTE_INIT(nfp_init_log);
static void
nfp_init_log(void)
{
nfp_logtype_init = rte_log_register("pmd.nfp.init");
if (nfp_logtype_init >= 0)
rte_log_set_level(nfp_logtype_init, RTE_LOG_NOTICE);
nfp_logtype_driver = rte_log_register("pmd.nfp.driver");
if (nfp_logtype_driver >= 0)
rte_log_set_level(nfp_logtype_driver, RTE_LOG_NOTICE);
}
/*
* Local variables:
* c-file-style: "Linux"

26
drivers/net/nfp/nfp_net_logs.h
View File

@ -34,16 +34,10 @@
#include <rte_log.h>
#define RTE_LIBRTE_NFP_NET_DEBUG_INIT 1
#ifdef RTE_LIBRTE_NFP_NET_DEBUG_INIT
extern int nfp_logtype_init;
#define PMD_INIT_LOG(level, fmt, args...) \
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
#else
#define PMD_INIT_LOG(level, fmt, args...) do { } while (0)
#define PMD_INIT_FUNC_TRACE() do { } while (0)
#endif
#ifdef RTE_LIBRTE_NFP_NET_DEBUG_RX
#define PMD_RX_LOG(level, fmt, args...) \
@ -55,21 +49,15 @@
#ifdef RTE_LIBRTE_NFP_NET_DEBUG_TX
#define PMD_TX_LOG(level, fmt, args...) \
RTE_LOG(level, PMD, "%s() tx: " fmt, __func__, ## args)
#else
#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
#endif
#ifdef RTE_LIBRTE_NFP_NET_DEBUG_DRIVER
#define PMD_DRV_LOG(level, fmt, args...) \
RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args)
#else
#define PMD_DRV_LOG(level, fmt, args...) do { } while (0)
#endif
#ifdef RTE_LIBRTE_NFP_NET_DEBUG_INIT
#define ASSERT(x) if (!(x)) rte_panic("NFP_NET: x")
#else
#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
#define ASSERT(x) do { } while (0)
#endif
extern int nfp_logtype_driver;
#define PMD_DRV_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, nfp_logtype_driver, \
"%s(): " fmt, __func__, ## args)
#endif /* _NFP_NET_LOGS_H_ */