kdb: Use newer api for tasklist scanning
PATCH 1/1 kdb: Use newer api for tasklist scanning
This kills the custom kdb_do_each_thread/kdb_while_each_thread calls used in kdb to iterate through all tasks. It is obsolete and racy to use tsk->thread_group, although in this particular case there is no concurrency so it doesn't matter. Still, lets trivially replace it for the newer one, maintaining semantics, of course.
--- kernel/debug/kdb/kdb_bt.c | 4 ++-- kernel/debug/kdb/kdb_main.c | 8 ++++---- kernel/debug/kdb/kdb_private.h | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-)
kernel/debug/kdb/kdb_bt.c +2 -2
@@ -149,14 +149,14 @@ kdb_bt(int argc, const char **argv)return 0 ; }/* Now the inactive tasks */ - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (KDB_FLAG (CMD_INTERRUPT ))return 0 ;if (task_curr (p))continue ;if (kdb_bt1 (p, mask, btaprompt))return 0 ; - }kdb_while_each_thread (g, p); + } }else if (strcmp (argv[0 ],"btp" ) ==0 ) {struct task_struct *p;unsigned long pid;
kernel/debug/kdb/kdb_main.c +4 -4
@@ -2299,10 +2299,10 @@ void kdb_ps_suppressed(void)if (kdb_task_state (p, mask_I)) ++idle; } - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (kdb_task_state (p, mask_M)) ++daemon; - }kdb_while_each_thread (g, p); + }if (idle || daemon) {if (idle) kdb_printf("%d idle process%s (state I)%s\n",
@@ -2370,12 +2370,12 @@ static int kdb_ps(int argc, const char **argv) }kdb_printf ("\n" );/* Now the real tasks */ - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (KDB_FLAG (CMD_INTERRUPT ))return 0 ;if (kdb_task_state (p, mask))kdb_ps1 (p); - }kdb_while_each_thread (g, p); + }return 0 ; }
kernel/debug/kdb/kdb_private.h +0 -4
@@ -230,10 +230,6 @@ extern struct task_struct *kdb_curr_task(int);#define kdb_task_has_cpu (p) (task_curr(p)) -/* Simplify coexistence with NPTL */ -#define kdb_do_each_thread (g, p) do_each_thread(g, p) -#define kdb_while_each_thread (g, p) while_each_thread(g, p) -#define GFP_KDB (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)extern void *debug_kmalloc (size_t size,gfp_t flags);
Signature · 1 line
2.26.2
Quoted 8 lines · Davidlohr Bueso
This kills the custom kdb_do_each_thread/kdb_while_each_thread calls used in kdb to iterate through all tasks. It is obsolete and racy to use
tsk->thread_group, although in this particular case there is no concurrency so it doesn't matter. Still, lets trivially replace it for the newer one, maintaining semantics, of course.
Quoted 6 lines
Signed-off-by Davidlohr Bueso <[email protected]>--- kernel/debug/kdb/kdb_bt.c | 4 ++-- kernel/debug/kdb/kdb_main.c | 8 ++++---- kernel/debug/kdb/kdb_private.h | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-)
Quoted 3 lines · Davidlohr Bueso
This kills the custom kdb_do_each_thread/kdb_while_each_thread calls used in kdb to iterate through all tasks. It is obsolete and racy to use
tsk->thread_group, although in this particular
No objections to the change but kdb doesn't use tsk->thread_group, it uses do_each_thread/while_each_thread. Can we change this to say that is osbsolete and racy to use while_each_thread() (that's pretty much what the description of the patch that introduced for_each_thread said)?
Additionally the debug_core uses do_each_thread/while_each_thread. Presumably that would like to be changed as well?
Daniel.
Quoted 81 lines
case there is no concurrency so it doesn't matter. Still, lets trivially replace it for the newer one, maintaining semantics, of course.
Signed-off-by Davidlohr Bueso <[email protected]>--- kernel/debug/kdb/kdb_bt.c | 4 ++-- kernel/debug/kdb/kdb_main.c | 8 ++++---- kernel/debug/kdb/kdb_private.h | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-)kernel/debug/kdb/kdb_bt.c +2
-2@@ -149,14 +149,14 @@ kdb_bt(int argc, const char **argv)return 0 ; }/* Now the inactive tasks */ - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (KDB_FLAG (CMD_INTERRUPT ))return 0 ;if (task_curr (p))continue ;if (kdb_bt1 (p, mask, btaprompt))return 0 ; - }kdb_while_each_thread (g, p); + } }else if (strcmp (argv[0 ],"btp" ) ==0 ) {struct task_struct *p;unsigned long pid;kernel/debug/kdb/kdb_main.c +4
-4@@ -2299,10 +2299,10 @@ void kdb_ps_suppressed(void)if (kdb_task_state (p, mask_I)) ++idle; } - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (kdb_task_state (p, mask_M)) ++daemon; - }kdb_while_each_thread (g, p); + }if (idle || daemon) {if (idle) kdb_printf("%d idle process%s (state I)%s\n",@@ -2370,12 +2370,12 @@ static int kdb_ps(int argc, const char **argv) }kdb_printf ("\n" );/* Now the real tasks */ - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (KDB_FLAG (CMD_INTERRUPT ))return 0 ;if (kdb_task_state (p, mask))kdb_ps1 (p); - }kdb_while_each_thread (g, p); + }return 0 ; }kernel/debug/kdb/kdb_private.h +0
-4@@ -230,10 +230,6 @@ extern struct task_struct *kdb_curr_task(int);#define kdb_task_has_cpu (p) (task_curr(p)) -/* Simplify coexistence with NPTL */ -#define kdb_do_each_thread (g, p) do_each_thread(g, p) -#define kdb_while_each_thread (g, p) while_each_thread(g, p) -#define GFP_KDB (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)extern void *debug_kmalloc (size_t size,gfp_t flags);Signature · 1 line
2.26.2
Quoted 5 lines · Daniel Thompson
No objections to the change but kdb doesn't use
tsk->thread_group, it uses do_each_thread/while_each_thread. Can we change this to say that is osbsolete and racy to usewhile_each_thread()(that's pretty much what the description of the patch that introducedfor_each_threadsaid)?
Well while_each_thread() is just a loop around next_thread(), which uses tsk->thread_group. But sure, I can rephrase a v2 to say while_each_thread.
Quoted 3 lines
Additionally the
debug_coreuses do_each_thread/while_each_thread. Presumably that would like to be changed as well?
Are you referring to gdb_cmd_query()? Yeah, that's another one that can be replaced. Because we need not worry about races, it's rather simple to justify both replacements in the same patch, which I'll add to v2.
Thanks,
Davidlohr
PATCH v2 1/1 kdb: Use newer api for tasklist scanning
In reply to Daniel ThompsonThis kills using the do_each_thread/while_each_thread combo to iterate all threads and uses for_each_process_thread() instead, maintaining semantics. while_each_thread() is ultimately racy and deprecated; although in this particular case there is no concurrency so it doesn't matter. Still lets trivially get rid of two more users.
--- kernel/debug/gdbstub.c | 4 ++-- kernel/debug/kdb/kdb_bt.c | 4 ++-- kernel/debug/kdb/kdb_main.c | 8 ++++---- kernel/debug/kdb/kdb_private.h | 4 ---- 4 files changed, 8 insertions(+), 12 deletions(-)
kernel/debug/gdbstub.c +2 -2
@@ -725,7 +725,7 @@ static void gdb_cmd_query(struct kgdb_state *ks) } } - do_each_thread(g, p) { +for_each_process_thread (g, p) {if (i >= ks->thr_query && !finished) {int_to_threadref (thref, p->pid); ptr =pack_threadid (ptr, thref);
@@ -735,7 +735,7 @@ static void gdb_cmd_query(struct kgdb_state *ks) finished =1 ; } i++; - }while_each_thread (g, p); + } *(--ptr) ='\0' ;break ;
kernel/debug/kdb/kdb_bt.c +2 -2
@@ -149,14 +149,14 @@ kdb_bt(int argc, const char **argv)return 0 ; }/* Now the inactive tasks */ - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (KDB_FLAG (CMD_INTERRUPT ))return 0 ;if (task_curr (p))continue ;if (kdb_bt1 (p, mask, btaprompt))return 0 ; - }kdb_while_each_thread (g, p); + } }else if (strcmp (argv[0 ],"btp" ) ==0 ) {struct task_struct *p;unsigned long pid;
kernel/debug/kdb/kdb_main.c +4 -4
@@ -2299,10 +2299,10 @@ void kdb_ps_suppressed(void)if (kdb_task_state (p, mask_I)) ++idle; } - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (kdb_task_state (p, mask_M)) ++daemon; - }kdb_while_each_thread (g, p); + }if (idle || daemon) {if (idle) kdb_printf("%d idle process%s (state I)%s\n",
@@ -2370,12 +2370,12 @@ static int kdb_ps(int argc, const char **argv) }kdb_printf ("\n" );/* Now the real tasks */ - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (KDB_FLAG (CMD_INTERRUPT ))return 0 ;if (kdb_task_state (p, mask))kdb_ps1 (p); - }kdb_while_each_thread (g, p); + }return 0 ; }
kernel/debug/kdb/kdb_private.h +0 -4
@@ -230,10 +230,6 @@ extern struct task_struct *kdb_curr_task(int);#define kdb_task_has_cpu (p) (task_curr(p)) -/* Simplify coexistence with NPTL */ -#define kdb_do_each_thread (g, p) do_each_thread(g, p) -#define kdb_while_each_thread (g, p) while_each_thread(g, p) -#define GFP_KDB (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)extern void *debug_kmalloc (size_t size,gfp_t flags);
Signature · 1 line
2.26.2
Daniel Thompson
AppliedQuoted 9 lines · Davidlohr Bueso
This kills using the do_each_thread/while_each_thread combo to iterate all threads and uses
for_each_process_thread()instead, maintaining semantics.while_each_thread()is ultimately racy and deprecated; although in this particular case there is no concurrency so it doesn't matter. Still lets trivially get rid of two more users.Acked-by Oleg Nesterov <[email protected]>Signed-off-by Davidlohr Bueso <[email protected]>
Applied. Thanks!
Daniel.
Quoted 99 lines
--- kernel/debug/gdbstub.c | 4 ++-- kernel/debug/kdb/kdb_bt.c | 4 ++-- kernel/debug/kdb/kdb_main.c | 8 ++++---- kernel/debug/kdb/kdb_private.h | 4 ---- 4 files changed, 8 insertions(+), 12 deletions(-)kernel/debug/gdbstub.c +2
-2@@ -725,7 +725,7 @@ static void gdb_cmd_query(struct kgdb_state *ks) } } - do_each_thread(g, p) { +for_each_process_thread (g, p) {if (i >= ks->thr_query && !finished) {int_to_threadref (thref, p->pid); ptr =pack_threadid (ptr, thref);@@ -735,7 +735,7 @@ static void gdb_cmd_query(struct kgdb_state *ks) finished =1 ; } i++; - }while_each_thread (g, p); + } *(--ptr) ='\0' ;break ;kernel/debug/kdb/kdb_bt.c +2
-2@@ -149,14 +149,14 @@ kdb_bt(int argc, const char **argv)return 0 ; }/* Now the inactive tasks */ - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (KDB_FLAG (CMD_INTERRUPT ))return 0 ;if (task_curr (p))continue ;if (kdb_bt1 (p, mask, btaprompt))return 0 ; - }kdb_while_each_thread (g, p); + } }else if (strcmp (argv[0 ],"btp" ) ==0 ) {struct task_struct *p;unsigned long pid;kernel/debug/kdb/kdb_main.c +4
-4@@ -2299,10 +2299,10 @@ void kdb_ps_suppressed(void)if (kdb_task_state (p, mask_I)) ++idle; } - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (kdb_task_state (p, mask_M)) ++daemon; - }kdb_while_each_thread (g, p); + }if (idle || daemon) {if (idle) kdb_printf("%d idle process%s (state I)%s\n",@@ -2370,12 +2370,12 @@ static int kdb_ps(int argc, const char **argv) }kdb_printf ("\n" );/* Now the real tasks */ - kdb_do_each_thread(g, p) { +for_each_process_thread (g, p) {if (KDB_FLAG (CMD_INTERRUPT ))return 0 ;if (kdb_task_state (p, mask))kdb_ps1 (p); - }kdb_while_each_thread (g, p); + }return 0 ; }kernel/debug/kdb/kdb_private.h +0
-4@@ -230,10 +230,6 @@ extern struct task_struct *kdb_curr_task(int);#define kdb_task_has_cpu (p) (task_curr(p)) -/* Simplify coexistence with NPTL */ -#define kdb_do_each_thread (g, p) do_each_thread(g, p) -#define kdb_while_each_thread (g, p) while_each_thread(g, p) -#define GFP_KDB (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)extern void *debug_kmalloc (size_t size,gfp_t flags);Signature · 1 line
2.26.2