common/cnxk: restore segregation of logs based on module

PATCH Applied Anoob Joseph 2 participants 2 messages Apr 23, 2024 – May 27, 2024

Share & tools

Anoob Joseph

author

2024-04-23 10:45 UTC #0 lore raw

PATCH 1/1 common/cnxk: restore segregation of logs based on module

Originally the logs were segregated under various labels which could be selectively enabled. It was changed to use 'pmd.common.cnxk' while changing the macro used for registering logging. Address the same by restoring the segregation.

Current logs:

        ...
        logtype3
        pmd.common.cnxk
        pmd.common.iavf
        ...

Changed to:

        ...
        logtype3
        pmd.common.cnxk.base
        pmd.common.cnxk.crypto
        pmd.common.cnxk.dpi
        pmd.common.cnxk.esw
        pmd.common.cnxk.event
        pmd.common.cnxk.flow
        pmd.common.cnxk.mbox
        pmd.common.cnxk.mempool
        pmd.common.cnxk.ml
        pmd.common.cnxk.nix
        pmd.common.cnxk.ree
        pmd.common.cnxk.rep
        pmd.common.cnxk.timer
        pmd.common.cnxk.tm
        pmd.common.iavf
        ...

Updated documentation also to reflect the same.

Fixes 233692f550a1 ("dma/cnxk: rework DMA driver")

Signed-off-by Anoob Joseph <[email protected]>

---
 doc/guides/cryptodevs/cnxk.rst     |  2 +-
 doc/guides/eventdevs/cnxk.rst      |  4 ++--
 doc/guides/mempool/cnxk.rst        |  2 +-
 doc/guides/mldevs/cnxk.rst         |  2 +-
 doc/guides/nics/cnxk.rst           |  8 ++++----
 doc/guides/platform/cnxk.rst       |  4 ++--
 drivers/common/cnxk/roc_platform.c | 28 ++++++++++++++--------------
 7 files changed, 25 insertions(+), 25 deletions(-)

doc/guides/cryptodevs/cnxk.rst +1 -1

index 8dc745dccd..1a3cf80c31 100644
@@ -209,7 +209,7 @@ Debugging Options
     +---+------------+-------------------------------------------------------+
     | # | Component  | EAL log command                                       |
     +===+============+=======================================================+
-    | 1 | CPT        | --log-level='pmd\.crypto\.cnxk,8'                     |
+    | 1 | CPT        | --log-level='pmd\.common\.cnxk\.crypto,8'             |
     +---+------------+-------------------------------------------------------+
 
 Testing

doc/guides/eventdevs/cnxk.rst +2 -2

index 9ff1052c53..af925533a3 100644
@@ -208,9 +208,9 @@ Debugging Options
    +---+------------+-------------------------------------------------------+
    | # | Component  | EAL log command                                       |
    +===+============+=======================================================+
-   | 1 | SSO        | --log-level='pmd\.event\.cnxk,8'                      |
+   | 1 | SSO        | --log-level='pmd\.common\.cnxk\.event,8'              |
    +---+------------+-------------------------------------------------------+
-   | 2 | TIM        | --log-level='pmd\.event\.cnxk\.timer,8'               |
+   | 2 | TIM        | --log-level='pmd\.common\.cnxk\.timer,8'              |
    +---+------------+-------------------------------------------------------+
 
 Limitations

doc/guides/mempool/cnxk.rst +1 -1

index d883b83f7b..ffd9a6de86 100644
@@ -72,7 +72,7 @@ Debugging Options
    +---+------------+-------------------------------------------------------+
    | # | Component  | EAL log command                                       |
    +===+============+=======================================================+
-   | 1 | NPA        | --log-level='pmd\.mempool.cnxk,8'                     |
+   | 1 | NPA        | --log-level='pmd\.common\.cnxk\.mempool,8'            |
    +---+------------+-------------------------------------------------------+
 
 Standalone mempool device

doc/guides/mldevs/cnxk.rst +1 -1

index ae9e1fae5f..fc1bcd9cdb 100644
@@ -383,7 +383,7 @@ Debugging Options
    +---+------------+-------------------------------------------------------+
    | # | Component  | EAL log command                                       |
    +===+============+=======================================================+
-   | 1 | ML         | --log-level='pmd\.ml\.cnxk,8'                         |
+   | 1 | ML         | --log-level='pmd\.common\.cnxk\.ml,8'                 |
    +---+------------+-------------------------------------------------------+

doc/guides/nics/cnxk.rst +4 -4

index f2d726047e..227270353f 100644
@@ -701,11 +701,11 @@ Debugging Options
    +---+------------+-------------------------------------------------------+
    | # | Component  | EAL log command                                       |
    +===+============+=======================================================+
-   | 1 | NIX        | --log-level='pmd\.net.cnxk,8'                         |
+   | 1 | NIX        | --log-level='pmd\.common.cnxk\.nix,8'                 |
    +---+------------+-------------------------------------------------------+
-   | 2 | NPC        | --log-level='pmd\.net.cnxk\.flow,8'                   |
+   | 2 | NPC        | --log-level='pmd\.common.cnxk\.flow,8'                |
    +---+------------+-------------------------------------------------------+
-   | 3 | REP        | --log-level='pmd\.net.cnxk\.rep,8'                    |
+   | 3 | REP        | --log-level='pmd\.common.cnxk\.rep,8'                 |
    +---+------------+-------------------------------------------------------+
-   | 4 | ESW        | --log-level='pmd\.net.cnxk\.esw,8'                    |
+   | 4 | ESW        | --log-level='pmd\.common.cnxk\.esw,8'                 |
    +---+------------+-------------------------------------------------------+

doc/guides/platform/cnxk.rst +2 -2

index 70065e3d96..0e61bc91d9 100644
@@ -250,9 +250,9 @@ Debugging Options
    +---+------------+-------------------------------------------------------+
    | # | Component  | EAL log command                                       |
    +===+============+=======================================================+
-   | 1 | Common     | --log-level='pmd\.cnxk\.base,8'                       |
+   | 1 | Common     | --log-level='pmd\.common\.cnxk\.base,8'               |
    +---+------------+-------------------------------------------------------+
-   | 2 | Mailbox    | --log-level='pmd\.cnxk\.mbox,8'                       |
+   | 2 | Mailbox    | --log-level='pmd\.common\.cnxk\.mbox,8'               |
    +---+------------+-------------------------------------------------------+
 
 Debugfs support

drivers/common/cnxk/roc_platform.c +14 ~~-14~~

index 181902a585..30379c7e5e 100644
@@ -85,17 +85,17 @@ roc_plt_init(void)
 	return 0;
 }
 
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_base, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_mbox, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_cpt, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_ml, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_npa, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_nix, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_npc, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_sso, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_tim, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_tm, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_dpi, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_rep, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_esw, NOTICE);
-RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_ree, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_base, base, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_mbox, mbox, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_cpt, crypto, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_ml, ml, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_npa, mempool, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_nix, nix, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_npc, flow, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_sso, event, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_tim, timer, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_tm, tm, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_dpi, dpi, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_rep, rep, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_esw, esw, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_ree, ree, NOTICE);

Signature · 1 line

2.43.2

Jerin Jacob

Applied

2024-05-27 15:03 UTC #1 lore raw

Quoted 33 lines · Anoob Joseph

Originally the logs were segregated under various labels which could be selectively enabled. It was changed to use 'pmd.common.cnxk' while changing the macro used for registering logging. Address the same by restoring the segregation.
Current logs:
        ...
        logtype3
        pmd.common.cnxk
        pmd.common.iavf
        ...
Changed to:
        ...
        logtype3
        pmd.common.cnxk.base
        pmd.common.cnxk.crypto
        pmd.common.cnxk.dpi
        pmd.common.cnxk.esw
        pmd.common.cnxk.event
        pmd.common.cnxk.flow
        pmd.common.cnxk.mbox
        pmd.common.cnxk.mempool
        pmd.common.cnxk.ml
        pmd.common.cnxk.nix
        pmd.common.cnxk.ree
        pmd.common.cnxk.rep
        pmd.common.cnxk.timer
        pmd.common.cnxk.tm
        pmd.common.iavf
        ...

Quoted 5 lines

Updated documentation also to reflect the same.
Fixes 233692f550a1 ("dma/cnxk: rework DMA driver")
Signed-off-by Anoob Joseph <[email protected]>

Applied to dpdk-next-net-mrvl/for-main. Thanks