diff mbox series

[v2,15/38] gdbserver: implement NoAckMode

Message ID 20220329154931.493851-16-npiggin@gmail.com
State New
Headers show
Series gdbserver multi-threaded debugging and POWER9/10 support | expand

Commit Message

Nicholas Piggin March 29, 2022, 3:49 p.m. UTC 
This removes a bunch of synchronous round-trips and makes things
significantly faster when attached to a high latency link.

Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 src/gdb_parser.rl           |  14 +-
 src/gdb_parser_precompile.c | 291 ++++++++++++++++++++----------------
 2 files changed, 170 insertions(+), 135 deletions(-)
diff mbox series

Patch

diff --git a/src/gdb_parser.rl b/src/gdb_parser.rl
index 020f10d..e49d56d 100644
--- a/src/gdb_parser.rl
+++ b/src/gdb_parser.rl
@@ -62,10 +62,12 @@ 
 		/* *data should point to the CRC */
 		if (crc != *data) {
 			printf("CRC error cmd %d\n", cmd);
-			send_nack(priv);
+			if (ack_mode)
+				send_nack(priv);
 		} else {
 			PR_INFO("Cmd %d\n", cmd);
-			send_ack(priv);
+			if (ack_mode)
+				send_ack(priv);
 
 			/* Push the response onto the stack */
 			if (rsp)
@@ -112,8 +114,9 @@ 
 	# TODO: We don't actually listen to what's supported
 	q_attached = ('qAttached:' xdigit* @{rsp = "1";});
 	q_C = ('qC' @{rsp = "QC1";});
-	q_supported = ('qSupported:' any* >{rsp = "multiprocess+;vContSupported+";});
+	q_supported = ('qSupported:' any* >{rsp = "multiprocess+;vContSupported+;QStartNoAckMode+"; ack_mode = true;});
 	qf_threadinfo = ('qfThreadInfo' @{rsp = "m1l";});
+	q_start_noack = ('QStartNoAckMode' @{rsp = "OK"; send_ack(priv); ack_mode = false;});
 
 	# vCont packet parsing
 	v_contq = ('vCont?' @{rsp = "vCont;c;C;s;S";});
@@ -125,7 +128,8 @@ 
 
 	commands = (get_mem | get_gprs | get_spr | stop_reason | set_thread |
 		    q_attached | q_C | q_supported | qf_threadinfo | q_C |
-		    v_contq | v_contc | v_conts | put_mem | detach | unknown );
+		    q_start_noack | v_contq | v_contc | v_conts | put_mem |
+		    detach | unknown );
 
 	cmd = (('$' ((commands & ^'#'*) >reset $crc)
 	      ('#' xdigit{2} $hex_digit @end)) >{PR_INFO("RAGEL:cmd\n");});
@@ -149,6 +153,8 @@  static int cs;
 
 static command_cb *command_callbacks;
 
+static bool ack_mode = true;
+
 %%write data;
 
 void parser_init(command_cb *callbacks)
diff --git a/src/gdb_parser_precompile.c b/src/gdb_parser_precompile.c
index 553af1a..ba63fac 100644
--- a/src/gdb_parser_precompile.c
+++ b/src/gdb_parser_precompile.c
@@ -11,7 +11,7 @@ 
 #include "debug.h"
 
 
-#line 139 "src/gdb_parser.rl"
+#line 143 "src/gdb_parser.rl"
 
 
 static enum gdb_command cmd = NONE;
@@ -25,160 +25,183 @@  static int cs;
 
 static command_cb *command_callbacks;
 
+static bool ack_mode = true;
+
 
-#line 30 "src/gdb_parser.c"
+#line 32 "src/gdb_parser.c"
 static const char _gdb_actions[] = {
 	0, 1, 0, 1, 1, 1, 2, 1, 
-	3, 1, 16, 1, 21, 1, 22, 1, 
-	23, 1, 24, 2, 0, 1, 2, 2, 
+	3, 1, 16, 1, 22, 1, 23, 1, 
+	24, 1, 25, 2, 0, 1, 2, 2, 
 	1, 2, 3, 1, 2, 3, 5, 2, 
 	4, 1, 2, 12, 1, 2, 14, 1, 
 	2, 15, 1, 2, 16, 1, 2, 17, 
 	1, 2, 18, 1, 2, 19, 1, 2, 
-	20, 1, 3, 0, 6, 1, 3, 0, 
-	7, 1, 3, 0, 9, 1, 3, 0, 
-	10, 1, 3, 0, 11, 1, 3, 0, 
-	13, 1, 3, 2, 8, 1
+	20, 1, 2, 21, 1, 3, 0, 6, 
+	1, 3, 0, 7, 1, 3, 0, 9, 
+	1, 3, 0, 10, 1, 3, 0, 11, 
+	1, 3, 0, 13, 1, 3, 2, 8, 
+	1
 };
 
 static const unsigned char _gdb_key_offsets[] = {
-	0, 0, 10, 11, 17, 23, 30, 37, 
-	38, 45, 53, 60, 68, 75, 82, 90, 
-	95, 97, 99, 101, 103, 105, 107, 109, 
-	111, 118, 120, 122, 124, 126, 128, 130, 
-	132, 134, 136, 137, 139, 141, 143, 145, 
-	147, 149, 151, 153, 155, 157, 159, 161, 
-	163, 165, 168, 171, 172, 173
+	0, 0, 11, 12, 18, 24, 31, 38, 
+	39, 46, 54, 61, 69, 76, 78, 80, 
+	82, 84, 86, 88, 90, 92, 94, 96, 
+	98, 100, 102, 104, 111, 119, 124, 126, 
+	128, 130, 132, 134, 136, 138, 140, 147, 
+	149, 151, 153, 155, 157, 159, 161, 163, 
+	165, 166, 168, 170, 172, 174, 176, 178, 
+	180, 182, 184, 186, 188, 190, 192, 194, 
+	197, 200, 201, 202
 };
 
 static const char _gdb_trans_keys[] = {
-	35, 63, 68, 72, 77, 103, 109, 112, 
-	113, 118, 35, 48, 57, 65, 70, 97, 
-	102, 48, 57, 65, 70, 97, 102, 35, 
+	35, 63, 68, 72, 77, 81, 103, 109, 
+	112, 113, 118, 35, 48, 57, 65, 70, 
+	97, 102, 48, 57, 65, 70, 97, 102, 
+	35, 48, 57, 65, 70, 97, 102, 35, 
+	48, 57, 65, 70, 97, 102, 35, 35, 
+	48, 57, 65, 70, 97, 102, 35, 44, 
 	48, 57, 65, 70, 97, 102, 35, 48, 
-	57, 65, 70, 97, 102, 35, 35, 48, 
-	57, 65, 70, 97, 102, 35, 44, 48, 
+	57, 65, 70, 97, 102, 35, 58, 48, 
 	57, 65, 70, 97, 102, 35, 48, 57, 
-	65, 70, 97, 102, 35, 58, 48, 57, 
-	65, 70, 97, 102, 35, 48, 57, 65, 
-	70, 97, 102, 35, 48, 57, 65, 70, 
-	97, 102, 35, 44, 48, 57, 65, 70, 
-	97, 102, 35, 65, 67, 83, 102, 35, 
-	116, 35, 116, 35, 97, 35, 99, 35, 
-	104, 35, 101, 35, 100, 35, 58, 35, 
-	48, 57, 65, 70, 97, 102, 35, 117, 
-	35, 112, 35, 112, 35, 111, 35, 114, 
-	35, 116, 35, 101, 35, 100, 35, 58, 
-	35, 35, 84, 35, 104, 35, 114, 35, 
-	101, 35, 97, 35, 100, 35, 73, 35, 
-	110, 35, 102, 35, 111, 35, 67, 35, 
-	111, 35, 110, 35, 116, 35, 59, 63, 
-	35, 99, 115, 35, 35, 3, 36, 43, 
-	45, 0
+	65, 70, 97, 102, 35, 83, 35, 116, 
+	35, 97, 35, 114, 35, 116, 35, 78, 
+	35, 111, 35, 65, 35, 99, 35, 107, 
+	35, 77, 35, 111, 35, 100, 35, 101, 
+	35, 48, 57, 65, 70, 97, 102, 35, 
+	44, 48, 57, 65, 70, 97, 102, 35, 
+	65, 67, 83, 102, 35, 116, 35, 116, 
+	35, 97, 35, 99, 35, 104, 35, 101, 
+	35, 100, 35, 58, 35, 48, 57, 65, 
+	70, 97, 102, 35, 117, 35, 112, 35, 
+	112, 35, 111, 35, 114, 35, 116, 35, 
+	101, 35, 100, 35, 58, 35, 35, 84, 
+	35, 104, 35, 114, 35, 101, 35, 97, 
+	35, 100, 35, 73, 35, 110, 35, 102, 
+	35, 111, 35, 67, 35, 111, 35, 110, 
+	35, 116, 35, 59, 63, 35, 99, 115, 
+	35, 35, 3, 36, 43, 45, 0
 };
 
 static const char _gdb_single_lengths[] = {
-	0, 10, 1, 0, 0, 1, 1, 1, 
-	1, 2, 1, 2, 1, 1, 2, 5, 
+	0, 11, 1, 0, 0, 1, 1, 1, 
+	1, 2, 1, 2, 1, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	1, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 1, 2, 2, 2, 2, 2, 
+	2, 2, 2, 1, 2, 5, 2, 2, 
+	2, 2, 2, 2, 2, 2, 1, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 3, 3, 1, 1, 4
+	1, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 3, 
+	3, 1, 1, 4
 };
 
 static const char _gdb_range_lengths[] = {
 	0, 0, 0, 3, 3, 3, 3, 0, 
-	3, 3, 3, 3, 3, 3, 3, 0, 
+	3, 3, 3, 3, 3, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	3, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 3, 3, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 3, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0
 };
 
-static const unsigned char _gdb_index_offsets[] = {
-	0, 0, 11, 13, 17, 21, 26, 31, 
-	33, 38, 44, 49, 55, 60, 65, 71, 
-	77, 80, 83, 86, 89, 92, 95, 98, 
-	101, 106, 109, 112, 115, 118, 121, 124, 
-	127, 130, 133, 135, 138, 141, 144, 147, 
-	150, 153, 156, 159, 162, 165, 168, 171, 
-	174, 177, 181, 185, 187, 189
+static const short _gdb_index_offsets[] = {
+	0, 0, 12, 14, 18, 22, 27, 32, 
+	34, 39, 45, 50, 56, 61, 64, 67, 
+	70, 73, 76, 79, 82, 85, 88, 91, 
+	94, 97, 100, 103, 108, 114, 120, 123, 
+	126, 129, 132, 135, 138, 141, 144, 149, 
+	152, 155, 158, 161, 164, 167, 170, 173, 
+	176, 178, 181, 184, 187, 190, 193, 196, 
+	199, 202, 205, 208, 211, 214, 217, 220, 
+	224, 228, 230, 232
 };
 
 static const char _gdb_indicies[] = {
 	1, 2, 3, 4, 5, 6, 7, 8, 
-	9, 10, 0, 12, 11, 13, 13, 13, 
-	14, 15, 15, 15, 14, 12, 16, 16, 
-	16, 11, 17, 16, 16, 16, 11, 12, 
-	18, 12, 19, 19, 19, 11, 12, 20, 
-	19, 19, 19, 11, 12, 21, 21, 21, 
-	11, 12, 22, 21, 21, 21, 11, 12, 
-	23, 23, 23, 11, 12, 24, 24, 24, 
-	11, 12, 25, 24, 24, 24, 11, 12, 
-	26, 27, 28, 29, 11, 12, 30, 11, 
-	12, 31, 11, 12, 32, 11, 12, 33, 
-	11, 12, 34, 11, 12, 35, 11, 12, 
-	36, 11, 12, 37, 11, 12, 38, 38, 
-	38, 11, 12, 39, 11, 12, 40, 11, 
-	12, 41, 11, 12, 42, 11, 12, 43, 
-	11, 12, 44, 11, 12, 45, 11, 12, 
-	46, 11, 12, 47, 11, 49, 48, 12, 
-	50, 11, 12, 51, 11, 12, 52, 11, 
-	12, 53, 11, 12, 54, 11, 12, 55, 
-	11, 12, 56, 11, 12, 57, 11, 12, 
-	58, 11, 12, 59, 11, 12, 60, 11, 
-	12, 61, 11, 12, 62, 11, 12, 63, 
-	11, 12, 64, 65, 11, 12, 66, 67, 
-	11, 12, 68, 12, 69, 70, 71, 72, 
-	73, 14, 0
+	9, 10, 11, 0, 13, 12, 14, 14, 
+	14, 15, 16, 16, 16, 15, 13, 17, 
+	17, 17, 12, 18, 17, 17, 17, 12, 
+	13, 19, 13, 20, 20, 20, 12, 13, 
+	21, 20, 20, 20, 12, 13, 22, 22, 
+	22, 12, 13, 23, 22, 22, 22, 12, 
+	13, 24, 24, 24, 12, 13, 25, 12, 
+	13, 26, 12, 13, 27, 12, 13, 28, 
+	12, 13, 29, 12, 13, 30, 12, 13, 
+	31, 12, 13, 32, 12, 13, 33, 12, 
+	13, 34, 12, 13, 35, 12, 13, 36, 
+	12, 13, 37, 12, 13, 38, 12, 13, 
+	39, 39, 39, 12, 13, 40, 39, 39, 
+	39, 12, 13, 41, 42, 43, 44, 12, 
+	13, 45, 12, 13, 46, 12, 13, 47, 
+	12, 13, 48, 12, 13, 49, 12, 13, 
+	50, 12, 13, 51, 12, 13, 52, 12, 
+	13, 53, 53, 53, 12, 13, 54, 12, 
+	13, 55, 12, 13, 56, 12, 13, 57, 
+	12, 13, 58, 12, 13, 59, 12, 13, 
+	60, 12, 13, 61, 12, 13, 62, 12, 
+	64, 63, 13, 65, 12, 13, 66, 12, 
+	13, 67, 12, 13, 68, 12, 13, 69, 
+	12, 13, 70, 12, 13, 71, 12, 13, 
+	72, 12, 13, 73, 12, 13, 74, 12, 
+	13, 75, 12, 13, 76, 12, 13, 77, 
+	12, 13, 78, 12, 13, 79, 80, 12, 
+	13, 81, 82, 12, 13, 83, 13, 84, 
+	85, 86, 87, 88, 15, 0
 };
 
 static const char _gdb_trans_targs[] = {
-	2, 3, 2, 5, 7, 8, 2, 13, 
-	5, 15, 45, 2, 3, 4, 0, 53, 
-	6, 3, 7, 9, 10, 11, 12, 12, 
-	14, 5, 16, 2, 25, 35, 17, 18, 
-	19, 20, 21, 22, 23, 24, 24, 26, 
-	27, 28, 29, 30, 31, 32, 33, 34, 
-	2, 3, 36, 37, 38, 39, 40, 41, 
-	42, 43, 44, 2, 46, 47, 48, 49, 
-	50, 2, 51, 52, 51, 52, 53, 1, 
-	53, 53
+	2, 3, 2, 5, 7, 8, 13, 2, 
+	27, 5, 29, 59, 2, 3, 4, 0, 
+	67, 6, 3, 7, 9, 10, 11, 12, 
+	12, 14, 15, 16, 17, 18, 19, 20, 
+	21, 22, 23, 24, 25, 26, 2, 28, 
+	5, 30, 2, 39, 49, 31, 32, 33, 
+	34, 35, 36, 37, 38, 38, 40, 41, 
+	42, 43, 44, 45, 46, 47, 48, 2, 
+	3, 50, 51, 52, 53, 54, 55, 56, 
+	57, 58, 2, 60, 61, 62, 63, 64, 
+	2, 65, 66, 65, 66, 67, 1, 67, 
+	67
 };
 
 static const char _gdb_trans_actions[] = {
-	19, 1, 74, 78, 19, 62, 66, 58, 
-	70, 19, 19, 3, 0, 7, 0, 28, 
-	25, 5, 34, 25, 22, 25, 82, 31, 
-	25, 22, 3, 40, 3, 3, 3, 3, 
-	3, 3, 3, 3, 3, 3, 37, 3, 
-	3, 3, 3, 3, 3, 3, 3, 3, 
-	43, 9, 3, 3, 3, 3, 3, 3, 
-	3, 3, 3, 46, 3, 3, 3, 3, 
-	3, 49, 3, 3, 52, 55, 11, 13, 
-	15, 17
+	19, 1, 77, 81, 19, 65, 19, 69, 
+	61, 73, 19, 19, 3, 0, 7, 0, 
+	28, 25, 5, 34, 25, 22, 25, 85, 
+	31, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 49, 25, 
+	22, 3, 40, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 37, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 43, 
+	9, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 46, 3, 3, 3, 3, 3, 
+	52, 3, 3, 55, 58, 11, 13, 15, 
+	17
 };
 
-static const int gdb_start = 53;
-static const int gdb_first_final = 53;
+static const int gdb_start = 67;
+static const int gdb_first_final = 67;
 static const int gdb_error = 0;
 
-static const int gdb_en_main = 53;
+static const int gdb_en_main = 67;
 
 
-#line 153 "src/gdb_parser.rl"
+#line 159 "src/gdb_parser.rl"
 
 void parser_init(command_cb *callbacks)
 {
 	
-#line 177 "src/gdb_parser.c"
+#line 200 "src/gdb_parser.c"
 	{
 	cs = gdb_start;
 	}
 
-#line 157 "src/gdb_parser.rl"
+#line 163 "src/gdb_parser.rl"
 
 	command_callbacks = callbacks;
 }
@@ -189,7 +212,7 @@  int parse_buffer(char *buf, size_t len, void *priv)
 	char *pe = p + len;
 
 	
-#line 193 "src/gdb_parser.c"
+#line 216 "src/gdb_parser.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -326,10 +349,12 @@  _match:
 		/* *data should point to the CRC */
 		if (crc != *data) {
 			printf("CRC error cmd %d\n", cmd);
-			send_nack(priv);
+			if (ack_mode)
+				send_nack(priv);
 		} else {
 			PR_INFO("Cmd %d\n", cmd);
-			send_ack(priv);
+			if (ack_mode)
+				send_ack(priv);
 
 			/* Push the response onto the stack */
 			if (rsp)
@@ -343,15 +368,15 @@  _match:
 	}
 	break;
 	case 6:
-#line 81 "src/gdb_parser.rl"
+#line 83 "src/gdb_parser.rl"
 	{cmd = GET_MEM;}
 	break;
 	case 7:
-#line 86 "src/gdb_parser.rl"
+#line 88 "src/gdb_parser.rl"
 	{cmd = PUT_MEM;}
 	break;
 	case 8:
-#line 91 "src/gdb_parser.rl"
+#line 93 "src/gdb_parser.rl"
 	{	mem_data_length = *(data - 1);
 			mem_data = calloc(1, mem_data_length); // handler frees
 			*data = (unsigned long)mem_data;
@@ -361,70 +386,74 @@  _match:
 		   }
 	break;
 	case 9:
-#line 100 "src/gdb_parser.rl"
+#line 102 "src/gdb_parser.rl"
 	{cmd = GET_GPRS;}
 	break;
 	case 10:
-#line 102 "src/gdb_parser.rl"
+#line 104 "src/gdb_parser.rl"
 	{cmd = GET_SPR;}
 	break;
 	case 11:
-#line 105 "src/gdb_parser.rl"
+#line 107 "src/gdb_parser.rl"
 	{cmd = STOP_REASON;}
 	break;
 	case 12:
-#line 107 "src/gdb_parser.rl"
+#line 109 "src/gdb_parser.rl"
 	{cmd = SET_THREAD;}
 	break;
 	case 13:
-#line 109 "src/gdb_parser.rl"
+#line 111 "src/gdb_parser.rl"
 	{cmd = DETACH;}
 	break;
 	case 14:
-#line 113 "src/gdb_parser.rl"
+#line 115 "src/gdb_parser.rl"
 	{rsp = "1";}
 	break;
 	case 15:
-#line 114 "src/gdb_parser.rl"
+#line 116 "src/gdb_parser.rl"
 	{rsp = "QC1";}
 	break;
 	case 16:
-#line 115 "src/gdb_parser.rl"
-	{rsp = "multiprocess+;vContSupported+";}
+#line 117 "src/gdb_parser.rl"
+	{rsp = "multiprocess+;vContSupported+;QStartNoAckMode+"; ack_mode = true;}
 	break;
 	case 17:
-#line 116 "src/gdb_parser.rl"
+#line 118 "src/gdb_parser.rl"
 	{rsp = "m1l";}
 	break;
 	case 18:
 #line 119 "src/gdb_parser.rl"
-	{rsp = "vCont;c;C;s;S";}
+	{rsp = "OK"; send_ack(priv); ack_mode = false;}
 	break;
 	case 19:
-#line 120 "src/gdb_parser.rl"
-	{cmd = V_CONTC;}
+#line 122 "src/gdb_parser.rl"
+	{rsp = "vCont;c;C;s;S";}
 	break;
 	case 20:
-#line 121 "src/gdb_parser.rl"
-	{cmd = V_CONTS;}
+#line 123 "src/gdb_parser.rl"
+	{cmd = V_CONTC;}
 	break;
 	case 21:
 #line 124 "src/gdb_parser.rl"
-	{ if (command_callbacks) command_callbacks[INTERRUPT](stack, priv); PR_INFO("RAGEL:interrupt\n");}
+	{cmd = V_CONTS;}
 	break;
 	case 22:
-#line 131 "src/gdb_parser.rl"
-	{PR_INFO("RAGEL:cmd\n");}
+#line 127 "src/gdb_parser.rl"
+	{ if (command_callbacks) command_callbacks[INTERRUPT](stack, priv); PR_INFO("RAGEL:interrupt\n");}
 	break;
 	case 23:
-#line 134 "src/gdb_parser.rl"
-	{PR_INFO("RAGEL:ack\n");}
+#line 135 "src/gdb_parser.rl"
+	{PR_INFO("RAGEL:cmd\n");}
 	break;
 	case 24:
-#line 135 "src/gdb_parser.rl"
+#line 138 "src/gdb_parser.rl"
+	{PR_INFO("RAGEL:ack\n");}
+	break;
+	case 25:
+#line 139 "src/gdb_parser.rl"
 	{PR_INFO("RAGEL:nack\n");}
 	break;
-#line 428 "src/gdb_parser.c"
+#line 457 "src/gdb_parser.c"
 		}
 	}
 
@@ -437,7 +466,7 @@  _again:
 	_out: {}
 	}
 
-#line 167 "src/gdb_parser.rl"
+#line 173 "src/gdb_parser.rl"
 
 	if (cs == gdb_error) {
 		printf("parse error\n");