From 4087a6e7fc773ba4eb217dfc196dfe1eee84b25d Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Wed, 10 Aug 2022 20:35:42 -0400 Subject: Read and write p->killed using atomics --- kernel/trap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kernel/trap.c') diff --git a/kernel/trap.c b/kernel/trap.c index 75fb3ec..b879f01 100644 --- a/kernel/trap.c +++ b/kernel/trap.c @@ -53,7 +53,7 @@ usertrap(void) if(r_scause() == 8){ // system call - if(p->killed) + if(__sync_add_and_fetch(&p->killed, 0)) exit(-1); // sepc points to the ecall instruction, @@ -70,10 +70,10 @@ usertrap(void) } else { printf("usertrap(): unexpected scause %p pid=%d\n", r_scause(), p->pid); printf(" sepc=%p stval=%p\n", r_sepc(), r_stval()); - p->killed = 1; + __sync_bool_compare_and_swap(&p->killed, 0, 1); } - if(p->killed) + if(__sync_add_and_fetch(&p->killed, 0)) exit(-1); // give up the CPU if this is a timer interrupt. -- cgit v1.2.3 From 975f3b31d3fac2c271df3107263df6ae454a98be Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Thu, 11 Aug 2022 07:23:17 -0400 Subject: Clean up using killed() --- kernel/trap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel/trap.c') diff --git a/kernel/trap.c b/kernel/trap.c index b879f01..f895aea 100644 --- a/kernel/trap.c +++ b/kernel/trap.c @@ -53,7 +53,7 @@ usertrap(void) if(r_scause() == 8){ // system call - if(__sync_add_and_fetch(&p->killed, 0)) + if(killed(p)) exit(-1); // sepc points to the ecall instruction, @@ -73,7 +73,7 @@ usertrap(void) __sync_bool_compare_and_swap(&p->killed, 0, 1); } - if(__sync_add_and_fetch(&p->killed, 0)) + if(killed(p)) exit(-1); // give up the CPU if this is a timer interrupt. -- cgit v1.2.3 From 429c7b717edd4c23d3666327986052b9b6eb29eb Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Thu, 11 Aug 2022 08:42:52 -0400 Subject: Use atomic store_n and load_n --- kernel/trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/trap.c') diff --git a/kernel/trap.c b/kernel/trap.c index f895aea..1039911 100644 --- a/kernel/trap.c +++ b/kernel/trap.c @@ -70,7 +70,7 @@ usertrap(void) } else { printf("usertrap(): unexpected scause %p pid=%d\n", r_scause(), p->pid); printf(" sepc=%p stval=%p\n", r_sepc(), r_stval()); - __sync_bool_compare_and_swap(&p->killed, 0, 1); + __atomic_store_n(&p->killed, 1, __ATOMIC_SEQ_CST); } if(killed(p)) -- cgit v1.2.3 From 4f716c8550b406c3e4b3e0c21b986ef99bc06c40 Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Thu, 11 Aug 2022 14:22:00 -0400 Subject: Use p->lock to read p->killed --- kernel/trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/trap.c') diff --git a/kernel/trap.c b/kernel/trap.c index 1039911..44c9cdc 100644 --- a/kernel/trap.c +++ b/kernel/trap.c @@ -70,7 +70,7 @@ usertrap(void) } else { printf("usertrap(): unexpected scause %p pid=%d\n", r_scause(), p->pid); printf(" sepc=%p stval=%p\n", r_sepc(), r_stval()); - __atomic_store_n(&p->killed, 1, __ATOMIC_SEQ_CST); + setkilled(p); } if(killed(p)) -- cgit v1.2.3