Skip to contentSkip to conversation

Quieten freezer if !CONFIG_PM_DEBUG.

PATCH In review Nigel Cunningham 3 participants 4 messages Oct 21, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Quieten freezer if !CONFIG_PM_DEBUG.

The freezing of processes is currently very noisy. This patch makes the noise dependant upon CONFIG_PM_DEBUG.

Prepared against current git.

kernel/power/process.c +13 -7
index 29be608..6829612 100644
@@ -15,6 +15,12 @@ #include <linux/module.h>
 #include <linux/syscalls.h>
 #include <linux/freezer.h>
 
+#ifdef CONFIG_PM_DEBUG
+#define freezer_message(msg, a...) do { printk(msg, ##a); } while(0)
+#else
+#define freezer_message(msg, a...) do { } while(0)
+#endif
+
 /* 
  * Timeout for stopping processes
  */
@@ -40,7 +46,7 @@ void refrigerator(void)
 	long save;
 	save = current->state;
 	pr_debug("%s entered refrigerator\n", current->comm);
-	printk("=");
+	freezer_message("=");
 
 	frozen_process(current);
 	spin_lock_irq(&current->sighand->siglock);
@@ -87,7 +93,7 @@ int freeze_processes(void)
 	unsigned long start_time;
 	struct task_struct *g, *p;
 
-	printk( "Stopping tasks: " );
+	freezer_message( "Stopping tasks: " );
 	start_time = jiffies;
 	user_frozen = 0;
 	do {
@@ -135,7 +141,7 @@ int freeze_processes(void)
 	 * but it cleans up leftover PF_FREEZE requests.
 	 */
 	if (todo) {
-		printk( "\n" );
+		freezer_message( "\n" );
 		printk(KERN_ERR " stopping tasks timed out "
 			"after %d seconds (%d tasks remaining):\n",
 			TIMEOUT / HZ, todo);
@@ -149,7 +155,7 @@ int freeze_processes(void)
 		return todo;
 	}
 
-	printk( "|\n" );
+	freezer_message( "|\n" );
 	BUG_ON(in_atomic());
 	return 0;
 }
@@ -158,18 +164,18 @@ void thaw_processes(void)
 {
 	struct task_struct *g, *p;
 
-	printk( "Restarting tasks..." );
+	freezer_message( "Restarting tasks..." );
 	read_lock(&tasklist_lock);
 	do_each_thread(g, p) {
 		if (!freezeable(p))
 			continue;
 		if (!thaw_process(p))
-			printk(KERN_INFO " Strange, %s not stopped\n", p->comm );
+			freezer_message(KERN_INFO " Strange, %s not stopped\n", p->comm );
 	} while_each_thread(g, p);
 
 	read_unlock(&tasklist_lock);
 	schedule();
-	printk( " done\n" );
+	freezer_message( " done\n" );
 }
 
 EXPORT_SYMBOL(refrigerator);
#1 lore raw

Hi!

Quoted 12 lines

The freezing of processes is currently very noisy. This patch makes the noise dependant upon CONFIG_PM_DEBUG.

Prepared against current git.

kernel/power/process.c +0 -0
index 29be608..6829612 100644

kernel/power/process.c #include <linux/module.h> · line 23

Quoted 9 lines
kernel/power/process.c +6 -0
@@ -15,6 +15,12 @@ #include <linux/module.h>
 #include <linux/syscalls.h>
 #include <linux/freezer.h>
 
+#ifdef CONFIG_PM_DEBUG
+#define freezer_message(msg, a...) do { printk(msg, ##a); } while(0)
+#else
+#define freezer_message(msg, a...) do { } while(0)
+#endif
+

No. We already have pr_debug().

And having stopping tasks: ============== line does not seem that bad to me. Drivers are so noisy that this is very minor. Feel free to adjust loglevels so that message is hidden.

...all the messages you modified should probably be fixed to be KERN_INFO...

kernel/power/process.c void thaw_processes(void) · line 173

Quoted 13 lines
kernel/power/process.c +2 -2
@@ -158,18 +164,18 @@ void thaw_processes(void)
 {
 	struct task_struct *g, *p;
 
-	printk( "Restarting tasks..." );
+	freezer_message( "Restarting tasks..." );
 	read_lock(&tasklist_lock);
 	do_each_thread(g, p) {
 		if (!freezeable(p))
 			continue;
 		if (!thaw_process(p))
-			printk(KERN_INFO " Strange, %s not stopped\n", p->comm );
+			freezer_message(KERN_INFO " Strange, %s not

stopped\n", p->comm );

This one definitely needs to stay, maybe should be promoted to KERN_WARNING or something.

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#2 lore raw
In reply to Nigel Cunningham
Quoted 2 lines · Nigel Cunningham

The freezing of processes is currently very noisy. This patch makes the noise dependant upon CONFIG_PM_DEBUG.

Well, I don't think it's _that_ noisy. It only printks one character per frozen task.

In fact I think it at least should print "Freezing processes" and "done" messages.

Quoted 22 lines

Prepared against current git.

kernel/power/process.c +6 -0
index 29be608..6829612 100644
@@ -15,6 +15,12 @@ #include <linux/module.h>
 #include <linux/syscalls.h>
 #include <linux/freezer.h>
 
+#ifdef CONFIG_PM_DEBUG
+#define freezer_message(msg, a...) do { printk(msg, ##a); } while(0)
+#else
+#define freezer_message(msg, a...) do { } while(0)
+#endif
+
 /* 
  * Timeout for stopping processes
  */

kernel/power/process.c void refrigerator(void) · line 49

Quoted 5 lines
kernel/power/process.c +1 -1
@@ -40,7 +46,7 @@ void refrigerator(void)
 	long save;
 	save = current->state;
 	pr_debug("%s entered refrigerator\n", current->comm);
-	printk("=");
+	freezer_message("=");

I'd prefer to treat the pr_debug thing in a similar way, like freezer_debug_message("%s entered refrigerator\n" ...).

Or better yet, I'd leave just one message like

freezer_print_task(current->comm);

instead of the two that will be defined to either printk the entire "%s entered refrigerator\n", ... message or printk the "=" character or do nothing, depending on a predefined verbosity level.

kernel/power/process.c int freeze_processes(void) · line 96

Quoted 9 lines
kernel/power/process.c +1 -1
 	frozen_process(current);
 	spin_lock_irq(&current->sighand->siglock);
@@ -87,7 +93,7 @@ int freeze_processes(void)
 	unsigned long start_time;
 	struct task_struct *g, *p;
 
-	printk( "Stopping tasks: " );
+	freezer_message( "Stopping tasks: " );

I wouldn't change this.

kernel/power/process.c int freeze_processes(void) · line 144

Quoted 9 lines
kernel/power/process.c +1 -1
 	start_time = jiffies;
 	user_frozen = 0;
 	do {
@@ -135,7 +141,7 @@ int freeze_processes(void)
 	 * but it cleans up leftover PF_FREEZE requests.
 	 */
 	if (todo) {
-		printk( "\n" );
+		freezer_message( "\n" );

Ditto.

kernel/power/process.c int freeze_processes(void) · line 158

Quoted 9 lines
kernel/power/process.c +1 -1
 		printk(KERN_ERR " stopping tasks timed out "
 			"after %d seconds (%d tasks remaining):\n",
 			TIMEOUT / HZ, todo);
@@ -149,7 +155,7 @@ int freeze_processes(void)
 		return todo;
 	}
 
-	printk( "|\n" );
+	freezer_message( "|\n" );

I'd call it freezer_print_finish(); and define to printk the "|\n" or do nothing like for freezer_print_task().

kernel/power/process.c void thaw_processes(void) · line 161

Quoted 8 lines
kernel/power/process.c +0 -1
 	BUG_ON(in_atomic());
 	return 0;
 }
@@ -158,18 +164,18 @@ void thaw_processes(void)
 {
 	struct task_struct *g, *p;
 
-	printk( "Restarting tasks..." );

I wouldn't change this.

Quoted 4 lines
kernel/power/process.c +1 -0
+	freezer_message( "Restarting tasks..." );
 	read_lock(&tasklist_lock);
 	do_each_thread(g, p) {
 		if (!freezeable(p))

kernel/power/process.c void thaw_processes(void) · line 178

Quoted 10 lines
kernel/power/process.c +2 -2
 			continue;
 		if (!thaw_process(p))
-			printk(KERN_INFO " Strange, %s not stopped\n", p->comm );
+			freezer_message(KERN_INFO " Strange, %s not stopped\n", p->comm );
 	} while_each_thread(g, p);
 
 	read_unlock(&tasklist_lock);
 	schedule();
-	printk( " done\n" );
+	freezer_message( " done\n" );

Ditto.

kernel/power/process.c void thaw_processes(void)

Quoted 6 lines
kernel/power/process.c +0 -1
 }
 
 EXPORT_SYMBOL(refrigerator);
 
 
-

Greetings,
Rafael

Signature · 2 lines
You never change things by fighting the existing reality.
		R. Buckminster Fuller
#3 lore raw

Hi.

Quoted 6 lines · Rafael J. Wysocki
Quoted 2 lines · Nigel Cunningham

The freezing of processes is currently very noisy. This patch makes the noise dependant upon CONFIG_PM_DEBUG.

Well, I don't think it's _that_ noisy. It only printks one character per frozen task.

Yeah, but it should just work. The only reason for it to printk should be for information or if there's a possibility of deadlocking or failure that isn't handled. Doing printks here is akin to doing a printk for every page you write in the image, and I'm reasonably sure you're not about to start doing that.

Quoted 2 lines

In fact I think it at least should print "Freezing processes" and "done" messages.

That sounds better.

Quoted 31 lines
Quoted 22 lines

Prepared against current git.

kernel/power/process.c +6 -0
index 29be608..6829612 100644
@@ -15,6 +15,12 @@ #include <linux/module.h>
 #include <linux/syscalls.h>
 #include <linux/freezer.h>
 
+#ifdef CONFIG_PM_DEBUG
+#define freezer_message(msg, a...) do { printk(msg, ##a); } while(0)
+#else
+#define freezer_message(msg, a...) do { } while(0)
+#endif
+
 /* 
  * Timeout for stopping processes
  */

kernel/power/process.c void refrigerator(void) · line 49

Quoted 5 lines
kernel/power/process.c +1 -1
@@ -40,7 +46,7 @@ void refrigerator(void)
 	long save;
 	save = current->state;
 	pr_debug("%s entered refrigerator\n", current->comm);
-	printk("=");
+	freezer_message("=");

I'd prefer to treat the pr_debug thing in a similar way, like freezer_debug_message("%s entered refrigerator\n" ...).

Quoted 7 lines

Or better yet, I'd leave just one message like

freezer_print_task(current->comm);

instead of the two that will be defined to either printk the entire "%s entered refrigerator\n", ... message or printk the "=" character or do nothing, depending on a predefined verbosity level.

Ah, yeah. Didn't notice the pr_debug thing. Will look at it.

Quoted 58 lines

kernel/power/process.c int freeze_processes(void) · line 96

Quoted 9 lines
kernel/power/process.c +1 -1
 	frozen_process(current);
 	spin_lock_irq(&current->sighand->siglock);
@@ -87,7 +93,7 @@ int freeze_processes(void)
 	unsigned long start_time;
 	struct task_struct *g, *p;
 
-	printk( "Stopping tasks: " );
+	freezer_message( "Stopping tasks: " );

I wouldn't change this.

kernel/power/process.c int freeze_processes(void) · line 144

Quoted 9 lines
kernel/power/process.c +1 -1
 	start_time = jiffies;
 	user_frozen = 0;
 	do {
@@ -135,7 +141,7 @@ int freeze_processes(void)
 	 * but it cleans up leftover PF_FREEZE requests.
 	 */
 	if (todo) {
-		printk( "\n" );
+		freezer_message( "\n" );

Ditto.

kernel/power/process.c int freeze_processes(void) · line 158

Quoted 9 lines
kernel/power/process.c +1 -1
 		printk(KERN_ERR " stopping tasks timed out "
 			"after %d seconds (%d tasks remaining):\n",
 			TIMEOUT / HZ, todo);
@@ -149,7 +155,7 @@ int freeze_processes(void)
 		return todo;
 	}
 
-	printk( "|\n" );
+	freezer_message( "|\n" );

I'd call it freezer_print_finish(); and define to printk the "|\n" or do nothing like for freezer_print_task().

kernel/power/process.c void thaw_processes(void) · line 161

Quoted 8 lines
kernel/power/process.c +0 -1
 	BUG_ON(in_atomic());
 	return 0;
 }
@@ -158,18 +164,18 @@ void thaw_processes(void)
 {
 	struct task_struct *g, *p;
 
-	printk( "Restarting tasks..." );

I wouldn't change this.

Quoted 10 lines
kernel/power/process.c +2 -1
+	freezer_message( "Restarting tasks..." );
 	read_lock(&tasklist_lock);
 	do_each_thread(g, p) {
 		if (!freezeable(p))
 			continue;
 		if (!thaw_process(p))
-			printk(KERN_INFO " Strange, %s not stopped\n", p->comm );
+			freezer_message(KERN_INFO " Strange, %s not stopped\n", p->comm );
 	} while_each_thread(g, p);
 
Quoted 10 lines

kernel/power/process.c void thaw_processes(void) · line 178

Quoted 4 lines
kernel/power/process.c +1 -1
 	read_unlock(&tasklist_lock);
 	schedule();
-	printk( " done\n" );
+	freezer_message( " done\n" );

Ditto.

Quoted 3 lines
kernel/power/process.c +0 -0
 }
 
 EXPORT_SYMBOL(refrigerator);

Will reconsider and resend tomorrow.

Regards,

Nigel