clearlinux/graphene
2
0
Fork 0
mirror of https://github.com/clearlinux/graphene.git synced 2026-09-06 13:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[LibOS,Pal] Set weak parameter in atomics operations to false

Browse Source 
The `weak` parameter has no influence on x86, but on ppc64 it causes
spurious faults due to a missing check on flags (missing `bne`
instruction).
This commit is contained in:
Stefan Berger
2020-07-01 22:08:52 +00:00
committed by Dmitrii Kuvaiskii
parent 08e217786f
commit 91709ac2fe
8 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibOS/shim/src/bookkeep/shim_signal.c
+2 -2
View File
@@ -130,7 +130,7 @@ static bool append_rt_signal(struct shim_rt_signal_queue* queue,
if (put_idx - get_idx >= ARRAY_SIZE(queue->queue)) {
return false;
}
} while (!__atomic_compare_exchange_n(&queue->put_idx, &put_idx, put_idx + 1, /*weak=*/true,
} while (!__atomic_compare_exchange_n(&queue->put_idx, &put_idx, put_idx + 1, /*weak=*/false,
__ATOMIC_RELEASE, __ATOMIC_ACQUIRE));
queue->queue[put_idx % ARRAY_SIZE(queue->queue)] = signal;
@@ -179,7 +179,7 @@ static struct shim_signal* pop_rt_signal(struct shim_rt_signal_queue* queue) {
if (put_idx == get_idx) {
return NULL;
}
} while (!__atomic_compare_exchange_n(&queue->get_idx, &get_idx, get_idx + 1, /*weak=*/true,
} while (!__atomic_compare_exchange_n(&queue->get_idx, &get_idx, get_idx + 1, /*weak=*/false,
__ATOMIC_RELEASE, __ATOMIC_ACQUIRE));
return queue->queue[get_idx % ARRAY_SIZE(queue->queue)];
LibOS/shim/src/sys/shim_futex.c
+1 -1
View File
@@ -853,7 +853,7 @@ static bool handle_futex_death(uint32_t* uaddr) {
uint32_t new_val = (val & FUTEX_WAITERS) | FUTEX_OWNER_DIED;
if (__atomic_compare_exchange_n(uaddr, &val, new_val,
/*weak=*/true, __ATOMIC_RELAXED, __ATOMIC_RELAXED)) {
/*weak=*/false, __ATOMIC_RELAXED, __ATOMIC_RELAXED)) {
/* Successfully set the new value, end the loop. */
break;
}
Pal/include/lib/spinlock.h
+2 -2
View File
@@ -108,7 +108,7 @@ static inline void spinlock_lock(spinlock_t* lock) {
/* Seen lock as free, check if it still is, this time with acquire semantics (but only
* if we really take it). */
val = SPINLOCK_UNLOCKED;
} while (!__atomic_compare_exchange_n(&lock->lock, &val, SPINLOCK_LOCKED, /*weak=*/true,
} while (!__atomic_compare_exchange_n(&lock->lock, &val, SPINLOCK_LOCKED, /*weak=*/false,
__ATOMIC_ACQUIRE, __ATOMIC_RELAXED));
out:
@@ -141,7 +141,7 @@ static inline int spinlock_lock_timeout(spinlock_t* lock, unsigned long iteratio
/* Seen lock as free, check if it still is, this time with acquire semantics (but only
* if we really take it). */
val = SPINLOCK_UNLOCKED;
} while (!__atomic_compare_exchange_n(&lock->lock, &val, SPINLOCK_LOCKED, /*weak=*/true,
} while (!__atomic_compare_exchange_n(&lock->lock, &val, SPINLOCK_LOCKED, /*weak=*/false,
__ATOMIC_ACQUIRE, __ATOMIC_RELAXED));
out_success:
Pal/src/host/Linux-SGX/db_events.c
+1 -1
View File
@@ -42,7 +42,7 @@ int _DkEventSet(PAL_HANDLE event, int wakeup) {
if (event->event.isnotification) {
// Leave it signaled, wake all
uint32_t t = 0;
if (__atomic_compare_exchange_n(event->event.signaled, &t, 1, /*weak=*/true,
if (__atomic_compare_exchange_n(event->event.signaled, &t, 1, /*weak=*/false,
__ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) {
int nwaiters = __atomic_load_n(&event->event.nwaiters.counter, __ATOMIC_SEQ_CST);
if (nwaiters) {
Pal/src/host/Linux-SGX/db_mutex.c
+2 -2
View File
@@ -48,7 +48,7 @@ int _DkMutexLockTimeout(struct mutex_handle* m, int64_t timeout_us) {
int ret = 0;
uint32_t t = MUTEX_UNLOCKED;
if (__atomic_compare_exchange_n(m->locked, &t, MUTEX_LOCKED, /*weak=*/true,
if (__atomic_compare_exchange_n(m->locked, &t, MUTEX_LOCKED, /*weak=*/false,
__ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
goto success;
@@ -62,7 +62,7 @@ int _DkMutexLockTimeout(struct mutex_handle* m, int64_t timeout_us) {
while (true) {
uint32_t t = MUTEX_UNLOCKED;
if (__atomic_compare_exchange_n(m->locked, &t, MUTEX_LOCKED, /*weak=*/true,
if (__atomic_compare_exchange_n(m->locked, &t, MUTEX_LOCKED, /*weak=*/false,
__ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
break;
/*
Pal/src/host/Linux-SGX/enclave_ocalls.c
+2 -1
View File
@@ -215,7 +215,8 @@ static int ocall_mmap_untrusted_cache(uint64_t size, void** mem, bool* need_munm
*need_munmap = false;
struct untrusted_area* cache = &get_tcb_trts()->untrusted_area_cache;
uint64_t in_use = 0;
if (!__atomic_compare_exchange_n(&cache->in_use, &in_use, 1, false, __ATOMIC_RELAXED, __ATOMIC_RELAXED)) {
if (!__atomic_compare_exchange_n(&cache->in_use, &in_use, 1, /*weak=*/false,
__ATOMIC_RELAXED, __ATOMIC_RELAXED)) {
/* AEX signal handling case: cache is in use, so make explicit mmap/munmap */
int retval = ocall_mmap_untrusted(-1, 0, size, PROT_READ | PROT_WRITE, mem);
if (IS_ERR(retval)) {
Pal/src/host/Linux/db_events.c
+1 -1
View File
@@ -37,7 +37,7 @@ int _DkEventSet(PAL_HANDLE event, int wakeup) {
if (event->event.isnotification) {
// Leave it signaled, wake all
uint32_t t = 0;
if (__atomic_compare_exchange_n(&event->event.signaled, &t, 1, /*weak=*/true,
if (__atomic_compare_exchange_n(&event->event.signaled, &t, 1, /*weak=*/false,
__ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) {
int nwaiters = __atomic_load_n(&event->event.nwaiters.counter, __ATOMIC_SEQ_CST);
if (nwaiters) {
Pal/src/host/Linux/db_mutex.c
+1 -1
View File
@@ -97,7 +97,7 @@ int _DkMutexLockTimeout(struct mutex_handle* m, int64_t timeout_us) {
while (true) {
uint32_t t = MUTEX_UNLOCKED;
if (__atomic_compare_exchange_n(&m->locked, &t, MUTEX_LOCKED, /*weak=*/true,
if (__atomic_compare_exchange_n(&m->locked, &t, MUTEX_LOCKED, /*weak=*/false,
__ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
break;