Commit e17ac02b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kgdb-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux 

Pull kgdb updates from Daniel Thompson:
 "Everything for kgdb this time around is either simplifications or
  clean ups.

  In particular Douglas Anderson's modifications to the backtrace
  machine in the *last* dev cycle have enabled Doug to tidy up some MIPS
  specific backtrace code and stop sharing certain data structures
  across the kernel. Note that The MIPS folks were on Cc: for the MIPS
  patch and reacted positively (but without an explicit Acked-by).

  Doug also got rid of the implicit switching between tasks and register
  sets during some but not of kdb's backtrace actions (because the
  implicit switching was either confusing for users, pointless or both).

  Finally there is a coverity fix and patch to replace open coded
  console traversal with the proper helper function"

* tag 'kgdb-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux:
  kdb: Use for_each_console() helper
  kdb: remove redundant assignment to pointer bp
  kdb: Get rid of confusing diag msg from "rd" if current task has no regs
  kdb: Gid rid of implicit setting of the current task / regs
  kdb: kdb_current_task shouldn't be exported
  kdb: kdb_current_regs should be private
  MIPS: kdb: Remove old workaround for backtracing on other CPUs
parents 754beeec dc2c733e

arch/mips/kernel/traps.c

+0 −5
Original line number Diff line number Diff line
@@ -210,11 +210,6 @@ void show_stack(struct task_struct *task, unsigned long *sp) 
			regs.regs[29] = task->thread.reg29;

			regs.regs[31] = 0;

			regs.cp0_epc = task->thread.reg31;

#ifdef CONFIG_KGDB_KDB

		} else if (atomic_read(&kgdb_active) != -1 &&

			   kdb_current_regs) {

			memcpy(&regs, kdb_current_regs, sizeof(regs));

#endif /* CONFIG_KGDB_KDB */

		} else {

			prepare_frametrace(&regs);

		}

include/linux/kdb.h

+0 −2
Original line number Diff line number Diff line
@@ -183,8 +183,6 @@ int kdb_process_cpu(const struct task_struct *p) 
	return cpu;

}



/* kdb access to register set for stack dumping */

extern struct pt_regs *kdb_current_regs;

#ifdef CONFIG_KALLSYMS

extern const char *kdb_walk_kallsyms(loff_t *pos);

#else /* ! CONFIG_KALLSYMS */

kernel/debug/kdb/kdb_bp.c

+0 −1
Original line number Diff line number Diff line
@@ -412,7 +412,6 @@ static int kdb_bc(int argc, const char **argv) 
		 * assume that the breakpoint number is desired.

		 */

		if (addr < KDB_MAXBPT) {

			bp = &kdb_breakpoints[addr];

			lowbp = highbp = addr;

			highbp++;

		} else {

kernel/debug/kdb/kdb_bt.c

+1 −7
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ kdb_bt_cpu(unsigned long cpu) 
		return;

	}



	kdb_set_current_task(kdb_tsk);

	kdb_bt1(kdb_tsk, ~0UL, false);

}
@@ -166,10 +165,8 @@ kdb_bt(int argc, const char **argv) 
		if (diag)

			return diag;

		p = find_task_by_pid_ns(pid, &init_pid_ns);

		if (p) {

			kdb_set_current_task(p);

		if (p)

			return kdb_bt1(p, ~0UL, false);

		}

		kdb_printf("No process with pid == %ld found\n", pid);

		return 0;

	} else if (strcmp(argv[0], "btt") == 0) {
@@ -178,11 +175,9 @@ kdb_bt(int argc, const char **argv) 
		diag = kdbgetularg((char *)argv[1], &addr);

		if (diag)

			return diag;

		kdb_set_current_task((struct task_struct *)addr);

		return kdb_bt1((struct task_struct *)addr, ~0UL, false);

	} else if (strcmp(argv[0], "btc") == 0) {

		unsigned long cpu = ~0;

		struct task_struct *save_current_task = kdb_current_task;

		if (argc > 1)

			return KDB_ARGCOUNT;

		if (argc == 1) {
@@ -204,7 +199,6 @@ kdb_bt(int argc, const char **argv) 
				kdb_bt_cpu(cpu);

				touch_nmi_watchdog();

			}

			kdb_set_current_task(save_current_task);

		}

		return 0;

	} else {

kernel/debug/kdb/kdb_io.c

+3 −6
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ 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 = console_drivers;

	struct console *c;

	unsigned long uninitialized_var(flags);



	/* Serialize kdb_printf if multiple cpus try to write at once.
@@ -698,10 +698,9 @@ kdb_printit: 
				cp2++;

			}

		}

		while (c) {

		for_each_console(c) {

			c->write(c, cp, retlen - (cp - kdb_buffer));

			touch_nmi_watchdog();

			c = c->next;

		}

	}

	if (logging) {
@@ -752,7 +751,6 @@ kdb_printit: 
			moreprompt = "more> ";



		kdb_input_flush();

		c = console_drivers;



		if (dbg_io_ops && !dbg_io_ops->is_console) {

			len = strlen(moreprompt);
@@ -762,10 +760,9 @@ kdb_printit: 
				cp++;

			}

		}

		while (c) {

		for_each_console(c) {

			c->write(c, moreprompt, strlen(moreprompt));

			touch_nmi_watchdog();

			c = c->next;

		}



		if (logging)

CRA Git | Maintained and supported by SUSTech CRA and CCSE