Gdbserver support

kern/arch/x86/trap.c

@@ -543,17 +543,30 @@ void handle_nmi(struct hw_trapframe *hw_tf)
 static void trap_dispatch(struct hw_trapframe *hw_tf)
 {
 	struct per_cpu_info *pcpui;
+	struct preempt_data *vcpd;
+	struct proc *p;
 	bool handled = FALSE;
 	unsigned long aux = 0;
 	uintptr_t fixup_ip;
 
 	// Handle processor exceptions.
 	switch(hw_tf->tf_trapno) {
+		case T_DEBUG:
 		case T_BRKPT:
-			enable_irq();
-			monitor(hw_tf);
-			disable_irq();
-			handled = TRUE;
+			pcpui = &per_cpu_info[core_id()];
+			p = pcpui->cur_proc;
+			vcpd = &p->procdata->vcore_preempt_data[pcpui->owning_vcoreid];
+
+			if (in_kernel(hw_tf) || !proc_is_vcctx_ready(p) ||
+				vcpd->notif_disabled) {
+				/* Trap is in kernel, vcore, or early SCP context. */
+				enable_irq();
+				monitor(hw_tf);
+				disable_irq();
+				handled = TRUE;
+			} else {
+				handled = FALSE;
+			}
 			break;
 		case T_ILLOP:
 		{

tests/block_test.c

@@ -1,9 +1,10 @@
-#include <stdio.h>
+#include <parlib/parlib.h>
 #include <pthread.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <parlib/parlib.h>
-#include <unistd.h>
 #include <sys/time.h>
+#include <unistd.h>
+#include "misc-compat.h"
 
 pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 #define printf_safe(...) {}
@@ -20,16 +21,16 @@ void *my_retvals[NUM_TEST_THREADS];
 
 __thread int my_id;
 void *block_thread(void* arg)
-{	
+{
 	assert(!in_vcore_context());
 	for (int i = 0; i < NUM_TEST_LOOPS; i++) {
-		printf_safe("[A] pthread %d on vcore %d\n", pthread_self()->id, vcore_id());
-		sys_block(5000 + pthread_self()->id);
+		printf_safe("[A] pthread %d on vcore %d\n", pthread_id(), vcore_id());
+		sys_block(5000 + pthread_id());
 	}
-	return (void*)(long)pthread_self()->id;
+	return (void*)(long)pthread_id();
 }
 
-int main(int argc, char** argv) 
+int main(int argc, char **argv)
 {
 	struct timeval tv = {0};
 	if (gettimeofday(&tv, 0))

tests/futex_timeout.c

@@ -1,15 +1,16 @@
-#include <stdio.h>
-#include <stdlib.h>
+#include <futex.h>
 #include <parlib/parlib.h>
 #include <parlib/vcore.h>
-#include <futex.h>
 #include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "misc-compat.h"
 
 #define NUM_THREADS 10
 pthread_t thandlers[NUM_THREADS];
 
 void *handler(void *arg) {
-	int id = pthread_self()->id;
+	int id = pthread_id();
 	int var = 0;
     struct timespec timeout = {
 		.tv_sec = id,

tests/misc-compat.h

@@ -4,7 +4,7 @@
 
 #include <parlib/timing.h>
 
-#define pthread_id() (pthread_self()->id)
+#define pthread_id() (pthread_self()->uthread.id)
 
 #else
 

tests/pthread_barrier_test.c

@@ -1,9 +1,10 @@
-#include <stdio.h>
+#include <parlib/parlib.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include <parlib/parlib.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <sys/time.h>
+#include <unistd.h>
+#include "misc-compat.h"
 
 pthread_barrier_t barrier;
 
@@ -17,16 +18,16 @@ void **my_retvals;
 bool run_barriertest = FALSE;
 
 void *thread(void *arg)
-{	
+{
 	while (!run_barriertest)
 		cpu_relax();
 	for(int i = 0; i < nr_loops; i++) {
 		pthread_barrier_wait(&barrier);
 	}
-	return (void*)(long)pthread_self()->id;
+	return (void*)(long)pthread_id();
 }
 
-int main(int argc, char** argv) 
+int main(int argc, char **argv)
 {
 	struct timeval start_tv = {0};
 	struct timeval end_tv = {0};