Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c536a17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb 

Pull KGDB/KDB fixes and cleanups from Jason Wessel:
 "Cleanups
   - Clean up compile warnings in kgdboc.c and x86/kernel/kgdb.c
   - Add module event hooks for simplified debugging with gdb
 Fixes
   - Fix kdb to stop paging with 'q' on bta and dmesg
   - Fix for data that scrolls off the vga console due to line wrapping
     when using the kdb pager
 New
   - The debug core registers for kernel module events which allows a
     kernel aware gdb to automatically load symbols and break on entry
     to a kernel module
   - Allow kgdboc=kdb to setup kdb on the vga console"

* tag 'for_linus-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
  tty/console: fix warnings in drivers/tty/serial/kgdboc.c
  kdb,vt_console: Fix missed data due to pager overruns
  kdb: Fix dmesg/bta scroll to quit with 'q'
  kgdboc: Accept either kbd or kdb to activate the vga + keyboard kdb shell
  kgdb,x86: fix warning about unused variable
  mips,kgdb: fix recursive page fault with CONFIG_KPROBES
  kgdb: Add module event hooks
parents ba8a3d6c f2f0945e

arch/mips/kernel/kgdb.c

+9 −0
Original line number Diff line number Diff line
@@ -283,6 +283,15 @@ static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd, 
	struct pt_regs *regs = args->regs;

	int trap = (regs->cp0_cause & 0x7c) >> 2;



#ifdef CONFIG_KPROBES

	/*

	 * Return immediately if the kprobes fault notifier has set

	 * DIE_PAGE_FAULT.

	 */

	if (cmd == DIE_PAGE_FAULT)

		return NOTIFY_DONE;

#endif /* CONFIG_KPROBES */



	/* Userspace events, ignore. */

	if (user_mode(regs))

		return NOTIFY_DONE;

arch/x86/kernel/kgdb.c

+2 −0
Original line number Diff line number Diff line
@@ -746,7 +746,9 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) 
int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)

{

	int err;

#ifdef CONFIG_DEBUG_RODATA

	char opc[BREAK_INSTR_SIZE];

#endif /* CONFIG_DEBUG_RODATA */



	bpt->type = BP_BREAKPOINT;

	err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,

drivers/tty/serial/kgdboc.c

+2 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ static void kgdboc_restore_input(void) 


static int kgdboc_register_kbd(char **cptr)

{

	if (strncmp(*cptr, "kbd", 3) == 0) {

	if (strncmp(*cptr, "kbd", 3) == 0 ||

		strncmp(*cptr, "kdb", 3) == 0) {

		if (kdb_poll_idx < KDB_POLL_FUNC_MAX) {

			kdb_poll_funcs[kdb_poll_idx] = kdb_get_kbd_char;

			kdb_poll_idx++;

drivers/tty/vt/vt.c

+13 −0
Original line number Diff line number Diff line
@@ -3442,6 +3442,19 @@ int con_debug_enter(struct vc_data *vc) 
			kdb_set(2, setargs);

		}

	}

	if (vc->vc_cols < 999) {

		int colcount;

		char cols[4];

		const char *setargs[3] = {

			"set",

			"COLUMNS",

			cols,

		};

		if (kdbgetintenv(setargs[0], &colcount)) {

			snprintf(cols, 4, "%i", vc->vc_cols);

			kdb_set(2, setargs);

		}

	}

#endif /* CONFIG_KGDB_KDB */

	return ret;

}

include/linux/console.h

+8 −2
Original line number Diff line number Diff line
@@ -83,8 +83,14 @@ void give_up_console(const struct consw *sw); 
int con_debug_enter(struct vc_data *vc);

int con_debug_leave(void);

#else

#define con_debug_enter(vc) (0)

#define con_debug_leave() (0)

static inline int con_debug_enter(struct vc_data *vc)

{

	return 0;

}

static inline int con_debug_leave(void)

{

	return 0;

}

#endif



/* scroll */