patch 'common/cnxk: fix segregation of logs based on module' has been queued to stable release 23.11.2
Xueming Li
xuemingl at nvidia.com
Fri Jul 12 12:44:57 CEST 2024
Hi,
FYI, your patch has been queued to stable release 23.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/14/24. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=bbe6254b24713f0f87a74645febd7adbdcf57d63
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From bbe6254b24713f0f87a74645febd7adbdcf57d63 Mon Sep 17 00:00:00 2001
From: Anoob Joseph <anoobj at marvell.com>
Date: Tue, 23 Apr 2024 10:44:43 +0000
Subject: [PATCH] common/cnxk: fix segregation of logs based on module
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 455a771fd6f1a9cb6edc8711ff278ad31709cf7c ]
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 <anoobj at marvell.com>
---
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 | 4 ++--
doc/guides/platform/cnxk.rst | 4 ++--
drivers/common/cnxk/roc_platform.c | 24 ++++++++++++------------
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/doc/guides/cryptodevs/cnxk.rst b/doc/guides/cryptodevs/cnxk.rst
index fbe67475be..89a6556c1d 100644
--- a/doc/guides/cryptodevs/cnxk.rst
+++ b/doc/guides/cryptodevs/cnxk.rst
@@ -197,7 +197,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
diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index cccb8a0304..c259d37109 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -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
diff --git a/doc/guides/mempool/cnxk.rst b/doc/guides/mempool/cnxk.rst
index d883b83f7b..ffd9a6de86 100644
--- a/doc/guides/mempool/cnxk.rst
+++ b/doc/guides/mempool/cnxk.rst
@@ -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
diff --git a/doc/guides/mldevs/cnxk.rst b/doc/guides/mldevs/cnxk.rst
index ae9e1fae5f..fc1bcd9cdb 100644
--- a/doc/guides/mldevs/cnxk.rst
+++ b/doc/guides/mldevs/cnxk.rst
@@ -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' |
+---+------------+-------------------------------------------------------+
diff --git a/doc/guides/nics/cnxk.rst b/doc/guides/nics/cnxk.rst
index 28d54be16d..501ef1f826 100644
--- a/doc/guides/nics/cnxk.rst
+++ b/doc/guides/nics/cnxk.rst
@@ -623,7 +623,7 @@ 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' |
+---+------------+-------------------------------------------------------+
diff --git a/doc/guides/platform/cnxk.rst b/doc/guides/platform/cnxk.rst
index 70065e3d96..0e61bc91d9 100644
--- a/doc/guides/platform/cnxk.rst
+++ b/doc/guides/platform/cnxk.rst
@@ -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
diff --git a/drivers/common/cnxk/roc_platform.c b/drivers/common/cnxk/roc_platform.c
index 15cbb6d68f..80d81742a2 100644
--- a/drivers/common/cnxk/roc_platform.c
+++ b/drivers/common/cnxk/roc_platform.c
@@ -85,15 +85,15 @@ 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_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_ree, ree, NOTICE);
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-07-12 18:40:17.349371438 +0800
+++ 0071-common-cnxk-fix-segregation-of-logs-based-on-module.patch 2024-07-12 18:40:14.186594217 +0800
@@ -1 +1 @@
-From 455a771fd6f1a9cb6edc8711ff278ad31709cf7c Mon Sep 17 00:00:00 2001
+From bbe6254b24713f0f87a74645febd7adbdcf57d63 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 455a771fd6f1a9cb6edc8711ff278ad31709cf7c ]
@@ -41 +43,0 @@
-Cc: stable at dpdk.org
@@ -49 +51 @@
- doc/guides/nics/cnxk.rst | 8 ++++----
+ doc/guides/nics/cnxk.rst | 4 ++--
@@ -51,2 +53,2 @@
- drivers/common/cnxk/roc_platform.c | 28 ++++++++++++++--------------
- 7 files changed, 25 insertions(+), 25 deletions(-)
+ drivers/common/cnxk/roc_platform.c | 24 ++++++++++++------------
+ 7 files changed, 21 insertions(+), 21 deletions(-)
@@ -55 +57 @@
-index cd5a430a4a..ac843ddc53 100644
+index fbe67475be..89a6556c1d 100644
@@ -58 +60 @@
-@@ -209,7 +209,7 @@ Debugging Options
+@@ -197,7 +197,7 @@ Debugging Options
@@ -68 +70 @@
-index 0d41aba452..d038930594 100644
+index cccb8a0304..c259d37109 100644
@@ -71 +73 @@
-@@ -216,9 +216,9 @@ Debugging Options
+@@ -208,9 +208,9 @@ Debugging Options
@@ -110 +112 @@
-index f5f296ee36..287ff79f64 100644
+index 28d54be16d..501ef1f826 100644
@@ -113 +115 @@
-@@ -684,11 +684,11 @@ Debugging Options
+@@ -623,7 +623,7 @@ Debugging Options
@@ -123,6 +124,0 @@
-- | 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' |
- +---+------------+-------------------------------------------------------+
@@ -146 +142 @@
-index 181902a585..30379c7e5e 100644
+index 15cbb6d68f..80d81742a2 100644
@@ -149 +145 @@
-@@ -85,17 +85,17 @@ roc_plt_init(void)
+@@ -85,15 +85,15 @@ roc_plt_init(void)
@@ -164,2 +159,0 @@
--RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_rep, NOTICE);
--RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_esw, NOTICE);
@@ -178,2 +171,0 @@
-+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_rep, rep, NOTICE);
-+RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_esw, esw, NOTICE);
More information about the stable
mailing list