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

net/bnx2x: fix dynamic logging

Browse Source 
Use rte_log() rather than RTE_LOG() for dynamic logging. Rearrange
dynamic log types to the top and configurable log types to bottom.
Remove unused RTE_LIBRTE_BNX2X_DEBUG_TX_FREE

Fixes: ba7eeb035a ("net/bnx2x: fix logging to include device name")
Cc: stable@dpdk.org

Signed-off-by: Rasesh Mody <rasesh.mody@cavium.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Rasesh Mody 2018-11-08 21:19:26 +00:00 committed by Ferruh Yigit
parent 0541588a44
commit 853c782496
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/bnx2x/bnx2x_logs.h
View File

@ -10,43 +10,40 @@
extern int bnx2x_logtype_init; extern int bnx2x_logtype_init;
#define PMD_INIT_LOG(level, sc, fmt, args...) \ #define PMD_INIT_LOG(level, sc, fmt, args...) \
RTE_LOG(level, PMD, \ rte_log(RTE_LOG_ ## level, bnx2x_logtype_init, \
"[bnx2x_pmd: %s] %s() " fmt "\n", (sc)->devinfo.name, __func__, ##args) "[bnx2x_pmd: %s] %s() " fmt "\n", (sc)->devinfo.name, __func__, ##args)
#define PMD_INIT_FUNC_TRACE(sc) PMD_INIT_LOG(DEBUG, sc, " >>") #define PMD_INIT_FUNC_TRACE(sc) PMD_INIT_LOG(DEBUG, sc, " >>")
extern int bnx2x_logtype_driver;
#define PMD_DRV_LOG_RAW(level, sc, fmt, args...) \
rte_log(RTE_LOG_ ## level, bnx2x_logtype_driver, \
"[%s:%d(%s)] " fmt, __func__, __LINE__, \
(sc)->devinfo.name ? (sc)->devinfo.name : "", ## args)
#define PMD_DRV_LOG(level, sc, fmt, args...) \
PMD_DRV_LOG_RAW(level, sc, fmt "\n", ## args)
#ifdef RTE_LIBRTE_BNX2X_DEBUG_RX #ifdef RTE_LIBRTE_BNX2X_DEBUG_RX
#define PMD_RX_LOG(level, fmt, args...) \ #define PMD_RX_LOG(level, fmt, args...) \
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) rte_log(RTE_LOG_ ## level, bnx2x_logtype_driver, \
"%s(): " fmt "\n", __func__, ## args)
#else #else
#define PMD_RX_LOG(level, fmt, args...) do { } while(0) #define PMD_RX_LOG(level, fmt, args...) do { } while(0)
#endif #endif
#ifdef RTE_LIBRTE_BNX2X_DEBUG_TX #ifdef RTE_LIBRTE_BNX2X_DEBUG_TX
#define PMD_TX_LOG(level, fmt, args...) \ #define PMD_TX_LOG(level, fmt, args...) \
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) rte_log(RTE_LOG_ ## level, bnx2x_logtype_driver, \
"%s(): " fmt "\n", __func__, ## args)
#else #else
#define PMD_TX_LOG(level, fmt, args...) do { } while(0) #define PMD_TX_LOG(level, fmt, args...) do { } while(0)
#endif #endif
#ifdef RTE_LIBRTE_BNX2X_DEBUG_TX_FREE
#define PMD_TX_FREE_LOG(level, fmt, args...) \
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
#else
#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0)
#endif
extern int bnx2x_logtype_driver;
#define PMD_DRV_LOG_RAW(level, sc, fmt, args...) \
RTE_LOG(level, PMD, "[%s:%d(%s)] " fmt, __func__, __LINE__, \
(sc)->devinfo.name ? (sc)->devinfo.name : "", ## args)
#define PMD_DRV_LOG(level, sc, fmt, args...) \
PMD_DRV_LOG_RAW(level, sc, fmt "\n", ## args)
#ifdef RTE_LIBRTE_BNX2X_DEBUG_PERIODIC #ifdef RTE_LIBRTE_BNX2X_DEBUG_PERIODIC
#define PMD_DEBUG_PERIODIC_LOG(level, sc, fmt, args...) \ #define PMD_DEBUG_PERIODIC_LOG(level, sc, fmt, args...) \
RTE_LOG(level, PMD, "%s(%s): " fmt "\n", __func__, \ rte_log(RTE_LOG_ ## level, bnx2x_logtype_driver, \
"%s(%s): " fmt "\n", __func__, \
(sc)->devinfo.name ? (sc)->devinfo.name : "", ## args) (sc)->devinfo.name ? (sc)->devinfo.name : "", ## args)
#else #else
#define PMD_DEBUG_PERIODIC_LOG(level, sc, fmt, args...) do { } while (0) #define PMD_DEBUG_PERIODIC_LOG(level, sc, fmt, args...) do { } while (0)