[10/13] drivers/common: use log register macro
diff mbox series

Message ID 20200617063047.1555518-11-jerinj@marvell.com
State Superseded
Delegated to: Thomas Monjalon
Headers show
Series
  • rte_log registration usage improvement
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Jerin Jacob Kollanukkaran June 17, 2020, 6:30 a.m. UTC
From: Jerin Jacob <jerinj@marvell.com>

Use log register macro to avoid the code duplication
in the log registration process.

Signed-off-by: Jerin Jacob <jerinj@marvell.com>
---
 drivers/common/dpaax/dpaax_iova_table.c | 10 +--
 drivers/common/iavf/iavf_impl.c         |  9 +--
 drivers/common/octeontx/octeontx_mbox.c |  9 +--
 drivers/common/octeontx2/otx2_common.c  | 96 +++----------------------
 drivers/common/qat/qat_logs.c           | 17 +----
 5 files changed, 15 insertions(+), 126 deletions(-)

Comments

Sachin Saxena (OSS) June 21, 2020, 9:48 a.m. UTC | #1
Acked-by: Sachin Saxena<sachin.saxena@oss.nxp.com>


On 17-Jun-20 12:00 PM, jerinj@marvell.com wrote:
> From: Jerin Jacob <jerinj@marvell.com>
>
> Use log register macro to avoid the code duplication
> in the log registration process.
>
> Signed-off-by: Jerin Jacob <jerinj@marvell.com>
> ---
>   drivers/common/dpaax/dpaax_iova_table.c | 10 +--
>   drivers/common/iavf/iavf_impl.c         |  9 +--
>   drivers/common/octeontx/octeontx_mbox.c |  9 +--
>   drivers/common/octeontx2/otx2_common.c  | 96 +++----------------------
>   drivers/common/qat/qat_logs.c           | 17 +----
>   5 files changed, 15 insertions(+), 126 deletions(-)
>
> diff --git a/drivers/common/dpaax/dpaax_iova_table.c b/drivers/common/dpaax/dpaax_iova_table.c
> index 98b076e09..5ba8ed193 100644
> --- a/drivers/common/dpaax/dpaax_iova_table.c
> +++ b/drivers/common/dpaax/dpaax_iova_table.c
> @@ -7,9 +7,6 @@
>   #include "dpaax_iova_table.h"
>   #include "dpaax_logs.h"
>   
> -/* Global dpaax logger identifier */
> -int dpaax_logger;
> -
>   /* Global table reference */
>   struct dpaax_iova_table *dpaax_iova_table_p;
>   
> @@ -463,9 +460,4 @@ dpaax_handle_memevents(void)
>   					       dpaax_memevent_cb, NULL);
>   }
>   
> -RTE_INIT(dpaax_log)
> -{
> -	dpaax_logger = rte_log_register("pmd.common.dpaax");
> -	if (dpaax_logger >= 0)
> -		rte_log_set_level(dpaax_logger, RTE_LOG_ERR);
> -}
> +RTE_LOG_REGISTER(dpaax_logger, pmd.common.dpaax, ERR);
> diff --git a/drivers/common/iavf/iavf_impl.c b/drivers/common/iavf/iavf_impl.c
> index 6174a9144..fc0da3175 100644
> --- a/drivers/common/iavf/iavf_impl.c
> +++ b/drivers/common/iavf/iavf_impl.c
> @@ -13,8 +13,6 @@
>   #include "iavf_type.h"
>   #include "iavf_prototype.h"
>   
> -int iavf_common_logger;
> -
>   enum iavf_status
>   iavf_allocate_dma_mem_d(__rte_unused struct iavf_hw *hw,
>   			struct iavf_dma_mem *mem,
> @@ -87,9 +85,4 @@ iavf_free_virt_mem_d(__rte_unused struct iavf_hw *hw,
>   	return IAVF_SUCCESS;
>   }
>   
> -RTE_INIT(iavf_common_init_log)
> -{
> -	iavf_common_logger = rte_log_register("pmd.common.iavf");
> -	if (iavf_common_logger >= 0)
> -		rte_log_set_level(iavf_common_logger, RTE_LOG_NOTICE);
> -}
> +RTE_LOG_REGISTER(iavf_common_logger, pmd.common.iavf, NOTICE);
> diff --git a/drivers/common/octeontx/octeontx_mbox.c b/drivers/common/octeontx/octeontx_mbox.c
> index effe0b267..f414267e4 100644
> --- a/drivers/common/octeontx/octeontx_mbox.c
> +++ b/drivers/common/octeontx/octeontx_mbox.c
> @@ -68,14 +68,7 @@ struct mbox_intf_ver {
>   	uint32_t minor:10;
>   };
>   
> -int octeontx_logtype_mbox;
> -
> -RTE_INIT(otx_init_log)
> -{
> -	octeontx_logtype_mbox = rte_log_register("pmd.octeontx.mbox");
> -	if (octeontx_logtype_mbox >= 0)
> -		rte_log_set_level(octeontx_logtype_mbox, RTE_LOG_NOTICE);
> -}
> +RTE_LOG_REGISTER(octeontx_logtype_mbox, pmd.octeontx.mbox, NOTICE);
>   
>   static inline void
>   mbox_msgcpy(volatile uint8_t *d, volatile const uint8_t *s, uint16_t size)
> diff --git a/drivers/common/octeontx2/otx2_common.c b/drivers/common/octeontx2/otx2_common.c
> index 5e7272f69..b292e999a 100644
> --- a/drivers/common/octeontx2/otx2_common.c
> +++ b/drivers/common/octeontx2/otx2_common.c
> @@ -203,89 +203,13 @@ void otx2_parse_common_devargs(struct rte_kvargs *kvlist)
>   	idev->npa_lock_mask = npa_lock_mask;
>   }
>   
> -/**
> - * @internal
> - */
> -int otx2_logtype_base;
> -/**
> - * @internal
> - */
> -int otx2_logtype_mbox;
> -/**
> - * @internal
> - */
> -int otx2_logtype_npa;
> -/**
> - * @internal
> - */
> -int otx2_logtype_nix;
> -/**
> - * @internal
> - */
> -int otx2_logtype_npc;
> -/**
> - * @internal
> - */
> -int otx2_logtype_tm;
> -/**
> - * @internal
> - */
> -int otx2_logtype_sso;
> -/**
> - * @internal
> - */
> -int otx2_logtype_tim;
> -/**
> - * @internal
> - */
> -int otx2_logtype_dpi;
> -/**
> - * @internal
> - */
> -int otx2_logtype_ep;
> -
> -RTE_INIT(otx2_log_init);
> -static void
> -otx2_log_init(void)
> -{
> -	otx2_logtype_base = rte_log_register("pmd.octeontx2.base");
> -	if (otx2_logtype_base >= 0)
> -		rte_log_set_level(otx2_logtype_base, RTE_LOG_NOTICE);
> -
> -	otx2_logtype_mbox = rte_log_register("pmd.octeontx2.mbox");
> -	if (otx2_logtype_mbox >= 0)
> -		rte_log_set_level(otx2_logtype_mbox, RTE_LOG_NOTICE);
> -
> -	otx2_logtype_npa = rte_log_register("pmd.mempool.octeontx2");
> -	if (otx2_logtype_npa >= 0)
> -		rte_log_set_level(otx2_logtype_npa, RTE_LOG_NOTICE);
> -
> -	otx2_logtype_nix = rte_log_register("pmd.net.octeontx2");
> -	if (otx2_logtype_nix >= 0)
> -		rte_log_set_level(otx2_logtype_nix, RTE_LOG_NOTICE);
> -
> -	otx2_logtype_npc = rte_log_register("pmd.net.octeontx2.flow");
> -	if (otx2_logtype_npc >= 0)
> -		rte_log_set_level(otx2_logtype_npc, RTE_LOG_NOTICE);
> -
> -	otx2_logtype_tm = rte_log_register("pmd.net.octeontx2.tm");
> -	if (otx2_logtype_tm >= 0)
> -		rte_log_set_level(otx2_logtype_tm, RTE_LOG_NOTICE);
> -
> -	otx2_logtype_sso = rte_log_register("pmd.event.octeontx2");
> -	if (otx2_logtype_sso >= 0)
> -		rte_log_set_level(otx2_logtype_sso, RTE_LOG_NOTICE);
> -
> -	otx2_logtype_tim = rte_log_register("pmd.event.octeontx2.timer");
> -	if (otx2_logtype_tim >= 0)
> -		rte_log_set_level(otx2_logtype_tim, RTE_LOG_NOTICE);
> -
> -	otx2_logtype_dpi = rte_log_register("pmd.raw.octeontx2.dpi");
> -	if (otx2_logtype_dpi >= 0)
> -		rte_log_set_level(otx2_logtype_dpi, RTE_LOG_NOTICE);
> -
> -	otx2_logtype_ep = rte_log_register("pmd.raw.octeontx2.ep");
> -	if (otx2_logtype_ep >= 0)
> -		rte_log_set_level(otx2_logtype_ep, RTE_LOG_NOTICE);
> -
> -}
> +RTE_LOG_REGISTER(otx2_logtype_base, pmd.octeontx2.base, NOTICE);
> +RTE_LOG_REGISTER(otx2_logtype_mbox, pmd.octeontx2.mbox, NOTICE);
> +RTE_LOG_REGISTER(otx2_logtype_npa, pmd.mempool.octeontx2, NOTICE);
> +RTE_LOG_REGISTER(otx2_logtype_nix, pmd.net.octeontx2, NOTICE);
> +RTE_LOG_REGISTER(otx2_logtype_npc, pmd.net.octeontx2.flow, NOTICE);
> +RTE_LOG_REGISTER(otx2_logtype_tm, pmd.net.octeontx2.tm, NOTICE);
> +RTE_LOG_REGISTER(otx2_logtype_sso, pmd.event.octeontx2, NOTICE);
> +RTE_LOG_REGISTER(otx2_logtype_tim, pmd.event.octeontx2.timer, NOTICE);
> +RTE_LOG_REGISTER(otx2_logtype_dpi, pmd.raw.octeontx2.dpi, NOTICE);
> +RTE_LOG_REGISTER(otx2_logtype_ep, pmd.raw.octeontx2.ep, NOTICE);
> diff --git a/drivers/common/qat/qat_logs.c b/drivers/common/qat/qat_logs.c
> index dfd0cbe5d..fa48be53c 100644
> --- a/drivers/common/qat/qat_logs.c
> +++ b/drivers/common/qat/qat_logs.c
> @@ -7,9 +7,6 @@
>   
>   #include "qat_logs.h"
>   
> -int qat_gen_logtype;
> -int qat_dp_logtype;
> -
>   int
>   qat_hexdump_log(uint32_t level, uint32_t logtype, const char *title,
>   		const void *buf, unsigned int len)
> @@ -20,15 +17,5 @@ qat_hexdump_log(uint32_t level, uint32_t logtype, const char *title,
>   	return 0;
>   }
>   
> -RTE_INIT(qat_pci_init_log)
> -{
> -	/* Non-data-path logging for pci device and all services */
> -	qat_gen_logtype = rte_log_register("pmd.qat_general");
> -	if (qat_gen_logtype >= 0)
> -		rte_log_set_level(qat_gen_logtype, RTE_LOG_NOTICE);
> -
> -	/* data-path logging for all services */
> -	qat_dp_logtype = rte_log_register("pmd.qat_dp");
> -	if (qat_dp_logtype >= 0)
> -		rte_log_set_level(qat_dp_logtype, RTE_LOG_NOTICE);
> -}
> +RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat_general, NOTICE);
> +RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat_dp, NOTICE);

Patch
diff mbox series

diff --git a/drivers/common/dpaax/dpaax_iova_table.c b/drivers/common/dpaax/dpaax_iova_table.c
index 98b076e09..5ba8ed193 100644
--- a/drivers/common/dpaax/dpaax_iova_table.c
+++ b/drivers/common/dpaax/dpaax_iova_table.c
@@ -7,9 +7,6 @@ 
 #include "dpaax_iova_table.h"
 #include "dpaax_logs.h"
 
-/* Global dpaax logger identifier */
-int dpaax_logger;
-
 /* Global table reference */
 struct dpaax_iova_table *dpaax_iova_table_p;
 
@@ -463,9 +460,4 @@  dpaax_handle_memevents(void)
 					       dpaax_memevent_cb, NULL);
 }
 
-RTE_INIT(dpaax_log)
-{
-	dpaax_logger = rte_log_register("pmd.common.dpaax");
-	if (dpaax_logger >= 0)
-		rte_log_set_level(dpaax_logger, RTE_LOG_ERR);
-}
+RTE_LOG_REGISTER(dpaax_logger, pmd.common.dpaax, ERR);
diff --git a/drivers/common/iavf/iavf_impl.c b/drivers/common/iavf/iavf_impl.c
index 6174a9144..fc0da3175 100644
--- a/drivers/common/iavf/iavf_impl.c
+++ b/drivers/common/iavf/iavf_impl.c
@@ -13,8 +13,6 @@ 
 #include "iavf_type.h"
 #include "iavf_prototype.h"
 
-int iavf_common_logger;
-
 enum iavf_status
 iavf_allocate_dma_mem_d(__rte_unused struct iavf_hw *hw,
 			struct iavf_dma_mem *mem,
@@ -87,9 +85,4 @@  iavf_free_virt_mem_d(__rte_unused struct iavf_hw *hw,
 	return IAVF_SUCCESS;
 }
 
-RTE_INIT(iavf_common_init_log)
-{
-	iavf_common_logger = rte_log_register("pmd.common.iavf");
-	if (iavf_common_logger >= 0)
-		rte_log_set_level(iavf_common_logger, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(iavf_common_logger, pmd.common.iavf, NOTICE);
diff --git a/drivers/common/octeontx/octeontx_mbox.c b/drivers/common/octeontx/octeontx_mbox.c
index effe0b267..f414267e4 100644
--- a/drivers/common/octeontx/octeontx_mbox.c
+++ b/drivers/common/octeontx/octeontx_mbox.c
@@ -68,14 +68,7 @@  struct mbox_intf_ver {
 	uint32_t minor:10;
 };
 
-int octeontx_logtype_mbox;
-
-RTE_INIT(otx_init_log)
-{
-	octeontx_logtype_mbox = rte_log_register("pmd.octeontx.mbox");
-	if (octeontx_logtype_mbox >= 0)
-		rte_log_set_level(octeontx_logtype_mbox, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(octeontx_logtype_mbox, pmd.octeontx.mbox, NOTICE);
 
 static inline void
 mbox_msgcpy(volatile uint8_t *d, volatile const uint8_t *s, uint16_t size)
diff --git a/drivers/common/octeontx2/otx2_common.c b/drivers/common/octeontx2/otx2_common.c
index 5e7272f69..b292e999a 100644
--- a/drivers/common/octeontx2/otx2_common.c
+++ b/drivers/common/octeontx2/otx2_common.c
@@ -203,89 +203,13 @@  void otx2_parse_common_devargs(struct rte_kvargs *kvlist)
 	idev->npa_lock_mask = npa_lock_mask;
 }
 
-/**
- * @internal
- */
-int otx2_logtype_base;
-/**
- * @internal
- */
-int otx2_logtype_mbox;
-/**
- * @internal
- */
-int otx2_logtype_npa;
-/**
- * @internal
- */
-int otx2_logtype_nix;
-/**
- * @internal
- */
-int otx2_logtype_npc;
-/**
- * @internal
- */
-int otx2_logtype_tm;
-/**
- * @internal
- */
-int otx2_logtype_sso;
-/**
- * @internal
- */
-int otx2_logtype_tim;
-/**
- * @internal
- */
-int otx2_logtype_dpi;
-/**
- * @internal
- */
-int otx2_logtype_ep;
-
-RTE_INIT(otx2_log_init);
-static void
-otx2_log_init(void)
-{
-	otx2_logtype_base = rte_log_register("pmd.octeontx2.base");
-	if (otx2_logtype_base >= 0)
-		rte_log_set_level(otx2_logtype_base, RTE_LOG_NOTICE);
-
-	otx2_logtype_mbox = rte_log_register("pmd.octeontx2.mbox");
-	if (otx2_logtype_mbox >= 0)
-		rte_log_set_level(otx2_logtype_mbox, RTE_LOG_NOTICE);
-
-	otx2_logtype_npa = rte_log_register("pmd.mempool.octeontx2");
-	if (otx2_logtype_npa >= 0)
-		rte_log_set_level(otx2_logtype_npa, RTE_LOG_NOTICE);
-
-	otx2_logtype_nix = rte_log_register("pmd.net.octeontx2");
-	if (otx2_logtype_nix >= 0)
-		rte_log_set_level(otx2_logtype_nix, RTE_LOG_NOTICE);
-
-	otx2_logtype_npc = rte_log_register("pmd.net.octeontx2.flow");
-	if (otx2_logtype_npc >= 0)
-		rte_log_set_level(otx2_logtype_npc, RTE_LOG_NOTICE);
-
-	otx2_logtype_tm = rte_log_register("pmd.net.octeontx2.tm");
-	if (otx2_logtype_tm >= 0)
-		rte_log_set_level(otx2_logtype_tm, RTE_LOG_NOTICE);
-
-	otx2_logtype_sso = rte_log_register("pmd.event.octeontx2");
-	if (otx2_logtype_sso >= 0)
-		rte_log_set_level(otx2_logtype_sso, RTE_LOG_NOTICE);
-
-	otx2_logtype_tim = rte_log_register("pmd.event.octeontx2.timer");
-	if (otx2_logtype_tim >= 0)
-		rte_log_set_level(otx2_logtype_tim, RTE_LOG_NOTICE);
-
-	otx2_logtype_dpi = rte_log_register("pmd.raw.octeontx2.dpi");
-	if (otx2_logtype_dpi >= 0)
-		rte_log_set_level(otx2_logtype_dpi, RTE_LOG_NOTICE);
-
-	otx2_logtype_ep = rte_log_register("pmd.raw.octeontx2.ep");
-	if (otx2_logtype_ep >= 0)
-		rte_log_set_level(otx2_logtype_ep, RTE_LOG_NOTICE);
-
-}
+RTE_LOG_REGISTER(otx2_logtype_base, pmd.octeontx2.base, NOTICE);
+RTE_LOG_REGISTER(otx2_logtype_mbox, pmd.octeontx2.mbox, NOTICE);
+RTE_LOG_REGISTER(otx2_logtype_npa, pmd.mempool.octeontx2, NOTICE);
+RTE_LOG_REGISTER(otx2_logtype_nix, pmd.net.octeontx2, NOTICE);
+RTE_LOG_REGISTER(otx2_logtype_npc, pmd.net.octeontx2.flow, NOTICE);
+RTE_LOG_REGISTER(otx2_logtype_tm, pmd.net.octeontx2.tm, NOTICE);
+RTE_LOG_REGISTER(otx2_logtype_sso, pmd.event.octeontx2, NOTICE);
+RTE_LOG_REGISTER(otx2_logtype_tim, pmd.event.octeontx2.timer, NOTICE);
+RTE_LOG_REGISTER(otx2_logtype_dpi, pmd.raw.octeontx2.dpi, NOTICE);
+RTE_LOG_REGISTER(otx2_logtype_ep, pmd.raw.octeontx2.ep, NOTICE);
diff --git a/drivers/common/qat/qat_logs.c b/drivers/common/qat/qat_logs.c
index dfd0cbe5d..fa48be53c 100644
--- a/drivers/common/qat/qat_logs.c
+++ b/drivers/common/qat/qat_logs.c
@@ -7,9 +7,6 @@ 
 
 #include "qat_logs.h"
 
-int qat_gen_logtype;
-int qat_dp_logtype;
-
 int
 qat_hexdump_log(uint32_t level, uint32_t logtype, const char *title,
 		const void *buf, unsigned int len)
@@ -20,15 +17,5 @@  qat_hexdump_log(uint32_t level, uint32_t logtype, const char *title,
 	return 0;
 }
 
-RTE_INIT(qat_pci_init_log)
-{
-	/* Non-data-path logging for pci device and all services */
-	qat_gen_logtype = rte_log_register("pmd.qat_general");
-	if (qat_gen_logtype >= 0)
-		rte_log_set_level(qat_gen_logtype, RTE_LOG_NOTICE);
-
-	/* data-path logging for all services */
-	qat_dp_logtype = rte_log_register("pmd.qat_dp");
-	if (qat_dp_logtype >= 0)
-		rte_log_set_level(qat_dp_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat_general, NOTICE);
+RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat_dp, NOTICE);