Commit 37f86b46 authored by Jason Wessel's avatar Jason Wessel
Browse files

kdb,kgdb: Allow arbitrary kgdb magic knock sequences 



The first packet that gdb sends when the kernel is in kdb mode seems
to change with every release of gdb.  Instead of continuing to add
many different gdb packets, change kdb to automatically look for any
thing that looks like a gdb packet.

Example 1 cold start test:
echo g > /proc/sysrq-trigger
$D#44+

Example 2 cold start test:
echo g > /proc/sysrq-trigger
$3#33

The second one should re-enter kdb's shell right away and is purely a
test.

Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
parent d613d828

kernel/debug/kdb/kdb_io.c

+20 −8
Original line number Original line Diff line number Diff line
@@ -31,16 +31,22 @@ char kdb_prompt_str[CMD_BUFLEN]; 




int kdb_trap_printk;

int kdb_trap_printk;





static void kgdb_transition_check(char *buffer)

static int kgdb_transition_check(char *buffer)

{

{

	int slen = strlen(buffer);

	if (buffer[0] != '+' && buffer[0] != '$') {

	if (strncmp(buffer, "$?#3f", slen) != 0 &&

	    strncmp(buffer, "$qSupported", slen) != 0 &&

	    strncmp(buffer, "+$qSupported", slen) != 0) {

		KDB_STATE_SET(KGDB_TRANS);

		KDB_STATE_SET(KGDB_TRANS);

		kdb_printf("%s", buffer);

		kdb_printf("%s", buffer);

	} else {

		int slen = strlen(buffer);

		if (slen > 3 && buffer[slen - 3] == '#') {

			kdb_gdb_state_pass(buffer);

			strcpy(buffer, "kgdb");

			KDB_STATE_SET(DOING_KGDB);

			return 1;

		}

		}

	}

	}

	return 0;

}





static int kdb_read_get_key(char *buffer, size_t bufsize)

static int kdb_read_get_key(char *buffer, size_t bufsize)

{

{
@@ -251,6 +257,10 @@ poll_again: 
	case 13: /* enter */

	case 13: /* enter */

		*lastchar++ = '\n';

		*lastchar++ = '\n';

		*lastchar++ = '\0';

		*lastchar++ = '\0';

		if (!KDB_STATE(KGDB_TRANS)) {

			KDB_STATE_SET(KGDB_TRANS);

			kdb_printf("%s", buffer);

		}

		kdb_printf("\n");

		kdb_printf("\n");

		return buffer;

		return buffer;

	case 4: /* Del */

	case 4: /* Del */
@@ -382,11 +392,13 @@ poll_again: 
				 * printed characters if we think that

				 * printed characters if we think that

				 * kgdb is connecting, until the check

				 * kgdb is connecting, until the check

				 * fails */

				 * fails */

				if (!KDB_STATE(KGDB_TRANS))

				if (!KDB_STATE(KGDB_TRANS)) {

					kgdb_transition_check(buffer);

					if (kgdb_transition_check(buffer))

				else

						return buffer;

				} else {

					kdb_printf("%c", key);

					kdb_printf("%c", key);

				}

				}

			}

			/* Special escape to kgdb */

			/* Special escape to kgdb */

			if (lastchar - buffer >= 5 &&

			if (lastchar - buffer >= 5 &&

			    strcmp(lastchar - 5, "$?#3f") == 0) {

			    strcmp(lastchar - 5, "$?#3f") == 0) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE