kdb: Improve console handling
Subsystems (3)
v6 cover kdb: Improve console handling
This patch-set is aimed to improve console handling especially when kdb operates in NMI context.
Brief description of enhancements:
- Add status check for console prior to invoking corresponding handler.
- Fixup to avoid possible deadlock in NMI context due to usage of locks in the console handlers.
- Prefer usage of polling I/O driver mode (lockless APIs) over invocation of console handlers.
Changes in v6:
- Replace early_con -> kgdboc_earlycon_io_ops.cons.
- Added Petr's review tag on patch #1, #2 and #3.
- Drop Doug's review tag from patch #4 due to early_con changes which I think needs a re-review.
Changes in v5:
- Rebased on top of tags/kgdb-5.8-rc1.
- Get rid of kdb_io_write().
- Fixed issue reported by kbuild test robot.
- Remove is_console from kgdboc_earlycon_io_ops as well.
- Misc. comments.
- Added Doug's review tag.
Changes in v4:
- Use dbg_io_ops->write_char() directly instead of passing it as a function pointer.
- Use "struct console" rather than "struct tty_driver" for comparison.
- Make commit descriptions and comments more informative.
- Add review tag for patch #2.
Changes in v3:
- Split patch to have separate patch for console status check.
- New patch to re-factor kdb message emit code.
- New patch to prefer polling I/O over console mode.
- Add code comments to describe usage of oops_in_progress.
Changes in v2:
- Use oops_in_progress directly instead of bust_spinlocks().
Sumit Garg (4):
kdb: Re-factor kdb_printf() message write code
kdb: Check status of console prior to invoking handlers
kdb: Make kdb_printf() console handling more robust
kdb: Switch to use safer dbg_io_ops over console APIs
drivers/tty/serial/kgdb_nmi.c | 2 +- drivers/tty/serial/kgdboc.c | 32 +++++++++---------- drivers/usb/early/ehci-dbgp.c | 3 +- include/linux/kgdb.h | 5 ++- kernel/debug/kdb/kdb_io.c | 72 ++++++++++++++++++++++++++----------------- 5 files changed, 64 insertions(+), 50 deletions(-)
Signature · 1 line
2.7.4
PATCH v6 1/4 kdb: Re-factor kdb_printf() message write code
Re-factor kdb_printf() message write code in order to avoid duplication of code and thereby increase readability.
--- kernel/debug/kdb/kdb_io.c | 57 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 29 deletions(-)
kernel/debug/kdb/kdb_io.c +28 -29
@@ -542,6 +542,29 @@ static int kdb_search_string(char *searched, char *searchfor)return 0 ; } +static void kdb_msg_write (const char *msg,int msg_len) +{ +struct console *c; + +if (msg_len ==0 ) +return ; + +if (dbg_io_ops && !dbg_io_ops->is_console) { +const char *cp = msg; +int len = msg_len; + +while (len--) { + dbg_io_ops->write_char (*cp); + cp++; + } + } + +for_each_console (c) { + c->write (c, msg, msg_len); +touch_nmi_watchdog (); + } +} +int vkdb_printf (enum kdb_msgsrc src,const char *fmt,va_list ap) {int diag;
@@ -553,7 +576,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)int this_cpu, old_cpu;char *cp, *cp2, *cphold =NULL , replaced_byte =' ' ;char *moreprompt ="more> " ; -struct console *c;unsigned long uninitialized_var (flags );/* Serialize kdb_printf if multiple cpus try to write at once.
@@ -687,22 +709,11 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)*/ retlen =strlen (kdb_buffer); cp = (char *)printk_skip_headers (kdb_buffer); -if (!dbg_kdb_mode && kgdb_connected) { +if (!dbg_kdb_mode && kgdb_connected)gdbstub_msg_write (cp, retlen - (cp - kdb_buffer)); - }else { -if (dbg_io_ops && !dbg_io_ops->is_console) { - len = retlen - (cp - kdb_buffer); - cp2 = cp; -while (len--) { - dbg_io_ops->write_char (*cp2); - cp2++; - } - } -for_each_console (c) { - c->write (c, cp, retlen - (cp - kdb_buffer)); -touch_nmi_watchdog (); - } - } +else +kdb_msg_write (cp, retlen - (cp - kdb_buffer)); +if (logging) { saved_loglevel = console_loglevel; console_loglevel =CONSOLE_LOGLEVEL_SILENT ;
@@ -751,19 +762,7 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap) moreprompt ="more> " ;kdb_input_flush (); - -if (dbg_io_ops && !dbg_io_ops->is_console) { - len =strlen (moreprompt); - cp = moreprompt; -while (len--) { - dbg_io_ops->write_char (*cp); - cp++; - } - } -for_each_console (c) { - c->write (c, moreprompt,strlen (moreprompt)); -touch_nmi_watchdog (); - } +kdb_msg_write (moreprompt,strlen (moreprompt));if (logging)printk ("%s" , moreprompt);
Signature · 1 line
2.7.4
PATCH v6 2/4 kdb: Check status of console prior to invoking handlers
In reply to Sumit GargCheck if a console is enabled prior to invoking corresponding write handler.
--- kernel/debug/kdb/kdb_io.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/debug/kdb/kdb_io.c +2 -0
@@ -560,6 +560,8 @@ static void kdb_msg_write(const char *msg, int msg_len) }for_each_console (c) { +if (!(c->flags &CON_ENABLED )) +continue ; c->write (c, msg, msg_len);touch_nmi_watchdog (); }
Signature · 1 line
2.7.4
PATCH v6 3/4 kdb: Make kdb_printf() console handling more robust
In reply to Sumit GargWhile rounding up CPUs via NMIs, its possible that a rounded up CPU maybe holding a console port lock leading to kgdb master CPU stuck in a deadlock during invocation of console write operations. A similar deadlock could also be possible while using synchronous breakpoints.
So in order to avoid such a deadlock, set oops_in_progress to encourage the console drivers to disregard their internal spin locks: in the current calling context the risk of deadlock is a bigger problem than risks due to re-entering the console driver. We operate directly on oops_in_progress rather than using bust_spinlocks() because the calls bust_spinlocks() makes on exit are not appropriate for this calling context.
--- kernel/debug/kdb/kdb_io.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
kernel/debug/kdb/kdb_io.c +11 -0
@@ -562,7 +562,18 @@ static void kdb_msg_write(const char *msg, int msg_len)for_each_console (c) {if (!(c->flags &CON_ENABLED ))continue ; +/* +* Set oops_in_progress to encourage the console drivers to +* disregard their internal spin locks: in the current calling +* context the risk of deadlock is a bigger problem than risks +* due to re-entering the console driver. We operate directly on +* oops_in_progress rather than using bust_spinlocks() because +* the calls bust_spinlocks() makes on exit are not appropriate +* for this calling context. +*/ + ++oops_in_progress; c->write (c, msg, msg_len); + --oops_in_progress;touch_nmi_watchdog (); } }
Signature · 1 line
2.7.4
PATCH v6 4/4 kdb: Switch to use safer dbg_io_ops over console APIs
In reply to Sumit GargIn kgdb context, calling console handlers aren't safe due to locks used in those handlers which could in turn lead to a deadlock. Although, using oops_in_progress increases the chance to bypass locks in most console handlers but it might not be sufficient enough in case a console uses more locks (VT/TTY is good example).
Currently when a driver provides both polling I/O and a console then kdb will output using the console. We can increase robustness by using the currently active polling I/O driver (which should be lockless) instead of the corresponding console. For several common cases (e.g. an embedded system with a single serial port that is used both for console output and debugger I/O) this will result in no console handler being used.
In order to achieve this we need to reverse the order of preference to use dbg_io_ops (uses polling I/O mode) over console APIs. So we just store "struct console" that represents debugger I/O in dbg_io_ops and while emitting kdb messages, skip console that matches dbg_io_ops console in order to avoid duplicate messages. After this change, "is_console" param becomes redundant and hence removed.
--- drivers/tty/serial/kgdb_nmi.c | 2 +- drivers/tty/serial/kgdboc.c | 32 ++++++++++++++++---------------- drivers/usb/early/ehci-dbgp.c | 3 ++- include/linux/kgdb.h | 5 ++--- kernel/debug/kdb/kdb_io.c | 4 +++- 5 files changed, 24 insertions(+), 22 deletions(-)
drivers/tty/serial/kgdb_nmi.c +1 -1
@@ -50,7 +50,7 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)* I/O utilities that messages sent to the console will automatically * be displayed on the dbg_io. */ - dbg_io_ops->is_console = true; + dbg_io_ops->cons = co;return 0 ; }
drivers/tty/serial/kgdboc.c +16 -16
@@ -45,7 +45,6 @@ static struct platform_device *kgdboc_pdev;#if IS_BUILTIN (CONFIG_KGDB_SERIAL_CONSOLE )static struct kgdb_io kgdboc_earlycon_io_ops; -static struct console *earlycon;static int (*earlycon_orig_exit)(struct console *con);#endif /* IS_BUILTIN(CONFIG_KGDB_SERIAL_CONSOLE) */
@@ -145,7 +144,7 @@ static void kgdboc_unregister_kbd(void)#if IS_BUILTIN (CONFIG_KGDB_SERIAL_CONSOLE )static void cleanup_earlycon (void ) { -if (earlycon) +if (kgdboc_earlycon_io_ops.cons)kgdb_unregister_io_module (&kgdboc_earlycon_io_ops); }#else /* !IS_BUILTIN(CONFIG_KGDB_SERIAL_CONSOLE) */
@@ -178,7 +177,7 @@ static int configure_kgdboc(void) goto noconfig; } - kgdboc_io_ops.is_console =0 ; + kgdboc_io_ops.cons =NULL ; kgdb_tty_driver =NULL ; kgdboc_use_kms =0 ;
@@ -198,7 +197,7 @@ static int configure_kgdboc(void)int idx;if (cons->device && cons->device (cons, &idx) == p && idx == tty_line) { - kgdboc_io_ops.is_console =1 ; + kgdboc_io_ops.cons = cons;break ; } }
@@ -433,7 +432,8 @@ static int kgdboc_earlycon_get_char(void) {char c; -if (!earlycon->read (earlycon, &c,1 )) +if (!kgdboc_earlycon_io_ops.cons->read (kgdboc_earlycon_io_ops.cons, + &c,1 ))return NO_POLL_CHAR ;return c;
@@ -441,7 +441,8 @@ static int kgdboc_earlycon_get_char(void)static void kgdboc_earlycon_put_char (u8 chr) { - earlycon->write (earlycon, &chr,1 ); + kgdboc_earlycon_io_ops.cons->write (kgdboc_earlycon_io_ops.cons, &chr, +1 ); }static void kgdboc_earlycon_pre_exp_handler (void )
@@ -461,7 +462,7 @@ static void kgdboc_earlycon_pre_exp_handler(void)* boot if we detect this case. */ for_each_console (con) -if (con == earlycon) +if (con == kgdboc_earlycon_io_ops.cons)return ; already_warned = true;
@@ -484,25 +485,25 @@ static int kgdboc_earlycon_deferred_exit(struct console *con)static void kgdboc_earlycon_deinit (void ) { -if (!earlycon) +if (!kgdboc_earlycon_io_ops.cons)return ; -if (earlycon->exit == kgdboc_earlycon_deferred_exit) +if (kgdboc_earlycon_io_ops.cons->exit == kgdboc_earlycon_deferred_exit)/* * kgdboc_earlycon is exiting but original boot console exit * was never called (AKA kgdboc_earlycon_deferred_exit() * didn't ever run). Undo our trap. */ - earlycon->exit = earlycon_orig_exit; -else if (earlycon->exit) + kgdboc_earlycon_io_ops.cons->exit = earlycon_orig_exit; +else if (kgdboc_earlycon_io_ops.cons->exit)/* * We skipped calling the exit() routine so we could try to * keep using the boot console even after it went away. We're * finally done so call the function now. */ - earlycon->exit (earlycon); + kgdboc_earlycon_io_ops.cons->exit (kgdboc_earlycon_io_ops.cons); - earlycon =NULL ; + kgdboc_earlycon_io_ops.cons =NULL ; }static struct kgdb_io kgdboc_earlycon_io_ops = {
@@ -511,7 +512,6 @@ static struct kgdb_io kgdboc_earlycon_io_ops = { .write_char = kgdboc_earlycon_put_char, .pre_exception = kgdboc_earlycon_pre_exp_handler, .deinit = kgdboc_earlycon_deinit, - .is_console = true, };#define MAX_CONSOLE_NAME_LEN (sizeof((struct console *) 0)->name)
@@ -557,10 +557,10 @@ static int __init kgdboc_earlycon_init(char *opt) goto unlock; } - earlycon = con; + kgdboc_earlycon_io_ops.cons = con;pr_info ("Going to register kgdb with earlycon '%s'\n" , con->name);if (kgdb_register_io_module (&kgdboc_earlycon_io_ops) !=0 ) { - earlycon =NULL ; + kgdboc_earlycon_io_ops.cons =NULL ;pr_info ("Failed to register kgdb with earlycon\n" ); }else {/* Trap exit so we can keep earlycon longer if needed. */
drivers/usb/early/ehci-dbgp.c +2 -1
@@ -1058,7 +1058,8 @@ static int __init kgdbdbgp_parse_config(char *str) kgdbdbgp_wait_time =simple_strtoul (ptr, &ptr,10 ); }kgdb_register_io_module (&kgdbdbgp_io_ops); - kgdbdbgp_io_ops.is_console = early_dbgp_console.index !=-1 ; +if (early_dbgp_console.index !=-1 ) + kgdbdbgp_io_ops.cons = &early_dbgp_console;return 0 ; }
include/linux/kgdb.h +2 -3
@@ -276,8 +276,7 @@ struct kgdb_arch {* the I/O driver. * @post_exception: Pointer to a function that will do any cleanup work * for the I/O driver. -* @is_console: 1 if the end device is a console 0 if the I/O device is -* not a console +* @cons: valid if the I/O device is a console; else NULL. */ struct kgdb_io {const char *name;
@@ -288,7 +287,7 @@ struct kgdb_io {void (*deinit) (void );void (*pre_exception) (void );void (*post_exception) (void ); -int is_console; +struct console *cons; };extern const struct kgdb_arch arch_kgdb_ops;
kernel/debug/kdb/kdb_io.c +3 -1
@@ -549,7 +549,7 @@ static void kdb_msg_write(const char *msg, int msg_len)if (msg_len ==0 )return ; -if (dbg_io_ops && !dbg_io_ops->is_console) { +if (dbg_io_ops) {const char *cp = msg;int len = msg_len;
@@ -562,6 +562,8 @@ static void kdb_msg_write(const char *msg, int msg_len)for_each_console (c) {if (!(c->flags &CON_ENABLED ))continue ; +if (c == dbg_io_ops->cons) +continue ;/* * Set oops_in_progress to encourage the console drivers to * disregard their internal spin locks: in the current calling
Signature · 1 line
2.7.4
Re: [PATCH v6 4/4] kdb: Switch to use safer dbg_io_ops over console APIs
Hi,
Quoted 12 lines · Sumit Garg
drivers/tty/serial/kgdboc.c +2
-1@@ -433,7 +432,8 @@ static int kgdboc_earlycon_get_char(void) {char c; -if (!earlycon->read (earlycon, &c,1 )) +if (!kgdboc_earlycon_io_ops.cons->read (kgdboc_earlycon_io_ops.cons, + &c,1 ))return NO_POLL_CHAR ;return c;
drivers/tty/serial/kgdboc.c static int kgdboc_earlycon_get_char(void) · line 446
Quoted 7 lines
drivers/tty/serial/kgdboc.c +2
-1@@ -441,7 +441,8 @@ static int kgdboc_earlycon_get_char(void)static void kgdboc_earlycon_put_char (u8 chr) { - earlycon->write (earlycon, &chr,1 ); + kgdboc_earlycon_io_ops.cons->write (kgdboc_earlycon_io_ops.cons, &chr, +1 ); }
The get_char / put_char functions are pretty unwieldy now. If it were me I would have done:
struct console *con = kgdboc_earlycon_io_ops.cons;
...and then used it so the lines didn't wrap in such a terrible way. ;-)
I'm not sure if I'd spin just for that, though.
-Doug
Re: [PATCH v6 4/4] kdb: Switch to use safer dbg_io_ops over console APIs
In reply to Sumit GargQuoted 21 lines · Sumit Garg
In kgdb context, calling console handlers aren't safe due to locks used in those handlers which could in turn lead to a deadlock. Although, using
oops_in_progressincreases the chance to bypass locks in most console handlers but it might not be sufficient enough in case a console uses more locks (VT/TTY is good example).Currently when a driver provides both polling I/O and a console then kdb will output using the console. We can increase robustness by using the currently active polling I/O driver (which should be lockless) instead of the corresponding console. For several common cases (e.g. an embedded system with a single serial port that is used both for console output and debugger I/O) this will result in no console handler being used.
In order to achieve this we need to reverse the order of preference to use
dbg_io_ops(uses polling I/O mode) over console APIs. So we just store "struct console" that represents debugger I/O indbg_io_opsand while emitting kdb messages, skip console that matchesdbg_io_opsconsole in order to avoid duplicate messages. After this change, "is_console" param becomes redundant and hence removed.
Quoted 2 lines
Suggested-by Daniel Thompson <[email protected]>Signed-off-by Sumit Garg <[email protected]>
Looks good to me now:
Best Regards,
Petr
Re: [PATCH v6 4/4] kdb: Switch to use safer dbg_io_ops over console APIs
In reply to Sumit GargHi Greg
This patch touches some kgdb related code in both serial and usb trees.
Any objections to my queuing this via the kgdb tree?
After testing I've concluded that this, and its friends (which only touch kgdb), fix enough problems that I plan to queue it for v5.8.
Daniel.
Quoted 226 lines · Sumit Garg
In kgdb context, calling console handlers aren't safe due to locks used in those handlers which could in turn lead to a deadlock. Although, using
oops_in_progressincreases the chance to bypass locks in most console handlers but it might not be sufficient enough in case a console uses more locks (VT/TTY is good example).Currently when a driver provides both polling I/O and a console then kdb will output using the console. We can increase robustness by using the currently active polling I/O driver (which should be lockless) instead of the corresponding console. For several common cases (e.g. an embedded system with a single serial port that is used both for console output and debugger I/O) this will result in no console handler being used.
In order to achieve this we need to reverse the order of preference to use
dbg_io_ops(uses polling I/O mode) over console APIs. So we just store "struct console" that represents debugger I/O indbg_io_opsand while emitting kdb messages, skip console that matchesdbg_io_opsconsole in order to avoid duplicate messages. After this change, "is_console" param becomes redundant and hence removed.Suggested-by Daniel Thompson <[email protected]>Signed-off-by Sumit Garg <[email protected]>--- drivers/tty/serial/kgdb_nmi.c | 2 +- drivers/tty/serial/kgdboc.c | 32 ++++++++++++++++---------------- drivers/usb/early/ehci-dbgp.c | 3 ++- include/linux/kgdb.h | 5 ++--- kernel/debug/kdb/kdb_io.c | 4 +++- 5 files changed, 24 insertions(+), 22 deletions(-)drivers/tty/serial/kgdb_nmi.c +1
-1@@ -50,7 +50,7 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)* I/O utilities that messages sent to the console will automatically * be displayed on the dbg_io. */ - dbg_io_ops->is_console = true; + dbg_io_ops->cons = co;return 0 ; }drivers/tty/serial/kgdboc.c +16
-16@@ -45,7 +45,6 @@ static struct platform_device *kgdboc_pdev;#if IS_BUILTIN (CONFIG_KGDB_SERIAL_CONSOLE )static struct kgdb_io kgdboc_earlycon_io_ops; -static struct console *earlycon;static int (*earlycon_orig_exit)(struct console *con);#endif /* IS_BUILTIN(CONFIG_KGDB_SERIAL_CONSOLE) */ @@ -145,7 +144,7 @@ static void kgdboc_unregister_kbd(void)#if IS_BUILTIN (CONFIG_KGDB_SERIAL_CONSOLE )static void cleanup_earlycon (void ) { -if (earlycon) +if (kgdboc_earlycon_io_ops.cons)kgdb_unregister_io_module (&kgdboc_earlycon_io_ops); }#else /* !IS_BUILTIN(CONFIG_KGDB_SERIAL_CONSOLE) */ @@ -178,7 +177,7 @@ static int configure_kgdboc(void) goto noconfig; } - kgdboc_io_ops.is_console =0 ; + kgdboc_io_ops.cons =NULL ; kgdb_tty_driver =NULL ; kgdboc_use_kms =0 ;@@ -198,7 +197,7 @@ static int configure_kgdboc(void)int idx;if (cons->device && cons->device (cons, &idx) == p && idx == tty_line) { - kgdboc_io_ops.is_console =1 ; + kgdboc_io_ops.cons = cons;break ; } }@@ -433,7 +432,8 @@ static int kgdboc_earlycon_get_char(void) {char c; -if (!earlycon->read (earlycon, &c,1 )) +if (!kgdboc_earlycon_io_ops.cons->read (kgdboc_earlycon_io_ops.cons, + &c,1 ))return NO_POLL_CHAR ;return c;@@ -441,7 +441,8 @@ static int kgdboc_earlycon_get_char(void)static void kgdboc_earlycon_put_char (u8 chr) { - earlycon->write (earlycon, &chr,1 ); + kgdboc_earlycon_io_ops.cons->write (kgdboc_earlycon_io_ops.cons, &chr, +1 ); }static void kgdboc_earlycon_pre_exp_handler (void )@@ -461,7 +462,7 @@ static void kgdboc_earlycon_pre_exp_handler(void)* boot if we detect this case. */ for_each_console (con) -if (con == earlycon) +if (con == kgdboc_earlycon_io_ops.cons)return ; already_warned = true;@@ -484,25 +485,25 @@ static int kgdboc_earlycon_deferred_exit(struct console *con)static void kgdboc_earlycon_deinit (void ) { -if (!earlycon) +if (!kgdboc_earlycon_io_ops.cons)return ; -if (earlycon->exit == kgdboc_earlycon_deferred_exit) +if (kgdboc_earlycon_io_ops.cons->exit == kgdboc_earlycon_deferred_exit)/* * kgdboc_earlycon is exiting but original boot console exit * was never called (AKA kgdboc_earlycon_deferred_exit() * didn't ever run). Undo our trap. */ - earlycon->exit = earlycon_orig_exit; -else if (earlycon->exit) + kgdboc_earlycon_io_ops.cons->exit = earlycon_orig_exit; +else if (kgdboc_earlycon_io_ops.cons->exit)/* * We skipped calling the exit() routine so we could try to * keep using the boot console even after it went away. We're * finally done so call the function now. */ - earlycon->exit (earlycon); + kgdboc_earlycon_io_ops.cons->exit (kgdboc_earlycon_io_ops.cons); - earlycon =NULL ; + kgdboc_earlycon_io_ops.cons =NULL ; }static struct kgdb_io kgdboc_earlycon_io_ops = {@@ -511,7 +512,6 @@ static struct kgdb_io kgdboc_earlycon_io_ops = { .write_char = kgdboc_earlycon_put_char, .pre_exception = kgdboc_earlycon_pre_exp_handler, .deinit = kgdboc_earlycon_deinit, - .is_console = true, };#define MAX_CONSOLE_NAME_LEN (sizeof((struct console *) 0)->name)@@ -557,10 +557,10 @@ static int __init kgdboc_earlycon_init(char *opt) goto unlock; } - earlycon = con; + kgdboc_earlycon_io_ops.cons = con;pr_info ("Going to register kgdb with earlycon '%s'\n" , con->name);if (kgdb_register_io_module (&kgdboc_earlycon_io_ops) !=0 ) { - earlycon =NULL ; + kgdboc_earlycon_io_ops.cons =NULL ;pr_info ("Failed to register kgdb with earlycon\n" ); }else {/* Trap exit so we can keep earlycon longer if needed. */ drivers/usb/early/ehci-dbgp.c +2
-1@@ -1058,7 +1058,8 @@ static int __init kgdbdbgp_parse_config(char *str) kgdbdbgp_wait_time =simple_strtoul (ptr, &ptr,10 ); }kgdb_register_io_module (&kgdbdbgp_io_ops); - kgdbdbgp_io_ops.is_console = early_dbgp_console.index !=-1 ; +if (early_dbgp_console.index !=-1 ) + kgdbdbgp_io_ops.cons = &early_dbgp_console;return 0 ; }include/linux/kgdb.h +2
-3@@ -276,8 +276,7 @@ struct kgdb_arch {* the I/O driver. * @post_exception: Pointer to a function that will do any cleanup work * for the I/O driver. -* @is_console: 1 if the end device is a console 0 if the I/O device is -* not a console +* @cons: valid if the I/O device is a console; else NULL. */ struct kgdb_io {const char *name;@@ -288,7 +287,7 @@ struct kgdb_io {void (*deinit) (void );void (*pre_exception) (void );void (*post_exception) (void ); -int is_console; +struct console *cons; };extern const struct kgdb_arch arch_kgdb_ops;kernel/debug/kdb/kdb_io.c +3
-1@@ -549,7 +549,7 @@ static void kdb_msg_write(const char *msg, int msg_len)if (msg_len ==0 )return ; -if (dbg_io_ops && !dbg_io_ops->is_console) { +if (dbg_io_ops) {const char *cp = msg;int len = msg_len;@@ -562,6 +562,8 @@ static void kdb_msg_write(const char *msg, int msg_len)for_each_console (c) {if (!(c->flags &CON_ENABLED ))continue ; +if (c == dbg_io_ops->cons) +continue ;/* * Set oops_in_progress to encourage the console drivers to * disregard their internal spin locks: in the current calling Signature · 1 line
2.7.4
Re: [PATCH v6 4/4] kdb: Switch to use safer dbg_io_ops over console APIs
Quoted 8 lines · Daniel Thompson
Hi Greg
This patch touches some kgdb related code in both serial and usb trees.
Any objections to my queuing this via the kgdb tree?
After testing I've concluded that this, and its friends (which only touch kgdb), fix enough problems that I plan to queue it for v5.8.
No objections at all:
Quoted 7 lines · Sumit Garg
drivers/tty/serial/kgdb_nmi.c | 2 +- drivers/tty/serial/kgdboc.c | 32 +++++++++---------- drivers/usb/early/ehci-dbgp.c | 3 +- include/linux/kgdb.h | 5 ++- kernel/debug/kdb/kdb_io.c | 72 ++++++++++++++++++++++++++----------------- 5 files changed, 64 insertions(+), 50 deletions(-)
-ss