diff mbox series

[v3,1/4] include/linux/suspend.h: Only show pm_pr_dbg messages at suspend/resume

Message ID 20230601232923.1248-1-mario.limonciello@amd.com
State New
Headers show
Series [v3,1/4] include/linux/suspend.h: Only show pm_pr_dbg messages at suspend/resume | expand

Commit Message

Mario Limonciello June 1, 2023, 11:29 p.m. UTC
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>
---
v1->v2:
 * Remove pointless do/while
 * Add a function pm_debug_messages_should_print
 * Export pm_debug_messages_should_print so modules can use it too.
---
 include/linux/suspend.h | 20 +++++++++-----------
 kernel/power/main.c     |  6 ++++++
 2 files changed, 15 insertions(+), 11 deletions(-)


base-commit: 7736c431466abb54a2679dc257f739fddfa84295

Comments

kernel test robot June 2, 2023, 6:09 a.m. UTC | #1
Hi Mario,

kernel test robot noticed the following build warnings:

[auto build test WARNING on 7736c431466abb54a2679dc257f739fddfa84295]

url:    https://github.com/intel-lab-lkp/linux/commits/Mario-Limonciello/ACPI-x86-Add-pm_debug_messages-for-LPS0-_DSM-state-tracking/20230602-073044
base:   7736c431466abb54a2679dc257f739fddfa84295
patch link:    https://lore.kernel.org/r/20230601232923.1248-1-mario.limonciello%40amd.com
patch subject: [PATCH v3 1/4] include/linux/suspend.h: Only show pm_pr_dbg messages at suspend/resume
config: powerpc-randconfig-r035-20230531 (https://download.01.org/0day-ci/archive/20230602/202306021344.JymS3JYg-lkp@intel.com/config)
compiler: powerpc-linux-gcc (GCC) 12.3.0
reproduce (this is a W=1 build):
        mkdir -p ~/bin
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/5828d770a5f17c4028520050068fd3cdd13b80a1
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Mario-Limonciello/ACPI-x86-Add-pm_debug_messages-for-LPS0-_DSM-state-tracking/20230602-073044
        git checkout 5828d770a5f17c4028520050068fd3cdd13b80a1
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=powerpc olddefconfig
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=powerpc SHELL=/bin/bash drivers/base/power/ kernel/power/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202306021344.JymS3JYg-lkp@intel.com/

All warnings (new ones prefixed by >>):

   drivers/base/power/wakeup.c: In function 'pm_print_active_wakeup_sources':
>> drivers/base/power/wakeup.c:861:12: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else]
     861 |         if (!active && last_activity_ws)
         |            ^
--
   kernel/power/hibernate.c: In function 'disk_store':
>> kernel/power/hibernate.c:1158:12: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else]
    1158 |         if (!error)
         |            ^


vim +/else +861 drivers/base/power/wakeup.c

074037ec79bea7 Rafael J. Wysocki  2010-09-22  841  
bb177fedd348c9 Julius Werner      2013-06-12  842  void pm_print_active_wakeup_sources(void)
a938da0682c248 Todd Poynor        2012-08-12  843  {
a938da0682c248 Todd Poynor        2012-08-12  844  	struct wakeup_source *ws;
ea0212f40c6bc0 Thomas Gleixner    2017-06-25  845  	int srcuidx, active = 0;
a938da0682c248 Todd Poynor        2012-08-12  846  	struct wakeup_source *last_activity_ws = NULL;
a938da0682c248 Todd Poynor        2012-08-12  847  
ea0212f40c6bc0 Thomas Gleixner    2017-06-25  848  	srcuidx = srcu_read_lock(&wakeup_srcu);
2591e7b17c0d3f Madhuparna Bhowmik 2020-03-04  849  	list_for_each_entry_rcu_locked(ws, &wakeup_sources, entry) {
a938da0682c248 Todd Poynor        2012-08-12  850  		if (ws->active) {
74a1dd86d1739e Stephen Boyd       2019-03-25  851  			pm_pr_dbg("active wakeup source: %s\n", ws->name);
a938da0682c248 Todd Poynor        2012-08-12  852  			active = 1;
a938da0682c248 Todd Poynor        2012-08-12  853  		} else if (!active &&
a938da0682c248 Todd Poynor        2012-08-12  854  			   (!last_activity_ws ||
a938da0682c248 Todd Poynor        2012-08-12  855  			    ktime_to_ns(ws->last_time) >
a938da0682c248 Todd Poynor        2012-08-12  856  			    ktime_to_ns(last_activity_ws->last_time))) {
a938da0682c248 Todd Poynor        2012-08-12  857  			last_activity_ws = ws;
a938da0682c248 Todd Poynor        2012-08-12  858  		}
a938da0682c248 Todd Poynor        2012-08-12  859  	}
a938da0682c248 Todd Poynor        2012-08-12  860  
a938da0682c248 Todd Poynor        2012-08-12 @861  	if (!active && last_activity_ws)
74a1dd86d1739e Stephen Boyd       2019-03-25  862  		pm_pr_dbg("last active wakeup source: %s\n",
a938da0682c248 Todd Poynor        2012-08-12  863  			last_activity_ws->name);
ea0212f40c6bc0 Thomas Gleixner    2017-06-25  864  	srcu_read_unlock(&wakeup_srcu, srcuidx);
a938da0682c248 Todd Poynor        2012-08-12  865  }
bb177fedd348c9 Julius Werner      2013-06-12  866  EXPORT_SYMBOL_GPL(pm_print_active_wakeup_sources);
a938da0682c248 Todd Poynor        2012-08-12  867
diff mbox series

Patch

diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 1a0426e6761c..9a3cc0b89208 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -555,6 +555,7 @@  static inline void unlock_system_sleep(unsigned int flags) {}
 #ifdef CONFIG_PM_SLEEP_DEBUG
 extern bool pm_print_times_enabled;
 extern bool pm_debug_messages_on;
+extern bool pm_debug_messages_should_print(void);
 static inline int pm_dyn_debug_messages_on(void)
 {
 #ifdef CONFIG_DYNAMIC_DEBUG
@@ -567,17 +568,13 @@  static inline int pm_dyn_debug_messages_on(void)
 #define pr_fmt(fmt) "PM: " fmt
 #endif
 #define __pm_pr_dbg(fmt, ...)					\
-	do {							\
-		if (pm_debug_messages_on)			\
-			printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);	\
-		else if (pm_dyn_debug_messages_on())		\
-			pr_debug(fmt, ##__VA_ARGS__);	\
-	} while (0)
+	if (pm_debug_messages_should_print())			\
+		printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);	\
+	else if (pm_dyn_debug_messages_on())			\
+		pr_debug(fmt, ##__VA_ARGS__);
 #define __pm_deferred_pr_dbg(fmt, ...)				\
-	do {							\
-		if (pm_debug_messages_on)			\
-			printk_deferred(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);	\
-	} while (0)
+	if (pm_debug_messages_should_print())			\
+		printk_deferred(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);
 #else
 #define pm_print_times_enabled	(false)
 #define pm_debug_messages_on	(false)
@@ -593,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.
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 3113ec2f1db4..daa535012e51 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -556,6 +556,12 @@  power_attr_ro(pm_wakeup_irq);
 
 bool pm_debug_messages_on __read_mostly;
 
+bool pm_debug_messages_should_print(void)
+{
+	return pm_debug_messages_on && pm_suspend_target_state != PM_SUSPEND_ON;
+}
+EXPORT_SYMBOL_GPL(pm_debug_messages_should_print);
+
 static ssize_t pm_debug_messages_show(struct kobject *kobj,
 				      struct kobj_attribute *attr, char *buf)
 {