Skip to contentSkip to conversation

sysrq: showBlockedTasks is sysrq-X

PATCH In review Randy Dunlap 5 participants 12 messages Jan 5, 2007 – Jan 7, 2007

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

PATCH 1/1 sysrq: showBlockedTasks is sysrq-X

From: Randy Dunlap <[email protected]>

SysRq showBlockedTasks is not done via B or T, it's done via X, so put that in the Help message.

---
 drivers/char/sysrq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/sysrq.c +1 -1
@@ -215,7 +215,7 @@ static void sysrq_handle_showstate_block
 }
 static struct sysrq_key_op sysrq_showstate_blocked_op = {
 	.handler	= sysrq_handle_showstate_blocked,
-	.help_msg	= "showBlockedTasks",
+	.help_msg	= "showBlockedTasks(X)",
 	.action_msg	= "Show Blocked State",
 	.enable_mask	= SYSRQ_ENABLE_DUMP,
 };

---
~Randy

#1 lore raw
Quoted 4 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

SysRq showBlockedTasks is not done via B or T, it's done via X, so put that in the Help message.

Weird, who failed to run this command before adding new stuff?! find * -type f -print0 | xargs -0 env -i grep -nw register_sysrq_key

sysrq x is for xmon, see arch/powerpc/xmon/xmon.c
Better switch the new stuff to 'z' or 'w'

#2 lore raw
Quoted 7 lines · On Fri, 5 Jan 2007 20:36:05 +0100 Olaf Hering wrote:
Quoted 4 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

SysRq showBlockedTasks is not done via B or T, it's done via X, so put that in the Help message.

Quoted 6 lines

Weird, who failed to run this command before adding new stuff?! find * -type f -print0 | xargs -0 env -i grep -nw register_sysrq_key

sysrq x is for xmon, see arch/powerpc/xmon/xmon.c
Better switch the new stuff to 'z' or 'w'
-

OK. There is also a collision on 'c':

drivers/net/ibm_emac/ibm_emac_debug.c:195:
return register_sysrq_key('c', &emac_sysrq_op)

and sysrq_crashdump_op. I'd say ibm_emac needs to change too.

I'll resend.
---
~Randy

#3 lore raw
Quoted 6 lines · Randy Dunlap

OK. There is also a collision on 'c':

drivers/net/ibm_emac/ibm_emac_debug.c:195:
return register_sysrq_key('c', &emac_sysrq_op)

and sysrq_crashdump_op. I'd say ibm_emac needs to change too.

I have seen that too.
No idea if crashdump acutally works on ppc 4xx boards, arch/powerpc/Kconfig lists CRASH_DUMP as ppc64 only.

#4 lore raw

PATCH 1/1 sysrq: showBlockedTasks is sysrq-W

In reply to Olaf Hering
Quoted 4 lines · On Fri, 5 Jan 2007 20:36:05 +0100 Olaf Hering wrote:
Quoted 2 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Quoted 8 lines
Quoted 2 lines

SysRq showBlockedTasks is not done via B or T, it's done via X, so put that in the Help message.

Weird, who failed to run this command before adding new stuff?! find * -type f -print0 | xargs -0 env -i grep -nw register_sysrq_key

sysrq x is for xmon, see arch/powerpc/xmon/xmon.c
Better switch the new stuff to 'z' or 'w'

---

From: Randy Dunlap <[email protected]>

SysRq showBlockedTasks is not done via B or T, it's done via W, so put that in the Help message.

It was previously done via X, but X is already used for Xmon on powerpc platforms and this collision needs to be avoided.

---
 drivers/char/sysrq.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/char/sysrq.c +3 -3
@@ -215,7 +215,7 @@ static void sysrq_handle_showstate_block
 }
 static struct sysrq_key_op sysrq_showstate_blocked_op = {
 	.handler	= sysrq_handle_showstate_blocked,
-	.help_msg	= "showBlockedTasks",
+	.help_msg	= "showBlockedTasks(W)",
 	.action_msg	= "Show Blocked State",
 	.enable_mask	= SYSRQ_ENABLE_DUMP,
 };
@@ -342,8 +342,8 @@ static struct sysrq_key_op *sysrq_key_ta
 	&sysrq_mountro_op,		/* u */
 	/* May be assigned at init time by SMP VOYAGER */
 	NULL,				/* v */
-	NULL,				/* w */
-	&sysrq_showstate_blocked_op,	/* x */
+	&sysrq_showstate_blocked_op,	/* w */
+	NULL,				/* x */
 	NULL,				/* y */
 	NULL				/* z */
 };
#5 lore raw

Re: [PATCH] sysrq: showBlockedTasks is sysrq-W

Quoted 7 lines · Randy Dunlap
Quoted 6 lines · On Fri, 5 Jan 2007 20:36:05 +0100 Olaf Hering wrote:

Weird, who failed to run this command before adding new stuff?! find * -type f -print0 | xargs -0 env -i grep -nw register_sysrq_key

sysrq x is for xmon, see arch/powerpc/xmon/xmon.c
Better switch the new stuff to 'z' or 'w'

Also used:
* c for kexec/crashdump and emac (drivers/net/ibm_emac/ibm_emac_debug.c)
* g for KGDB on ppc

drivers/char/sysrq.c static struct sysrq_key_op *sysrq_key_ta · line 344

Quoted 12 lines

From: Randy Dunlap <[email protected]>

SysRq showBlockedTasks is not done via B or T, it's done via W, so put that in the Help message.

It was previously done via X, but X is already used for Xmon on powerpc platforms and this collision needs to be avoided.

drivers/char/sysrq.c +0 -0
@@ -342,8 +342,8 @@ static struct sysrq_key_op *sysrq_key_ta
 	&sysrq_mountro_op,		/* u */
 	/* May be assigned at init time by SMP VOYAGER */
 	NULL,				/* v */

Nice marker that v is in use.

drivers/char/sysrq.c static struct sysrq_key_op *sysrq_key_ta · line 346

Quoted 4 lines
drivers/char/sysrq.c +2 -2
-	NULL,				/* w */
-	&sysrq_showstate_blocked_op,	/* x */
+	&sysrq_showstate_blocked_op,	/* w */
+	NULL,				/* x */

Wouldn't it be better to also put an marker for xmon here? And marker for 'c' and 'g' (maybe even 'h')?

drivers/char/sysrq.c static struct sysrq_key_op *sysrq_key_ta · line 349

Quoted 3 lines
drivers/char/sysrq.c +0 -0
 	NULL,				/* y */
 	NULL				/* z */
 };

Also Documentation/sysrq.txt is not uptodate.

It is missing c (emac meaning), d (lockdep), n (un-RT), q (timer), w (blocked) and x (xmon), but is documenting 'l' with no longer seems to be implemented.

Torsten

#6 lore raw

Re: [PATCH] sysrq: showBlockedTasks is sysrq-W

Quoted 11 lines · On Sat, 6 Jan 2007 20:19:29 +0100 Torsten Kaiser wrote:
Quoted 7 lines · Randy Dunlap
Quoted 6 lines · On Fri, 5 Jan 2007 20:36:05 +0100 Olaf Hering wrote:

Weird, who failed to run this command before adding new stuff?! find * -type f -print0 | xargs -0 env -i grep -nw register_sysrq_key

sysrq x is for xmon, see arch/powerpc/xmon/xmon.c
Better switch the new stuff to 'z' or 'w'

Also used:
* c for kexec/crashdump and emac (drivers/net/ibm_emac/ibm_emac_debug.c)

ibm_emac is ppc 4xx only. Does kexec/crashdump work on that platform or are they mutually exclusive?

Quoted 1 line

* g for KGDB on ppc

Is that in mainline?

Quoted 15 lines

drivers/char/sysrq.c static struct sysrq_key_op *sysrq_key_ta · line 344

Quoted 12 lines

From: Randy Dunlap <[email protected]>

SysRq showBlockedTasks is not done via B or T, it's done via W, so put that in the Help message.

It was previously done via X, but X is already used for Xmon on powerpc platforms and this collision needs to be avoided.

drivers/char/sysrq.c +0 -0
@@ -342,8 +342,8 @@ static struct sysrq_key_op *sysrq_key_ta
 	&sysrq_mountro_op,		/* u */
 	/* May be assigned at init time by SMP VOYAGER */
 	NULL,				/* v */

Nice marker that v is in use.

Quoted 7 lines

drivers/char/sysrq.c static struct sysrq_key_op *sysrq_key_ta · line 346

Quoted 4 lines
drivers/char/sysrq.c +2 -2
-	NULL,				/* w */
-	&sysrq_showstate_blocked_op,	/* x */
+	&sysrq_showstate_blocked_op,	/* w */
+	NULL,				/* x */

Wouldn't it be better to also put an marker for xmon here? And marker for 'c' and 'g' (maybe even 'h')?

OK, I'll do that.

Quoted 9 lines

drivers/char/sysrq.c static struct sysrq_key_op *sysrq_key_ta · line 349

Quoted 3 lines
drivers/char/sysrq.c +0 -0
 	NULL,				/* y */
 	NULL				/* z */
 };

Also Documentation/sysrq.txt is not uptodate.

It is missing c (emac meaning), d (lockdep), n (un-RT), q (timer), w (blocked) and x (xmon), but is documenting 'l' with no longer seems to be implemented.

and I'll look into that. Thanks.

---
~Randy

#7 lore raw

PATCH v3 1/2 sysrq: showBlockedTasks is sysrq-W

In reply to Torsten Kaiser

From: Randy Dunlap <[email protected]>

SysRq showBlockedTasks is not done via B or T, it's done via W, so put that in the Help message.

It was previously done via X, but X is already used for Xmon on ppc & powerpc platforms and this collision needs to be avoided.

All callers of register_sysrq_key() are now marked in the sysrq op/key table. I didn't mark 'h' as Help because Help is just printed for any unknown key, such as '?'.

Added some omitted sysrq key entries in the sysrq.txt file.

---
 Documentation/sysrq.txt |   66 +++++++++++++++++++++++++-----------------------
 drivers/char/sysrq.c    |   20 ++++++++------
 2 files changed, 46 insertions(+), 40 deletions(-)
drivers/char/sysrq.c +11 -9
@@ -215,7 +215,7 @@ static void sysrq_handle_showstate_block
 }
 static struct sysrq_key_op sysrq_showstate_blocked_op = {
 	.handler	= sysrq_handle_showstate_blocked,
-	.help_msg	= "showBlockedTasks",
+	.help_msg	= "showBlockedTasks(W)",
 	.action_msg	= "Show Blocked State",
 	.enable_mask	= SYSRQ_ENABLE_DUMP,
 };
@@ -315,15 +315,16 @@ static struct sysrq_key_op *sysrq_key_ta
 	&sysrq_loglevel_op,		/* 9 */
 
 	/*
-	 * Don't use for system provided sysrqs, it is handled specially on
-	 * sparc and will never arrive
+	 * a: Don't use for system provided sysrqs, it is handled specially on
+	 * sparc and will never arrive.
 	 */
 	NULL,				/* a */
 	&sysrq_reboot_op,		/* b */
-	&sysrq_crashdump_op,		/* c */
+	&sysrq_crashdump_op,		/* c & ibm_emac driver debug */
 	&sysrq_showlocks_op,		/* d */
 	&sysrq_term_op,			/* e */
 	&sysrq_moom_op,			/* f */
+	/* g: May be registered by ppc for kgdb */
 	NULL,				/* g */
 	NULL,				/* h */
 	&sysrq_kill_op,			/* i */
@@ -332,18 +333,19 @@ static struct sysrq_key_op *sysrq_key_ta
 	NULL,				/* l */
 	&sysrq_showmem_op,		/* m */
 	&sysrq_unrt_op,			/* n */
-	/* This will often be registered as 'Off' at init time */
+	/* o: This will often be registered as 'Off' at init time */
 	NULL,				/* o */
 	&sysrq_showregs_op,		/* p */
 	NULL,				/* q */
-	&sysrq_unraw_op,			/* r */
+	&sysrq_unraw_op,		/* r */
 	&sysrq_sync_op,			/* s */
 	&sysrq_showstate_op,		/* t */
 	&sysrq_mountro_op,		/* u */
-	/* May be assigned at init time by SMP VOYAGER */
+	/* v: May be registered at init time by SMP VOYAGER */
 	NULL,				/* v */
-	NULL,				/* w */
-	&sysrq_showstate_blocked_op,	/* x */
+	&sysrq_showstate_blocked_op,	/* w */
+	/* x: May be registered on ppc/powerpc for xmon */
+	NULL,				/* x */
 	NULL,				/* y */
 	NULL				/* z */
 };
Documentation/sysrq.txt +35 -31

140 lines not on this page · raw message

---

#8 lore raw

Re: [PATCH 1/2 v3] sysrq: showBlockedTasks is sysrq-W

drivers/char/sysrq.c static void sysrq_handle_showstate_block · line 218

Quoted 1 line · Randy Dunlap
drivers/char/sysrq.c +1 -0
+	.help_msg	= "showBlockedTasks(W)",

Why not the same scheme as the existing help msgs..

shoWblockedtasks ?

Dave

Signature · 1 line
http://www.codemonkey.org.uk
#9 lore raw

PATCH v4 1/2 sysrq: showBlockedTasks is sysrq-W

Quoted 5 lines · On Sat, 6 Jan 2007 19:09:45 -0500 Dave Jones wrote:

Review

Quoted 1 line · Randy Dunlap
(quoted diff) +1 -0
+	.help_msg	= "showBlockedTasks(W)",

Why not the same scheme as the existing help msgs..

Yes. Thanks.

Quoted 1 line

shoWblockedtasks ?

Would shoW-blocked-tasks be OK?

---
From: Randy Dunlap <[email protected]>

Change SysRq showBlockedTasks from sysrq-X to sysrq-W and show that in the Help message.

It was previously done via X, but X is already used for Xmon on ppc & powerpc platforms and this collision needs to be avoided.

All callers of register_sysrq_key() are now marked in the sysrq op/key table. I didn't mark 'h' as Help because Help is just printed for any unknown key, such as '?'.

Added some omitted sysrq key entries in the sysrq.txt file.

---
 Documentation/sysrq.txt |   66 +++++++++++++++++++++++++-----------------------
 drivers/char/sysrq.c    |   20 ++++++++------
 2 files changed, 46 insertions(+), 40 deletions(-)
drivers/char/sysrq.c +11 -9
@@ -215,7 +215,7 @@ static void sysrq_handle_showstate_block
 }
 static struct sysrq_key_op sysrq_showstate_blocked_op = {
 	.handler	= sysrq_handle_showstate_blocked,
-	.help_msg	= "showBlockedTasks",
+	.help_msg	= "shoW-blocked-tasks",
 	.action_msg	= "Show Blocked State",
 	.enable_mask	= SYSRQ_ENABLE_DUMP,
 };
@@ -315,15 +315,16 @@ static struct sysrq_key_op *sysrq_key_ta
 	&sysrq_loglevel_op,		/* 9 */
 
 	/*
-	 * Don't use for system provided sysrqs, it is handled specially on
-	 * sparc and will never arrive
+	 * a: Don't use for system provided sysrqs, it is handled specially on
+	 * sparc and will never arrive.
 	 */
 	NULL,				/* a */
 	&sysrq_reboot_op,		/* b */
-	&sysrq_crashdump_op,		/* c */
+	&sysrq_crashdump_op,		/* c & ibm_emac driver debug */
 	&sysrq_showlocks_op,		/* d */
 	&sysrq_term_op,			/* e */
 	&sysrq_moom_op,			/* f */
+	/* g: May be registered by ppc for kgdb */
 	NULL,				/* g */
 	NULL,				/* h */
 	&sysrq_kill_op,			/* i */
@@ -332,18 +333,19 @@ static struct sysrq_key_op *sysrq_key_ta
 	NULL,				/* l */
 	&sysrq_showmem_op,		/* m */
 	&sysrq_unrt_op,			/* n */
-	/* This will often be registered as 'Off' at init time */
+	/* o: This will often be registered as 'Off' at init time */
 	NULL,				/* o */
 	&sysrq_showregs_op,		/* p */
 	NULL,				/* q */
-	&sysrq_unraw_op,			/* r */
+	&sysrq_unraw_op,		/* r */
 	&sysrq_sync_op,			/* s */
 	&sysrq_showstate_op,		/* t */
 	&sysrq_mountro_op,		/* u */
-	/* May be assigned at init time by SMP VOYAGER */
+	/* v: May be registered at init time by SMP VOYAGER */
 	NULL,				/* v */
-	NULL,				/* w */
-	&sysrq_showstate_blocked_op,	/* x */
+	&sysrq_showstate_blocked_op,	/* w */
+	/* x: May be registered on ppc/powerpc for xmon */
+	NULL,				/* x */
 	NULL,				/* y */
 	NULL				/* z */
 };
Documentation/sysrq.txt +35 -31

140 lines not on this page · raw message

#10 lore raw

Re: [PATCH 1/2 v4] sysrq: showBlockedTasks is sysrq-W

Quoted 6 lines · Randy Dunlap
Quoted 4 lines · On Sat, 6 Jan 2007 19:09:45 -0500 Dave Jones wrote:
Quoted 1 line · Randy Dunlap
(quoted diff) +1 -0
+	.help_msg	= "showBlockedTasks(W)",
Quoted 7 lines
Quoted 1 line

Why not the same scheme as the existing help msgs..

Yes. Thanks.

Quoted 1 line

shoWblockedtasks ?

Would shoW-blocked-tasks be OK?

Works for me.

thanks,

Dave

Signature · 1 line
http://www.codemonkey.org.uk
#11 lore raw

PATCH 2/2 sysrq: alphabetize command keys doc.

In reply to Torsten Kaiser

From: Randy Dunlap <[email protected]>

Alphabetize the sysrq command keys list.

---
 Documentation/sysrq.txt |   44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)
Documentation/sysrq.txt +22 -22
@@ -64,11 +64,6 @@ On all -  write a character to /proc/sys
 
 *  What are the 'command' keys?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-'r'     - Turns off keyboard raw mode and sets it to XLATE.
-
-'k'     - Secure Access Key (SAK) Kills all programs on the current virtual
-          console. NOTE: See important comments below in SAK section.
-
 'b'     - Will immediately reboot the system without syncing or unmounting
           your disks.
 
@@ -76,21 +71,37 @@ On all -  write a character to /proc/sys
 
 'd'	- Shows all locks that are held.
 
-'o'     - Will shut your system off (if configured and supported).
+'e'     - Send a SIGTERM to all processes, except for init.
 
-'s'     - Will attempt to sync all mounted filesystems.
+'f'	- Will call oom_kill to kill a memory hog process.
 
-'u'     - Will attempt to remount all mounted filesystems read-only.
+'g'	- Used by kgdb on ppc platforms.
 
-'p'     - Will dump the current registers and flags to your console.
+'h'     - Will display help (actually any other key than those listed
+          above will display help. but 'h' is easy to remember :-)
 
-'t'     - Will dump a list of current tasks and their information to your
-          console.
+'i'     - Send a SIGKILL to all processes, except for init.
+
+'k'     - Secure Access Key (SAK) Kills all programs on the current virtual
+          console. NOTE: See important comments below in SAK section.
 
 'm'     - Will dump current memory info to your console.
 
 'n'	- Used to make RT tasks nice-able
 
+'o'     - Will shut your system off (if configured and supported).
+
+'p'     - Will dump the current registers and flags to your console.
+
+'r'     - Turns off keyboard raw mode and sets it to XLATE.
+
+'s'     - Will attempt to sync all mounted filesystems.
+
+'t'     - Will dump a list of current tasks and their information to your
+          console.
+
+'u'     - Will attempt to remount all mounted filesystems read-only.
+
 'v'	- Dumps Voyager SMP processor info to your console.
 
 'w'	- Dumps tasks that are in uninterruptable (blocked) state.
@@ -102,17 +113,6 @@ On all -  write a character to /proc/sys
           it so that only emergency messages like PANICs or OOPSes would
           make it to your console.)
 
-'f'	- Will call oom_kill to kill a memory hog process.
-
-'e'     - Send a SIGTERM to all processes, except for init.
-
-'g'	- Used by kgdb on ppc platforms.
-
-'i'     - Send a SIGKILL to all processes, except for init.
-
-'h'     - Will display help (actually any other key than those listed
-          above will display help. but 'h' is easy to remember :-)
-
 *  Okay, so what can I use them for?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Well, un'R'aw is very handy when your X server or a svgalib program crashes.

---