| Message ID | 20230522200033.2605-1-mario.limonciello@amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/4] include/linux/suspend.h: Only show pm_pr_dbg messages at suspend/resume | expand |
On Mon, May 22, 2023 at 10:01 PM Mario Limonciello <mario.limonciello@amd.com> wrote: > > All uses in the kernel are currently already oriented around > suspend/resume. As some other parts of the kernel may also use these > messages in functions that could also be used outside of > suspend/resume, only enable in suspend/resume path. > > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > --- > include/linux/suspend.h | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/include/linux/suspend.h b/include/linux/suspend.h > index d0d4598a7b3f..a40f2e667e09 100644 > --- a/include/linux/suspend.h > +++ b/include/linux/suspend.h > @@ -564,7 +564,8 @@ static inline int pm_dyn_debug_messages_on(void) > #endif > #define __pm_pr_dbg(fmt, ...) \ > do { \ > - if (pm_debug_messages_on) \ > + if (pm_debug_messages_on && \ > + pm_suspend_target_state != PM_SUSPEND_ON) \ Instead of this, I would define a function, say pm_debug_messages_should_print(), that would do the check and I would use it also in __pm_deferred_pr_dbg(). > printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); \ > else if (pm_dyn_debug_messages_on()) \ > pr_debug(fmt, ##__VA_ARGS__); \ > @@ -589,7 +590,8 @@ static inline int pm_dyn_debug_messages_on(void) > /** > * pm_pr_dbg - print pm sleep debug messages > * > - * If pm_debug_messages_on is enabled, print message. > + * If pm_debug_messages_on is enabled and the system is entering/leaving > + * suspend, print message. > * If pm_debug_messages_on is disabled and CONFIG_DYNAMIC_DEBUG is enabled, > * print message only from instances explicitly enabled on dynamic debug's > * control. > > base-commit: 42dfdd08422dec99bfe526072063f65c0b9fb7d2 > --
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index d0d4598a7b3f..a40f2e667e09 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -564,7 +564,8 @@ static inline int pm_dyn_debug_messages_on(void) #endif #define __pm_pr_dbg(fmt, ...) \ do { \ - if (pm_debug_messages_on) \ + if (pm_debug_messages_on && \ + pm_suspend_target_state != PM_SUSPEND_ON) \ printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); \ else if (pm_dyn_debug_messages_on()) \ pr_debug(fmt, ##__VA_ARGS__); \ @@ -589,7 +590,8 @@ static inline int pm_dyn_debug_messages_on(void) /** * pm_pr_dbg - print pm sleep debug messages * - * If pm_debug_messages_on is enabled, print message. + * If pm_debug_messages_on is enabled and the system is entering/leaving + * suspend, print message. * If pm_debug_messages_on is disabled and CONFIG_DYNAMIC_DEBUG is enabled, * print message only from instances explicitly enabled on dynamic debug's * control.
All uses in the kernel are currently already oriented around suspend/resume. As some other parts of the kernel may also use these messages in functions that could also be used outside of suspend/resume, only enable in suspend/resume path. Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> --- include/linux/suspend.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) base-commit: 42dfdd08422dec99bfe526072063f65c0b9fb7d2