htl: Fix sem_wait race between read and gsync_wait

If the value changes between sem_wait's read and the gsync_wait call,
the kernel will return KERN_INVALID_ARGUMENT, which we have to interpret
as the value having already changed.

This fixes applications (e.g. libgo) seeing sem_wait erroneously return
KERN_INVALID_ARGUMENT.
This commit is contained in:
Samuel Thibault 2022-12-30 00:40:18 +01:00
parent c923cd8c49
commit 289b098c9e

View File

@ -79,7 +79,7 @@ __sem_timedwait_internal (sem_t *restrict sem,
((unsigned int *) &sem->data) + SEM_VALUE_OFFSET,
0, flags);
if (err != 0)
if (err != 0 && err != KERN_INVALID_ARGUMENT)
{
/* Error, interruption or timeout, abort. */
if (err == KERN_TIMEDOUT)
@ -138,7 +138,7 @@ __sem_timedwait_internal (sem_t *restrict sem,
err = __lll_wait_intr (&isem->value,
SEM_NWAITERS_MASK, flags);
if (err != 0)
if (err != 0 && err != KERN_INVALID_ARGUMENT)
{
/* Error, interruption or timeout, abort. */
if (err == KERN_TIMEDOUT)