| Message ID | 20200819104655.436656-10-christian.brauner@ubuntu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f30897c17df0909ecd5f3041a5f83a84bf59ba96 |
| Headers | show |
| Series | Introduce kernel_clone(), kill _do_fork() | expand |
On Wed, Aug 19, 2020 at 12:46:53PM +0200, Christian Brauner wrote: > The old _do_fork() helper is removed in favor of the new kernel_clone() helper. > The latter adheres to naming conventions for kernel internal syscall helpers. > > Cc: Douglas Anderson <dianders@chromium.org> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Daniel Thompson <daniel.thompson@linaro.org> > Cc: Jason Wessel <jason.wessel@windriver.com> > Cc: kgdb-bugreport@lists.sourceforge.net > Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> Acked-by: Daniel Thompson <daniel.thompson@linaro.org> Tested-by: Daniel Thompson <daniel.thompson@linaro.org> Daniel. > --- > /* v2 */ > unchanged > --- > drivers/misc/kgdbts.c | 48 +++++++++++++++++++++---------------------- > 1 file changed, 24 insertions(+), 24 deletions(-) > > diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c > index d5d2af4d10e6..945701bce553 100644 > --- a/drivers/misc/kgdbts.c > +++ b/drivers/misc/kgdbts.c > @@ -33,16 +33,16 @@ > * You can also specify optional tests: > * N## = Go to sleep with interrupts of for ## seconds > * to test the HW NMI watchdog > - * F## = Break at do_fork for ## iterations > + * F## = Break at kernel_clone for ## iterations > * S## = Break at sys_open for ## iterations > * I## = Run the single step test ## iterations > * > - * NOTE: that the do_fork and sys_open tests are mutually exclusive. > + * NOTE: that the kernel_clone and sys_open tests are mutually exclusive. > * > * To invoke the kgdb test suite from boot you use a kernel start > * argument as follows: > * kgdbts=V1 kgdbwait > - * Or if you wanted to perform the NMI test for 6 seconds and do_fork > + * Or if you wanted to perform the NMI test for 6 seconds and kernel_clone > * test for 100 forks, you could use: > * kgdbts=V1N6F100 kgdbwait > * > @@ -74,7 +74,7 @@ > * echo kgdbts=V1S10000 > /sys/module/kgdbts/parameters/kgdbts > * fg # and hit control-c > * fg # and hit control-c > - * ## This tests break points on do_fork > + * ## This tests break points on kernel_clone > * while [ 1 ] ; do date > /dev/null ; done & > * while [ 1 ] ; do date > /dev/null ; done & > * echo kgdbts=V1F1000 > /sys/module/kgdbts/parameters/kgdbts > @@ -209,8 +209,8 @@ static unsigned long lookup_addr(char *arg) > addr = (unsigned long)kgdbts_break_test; > else if (!strcmp(arg, "sys_open")) > addr = (unsigned long)do_sys_open; > - else if (!strcmp(arg, "do_fork")) > - addr = (unsigned long)_do_fork; > + else if (!strcmp(arg, "kernel_clone")) > + addr = (unsigned long)kernel_clone; > else if (!strcmp(arg, "hw_break_val")) > addr = (unsigned long)&hw_break_val; > addr = (unsigned long) dereference_function_descriptor((void *)addr); > @@ -310,7 +310,7 @@ static int check_and_rewind_pc(char *put_str, char *arg) > > if (arch_needs_sstep_emulation && sstep_addr && > ip + offset == sstep_addr && > - ((!strcmp(arg, "sys_open") || !strcmp(arg, "do_fork")))) { > + ((!strcmp(arg, "sys_open") || !strcmp(arg, "kernel_clone")))) { > /* This is special case for emulated single step */ > v2printk("Emul: rewind hit single step bp\n"); > restart_from_top_after_write = 1; > @@ -596,19 +596,19 @@ static struct test_struct singlestep_break_test[] = { > }; > > /* > - * Test for hitting a breakpoint at do_fork for what ever the number > + * Test for hitting a breakpoint at kernel_clone for what ever the number > * of iterations required by the variable repeat_test. > */ > -static struct test_struct do_fork_test[] = { > +static struct test_struct do_kernel_clone_test[] = { > { "?", "S0*" }, /* Clear break points */ > - { "do_fork", "OK", sw_break, }, /* set sw breakpoint */ > + { "kernel_clone", "OK", sw_break, }, /* set sw breakpoint */ > { "c", "T0*", NULL, get_thread_id_continue }, /* Continue */ > - { "do_fork", "OK", sw_rem_break }, /*remove breakpoint */ > - { "g", "do_fork", NULL, check_and_rewind_pc }, /* check location */ > + { "kernel_clone", "OK", sw_rem_break }, /*remove breakpoint */ > + { "g", "kernel_clone", NULL, check_and_rewind_pc }, /* check location */ > { "write", "OK", write_regs, emul_reset }, /* Write registers */ > { "s", "T0*", emul_sstep_get, emul_sstep_put }, /* Single step */ > - { "g", "do_fork", NULL, check_single_step }, > - { "do_fork", "OK", sw_break, }, /* set sw breakpoint */ > + { "g", "kernel_clone", NULL, check_single_step }, > + { "kernel_clone", "OK", sw_break, }, /* set sw breakpoint */ > { "7", "T0*", skip_back_repeat_test }, /* Loop based on repeat_test */ > { "D", "OK", NULL, final_ack_set }, /* detach and unregister I/O */ > { "", "", get_cont_catch, put_cont_catch }, > @@ -935,11 +935,11 @@ static void run_bad_read_test(void) > kgdb_breakpoint(); > } > > -static void run_do_fork_test(void) > +static void run_kernel_clone_test(void) > { > init_simple_test(); > - ts.tst = do_fork_test; > - ts.name = "do_fork_test"; > + ts.tst = do_kernel_clone_test; > + ts.name = "do_kernel_clone_test"; > /* Activate test with initial breakpoint */ > kgdb_breakpoint(); > } > @@ -967,7 +967,7 @@ static void run_singlestep_break_test(void) > static void kgdbts_run_tests(void) > { > char *ptr; > - int fork_test = 0; > + int clone_test = 0; > int do_sys_open_test = 0; > int sstep_test = 1000; > int nmi_sleep = 0; > @@ -981,7 +981,7 @@ static void kgdbts_run_tests(void) > > ptr = strchr(config, 'F'); > if (ptr) > - fork_test = simple_strtol(ptr + 1, NULL, 10); > + clone_test = simple_strtol(ptr + 1, NULL, 10); > ptr = strchr(config, 'S'); > if (ptr) > do_sys_open_test = simple_strtol(ptr + 1, NULL, 10); > @@ -1025,16 +1025,16 @@ static void kgdbts_run_tests(void) > run_nmi_sleep_test(nmi_sleep); > } > > - /* If the do_fork test is run it will be the last test that is > + /* If the kernel_clone test is run it will be the last test that is > * executed because a kernel thread will be spawned at the very > * end to unregister the debug hooks. > */ > - if (fork_test) { > - repeat_test = fork_test; > - printk(KERN_INFO "kgdbts:RUN do_fork for %i breakpoints\n", > + if (clone_test) { > + repeat_test = clone_test; > + printk(KERN_INFO "kgdbts:RUN kernel_clone for %i breakpoints\n", > repeat_test); > kthread_run(kgdbts_unreg_thread, NULL, "kgdbts_unreg"); > - run_do_fork_test(); > + run_kernel_clone_test(); > return; > } > > -- > 2.28.0 >
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c index d5d2af4d10e6..945701bce553 100644 --- a/drivers/misc/kgdbts.c +++ b/drivers/misc/kgdbts.c @@ -33,16 +33,16 @@ * You can also specify optional tests: * N## = Go to sleep with interrupts of for ## seconds * to test the HW NMI watchdog - * F## = Break at do_fork for ## iterations + * F## = Break at kernel_clone for ## iterations * S## = Break at sys_open for ## iterations * I## = Run the single step test ## iterations * - * NOTE: that the do_fork and sys_open tests are mutually exclusive. + * NOTE: that the kernel_clone and sys_open tests are mutually exclusive. * * To invoke the kgdb test suite from boot you use a kernel start * argument as follows: * kgdbts=V1 kgdbwait - * Or if you wanted to perform the NMI test for 6 seconds and do_fork + * Or if you wanted to perform the NMI test for 6 seconds and kernel_clone * test for 100 forks, you could use: * kgdbts=V1N6F100 kgdbwait * @@ -74,7 +74,7 @@ * echo kgdbts=V1S10000 > /sys/module/kgdbts/parameters/kgdbts * fg # and hit control-c * fg # and hit control-c - * ## This tests break points on do_fork + * ## This tests break points on kernel_clone * while [ 1 ] ; do date > /dev/null ; done & * while [ 1 ] ; do date > /dev/null ; done & * echo kgdbts=V1F1000 > /sys/module/kgdbts/parameters/kgdbts @@ -209,8 +209,8 @@ static unsigned long lookup_addr(char *arg) addr = (unsigned long)kgdbts_break_test; else if (!strcmp(arg, "sys_open")) addr = (unsigned long)do_sys_open; - else if (!strcmp(arg, "do_fork")) - addr = (unsigned long)_do_fork; + else if (!strcmp(arg, "kernel_clone")) + addr = (unsigned long)kernel_clone; else if (!strcmp(arg, "hw_break_val")) addr = (unsigned long)&hw_break_val; addr = (unsigned long) dereference_function_descriptor((void *)addr); @@ -310,7 +310,7 @@ static int check_and_rewind_pc(char *put_str, char *arg) if (arch_needs_sstep_emulation && sstep_addr && ip + offset == sstep_addr && - ((!strcmp(arg, "sys_open") || !strcmp(arg, "do_fork")))) { + ((!strcmp(arg, "sys_open") || !strcmp(arg, "kernel_clone")))) { /* This is special case for emulated single step */ v2printk("Emul: rewind hit single step bp\n"); restart_from_top_after_write = 1; @@ -596,19 +596,19 @@ static struct test_struct singlestep_break_test[] = { }; /* - * Test for hitting a breakpoint at do_fork for what ever the number + * Test for hitting a breakpoint at kernel_clone for what ever the number * of iterations required by the variable repeat_test. */ -static struct test_struct do_fork_test[] = { +static struct test_struct do_kernel_clone_test[] = { { "?", "S0*" }, /* Clear break points */ - { "do_fork", "OK", sw_break, }, /* set sw breakpoint */ + { "kernel_clone", "OK", sw_break, }, /* set sw breakpoint */ { "c", "T0*", NULL, get_thread_id_continue }, /* Continue */ - { "do_fork", "OK", sw_rem_break }, /*remove breakpoint */ - { "g", "do_fork", NULL, check_and_rewind_pc }, /* check location */ + { "kernel_clone", "OK", sw_rem_break }, /*remove breakpoint */ + { "g", "kernel_clone", NULL, check_and_rewind_pc }, /* check location */ { "write", "OK", write_regs, emul_reset }, /* Write registers */ { "s", "T0*", emul_sstep_get, emul_sstep_put }, /* Single step */ - { "g", "do_fork", NULL, check_single_step }, - { "do_fork", "OK", sw_break, }, /* set sw breakpoint */ + { "g", "kernel_clone", NULL, check_single_step }, + { "kernel_clone", "OK", sw_break, }, /* set sw breakpoint */ { "7", "T0*", skip_back_repeat_test }, /* Loop based on repeat_test */ { "D", "OK", NULL, final_ack_set }, /* detach and unregister I/O */ { "", "", get_cont_catch, put_cont_catch }, @@ -935,11 +935,11 @@ static void run_bad_read_test(void) kgdb_breakpoint(); } -static void run_do_fork_test(void) +static void run_kernel_clone_test(void) { init_simple_test(); - ts.tst = do_fork_test; - ts.name = "do_fork_test"; + ts.tst = do_kernel_clone_test; + ts.name = "do_kernel_clone_test"; /* Activate test with initial breakpoint */ kgdb_breakpoint(); } @@ -967,7 +967,7 @@ static void run_singlestep_break_test(void) static void kgdbts_run_tests(void) { char *ptr; - int fork_test = 0; + int clone_test = 0; int do_sys_open_test = 0; int sstep_test = 1000; int nmi_sleep = 0; @@ -981,7 +981,7 @@ static void kgdbts_run_tests(void) ptr = strchr(config, 'F'); if (ptr) - fork_test = simple_strtol(ptr + 1, NULL, 10); + clone_test = simple_strtol(ptr + 1, NULL, 10); ptr = strchr(config, 'S'); if (ptr) do_sys_open_test = simple_strtol(ptr + 1, NULL, 10); @@ -1025,16 +1025,16 @@ static void kgdbts_run_tests(void) run_nmi_sleep_test(nmi_sleep); } - /* If the do_fork test is run it will be the last test that is + /* If the kernel_clone test is run it will be the last test that is * executed because a kernel thread will be spawned at the very * end to unregister the debug hooks. */ - if (fork_test) { - repeat_test = fork_test; - printk(KERN_INFO "kgdbts:RUN do_fork for %i breakpoints\n", + if (clone_test) { + repeat_test = clone_test; + printk(KERN_INFO "kgdbts:RUN kernel_clone for %i breakpoints\n", repeat_test); kthread_run(kgdbts_unreg_thread, NULL, "kgdbts_unreg"); - run_do_fork_test(); + run_kernel_clone_test(); return; }
The old _do_fork() helper is removed in favor of the new kernel_clone() helper. The latter adheres to naming conventions for kernel internal syscall helpers. Cc: Douglas Anderson <dianders@chromium.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Daniel Thompson <daniel.thompson@linaro.org> Cc: Jason Wessel <jason.wessel@windriver.com> Cc: kgdb-bugreport@lists.sourceforge.net Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> --- /* v2 */ unchanged --- drivers/misc/kgdbts.c | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-)