Commit 3cfb0774 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull KGDB/KDB fixes and cleanups from Jason Wessel:
 "For a change we removed more code than we added.  If people aren't
  using it we shouldn't be carrying it.  :-)

  Cleanups:
   - Remove kdb ssb command - there is no in kernel disassembler to
     support it

   - Remove kdb ll command - Always caused a kernel oops and there were
     no bug reports so no one was using this command

   - Use kernel ARRAY_SIZE macro instead of array computations

  Fixes:
   - Stop oops in kdb if user executes kdb_defcmd with args

   - kdb help command truncated text

   - ppc64 support for kgdbts

   - Add missing kconfig option from original kdb port for dealing with
     catastrophic kernel crashes such that you can reboot automatically
     on continue from kdb"

* tag 'for_linux-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
  kdb: Remove unhandled ssb command
  kdb: Prevent kernel oops with kdb_defcmd
  kdb: Remove the ll command
  kdb_main: fix help print
  kdb: Fix overlap in buffers with strcpy
  Fixed dead ifdef block by adding missing Kconfig option.
  kdb: Setup basic kdb state before invoking commands via kgdb
  kdb: use ARRAY_SIZE where possible
  kgdb/kgdbts: support ppc64
  kdb: A fix for kdb command table expansion
parents e23b6225 36dfea42

drivers/misc/kgdbts.c

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
#include <linux/delay.h>

#include <linux/kthread.h>

#include <linux/module.h>

#include <asm/sections.h>



#define v1printk(a...) do { \

	if (verbose) \
@@ -222,6 +223,7 @@ static unsigned long lookup_addr(char *arg) 
		addr = (unsigned long)do_fork;

	else if (!strcmp(arg, "hw_break_val"))

		addr = (unsigned long)&hw_break_val;

	addr = (unsigned long) dereference_function_descriptor((void *)addr);

	return addr;

}

kernel/debug/debug_core.h

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ extern int dbg_kdb_mode; 
#ifdef CONFIG_KGDB_KDB

extern int kdb_stub(struct kgdb_state *ks);

extern int kdb_parse(const char *cmdstr);

extern int kdb_common_init_state(struct kgdb_state *ks);

extern int kdb_common_deinit_state(void);

#else /* ! CONFIG_KGDB_KDB */

static inline int kdb_stub(struct kgdb_state *ks)

{

kernel/debug/gdbstub.c

+3 −0
Original line number Diff line number Diff line
@@ -783,7 +783,10 @@ static void gdb_cmd_query(struct kgdb_state *ks) 
			len = len / 2;

			remcom_out_buffer[len++] = 0;



			kdb_common_init_state(ks);

			kdb_parse(remcom_out_buffer);

			kdb_common_deinit_state();



			strcpy(remcom_out_buffer, "OK");

		}

		break;

kernel/debug/kdb/kdb_bp.c

+2 −18
Original line number Diff line number Diff line
@@ -486,11 +486,9 @@ static int kdb_bc(int argc, const char **argv) 
/*

 * kdb_ss

 *

 *	Process the 'ss' (Single Step) and 'ssb' (Single Step to Branch)

 *	commands.

 *	Process the 'ss' (Single Step) command.

 *

 *	ss

 *	ssb

 *

 * Parameters:

 *	argc	Argument count
@@ -498,35 +496,23 @@ static int kdb_bc(int argc, const char **argv) 
 * Outputs:

 *	None.

 * Returns:

 *	KDB_CMD_SS[B] for success, a kdb error if failure.

 *	KDB_CMD_SS for success, a kdb error if failure.

 * Locking:

 *	None.

 * Remarks:

 *

 *	Set the arch specific option to trigger a debug trap after the next

 *	instruction.

 *

 *	For 'ssb', set the trace flag in the debug trap handler

 *	after printing the current insn and return directly without

 *	invoking the kdb command processor, until a branch instruction

 *	is encountered.

 */



static int kdb_ss(int argc, const char **argv)

{

	int ssb = 0;



	ssb = (strcmp(argv[0], "ssb") == 0);

	if (argc != 0)

		return KDB_ARGCOUNT;

	/*

	 * Set trace flag and go.

	 */

	KDB_STATE_SET(DOING_SS);

	if (ssb) {

		KDB_STATE_SET(DOING_SSB);

		return KDB_CMD_SSB;

	}

	return KDB_CMD_SS;

}
@@ -561,8 +547,6 @@ void __init kdb_initbptab(void) 


	kdb_register_repeat("ss", kdb_ss, "",

		"Single Step", 1, KDB_REPEAT_NO_ARGS);

	kdb_register_repeat("ssb", kdb_ss, "",

		"Single step to branch/call", 0, KDB_REPEAT_NO_ARGS);

	/*

	 * Architecture dependent initialization.

	 */

kernel/debug/kdb/kdb_debugger.c

+18 −7
Original line number Diff line number Diff line
@@ -34,6 +34,22 @@ EXPORT_SYMBOL_GPL(kdb_poll_idx); 


static struct kgdb_state *kdb_ks;



int kdb_common_init_state(struct kgdb_state *ks)

{

	kdb_initial_cpu = atomic_read(&kgdb_active);

	kdb_current_task = kgdb_info[ks->cpu].task;

	kdb_current_regs = kgdb_info[ks->cpu].debuggerinfo;

	return 0;

}



int kdb_common_deinit_state(void)

{

	kdb_initial_cpu = -1;

	kdb_current_task = NULL;

	kdb_current_regs = NULL;

	return 0;

}



int kdb_stub(struct kgdb_state *ks)

{

	int error = 0;
@@ -94,13 +110,10 @@ int kdb_stub(struct kgdb_state *ks) 
	}

	/* Set initial kdb state variables */

	KDB_STATE_CLEAR(KGDB_TRANS);

	kdb_initial_cpu = atomic_read(&kgdb_active);

	kdb_current_task = kgdb_info[ks->cpu].task;

	kdb_current_regs = kgdb_info[ks->cpu].debuggerinfo;

	kdb_common_init_state(ks);

	/* Remove any breakpoints as needed by kdb and clear single step */

	kdb_bp_remove();

	KDB_STATE_CLEAR(DOING_SS);

	KDB_STATE_CLEAR(DOING_SSB);

	KDB_STATE_SET(PAGER);

	/* zero out any offline cpu data */

	for_each_present_cpu(i) {
@@ -125,9 +138,7 @@ int kdb_stub(struct kgdb_state *ks) 
	 * Upon exit from the kdb main loop setup break points and restart

	 * the system based on the requested continue state

	 */

	kdb_initial_cpu = -1;

	kdb_current_task = NULL;

	kdb_current_regs = NULL;

	kdb_common_deinit_state();

	KDB_STATE_CLEAR(PAGER);

	kdbnearsym_cleanup();

	if (error == KDB_CMD_KGDB) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE