Skip to content

Commit

Permalink
coroutine-win32: use QEMU_DEFINE_STATIC_CO_TLS()
Browse files Browse the repository at this point in the history
Thread-Local Storage variables cannot be used directly from coroutine
code because the compiler may optimize TLS variable accesses across
qemu_coroutine_yield() calls. When the coroutine is re-entered from
another thread the TLS variables from the old thread must no longer be
used.

Use QEMU_DEFINE_STATIC_CO_TLS() for the current and leader variables.

I think coroutine-win32.c could get away with __thread because the
variables are only used in situations where either the stale value is
correct (current) or outside coroutine context (loading leader when
current is NULL). Due to the difficulty of being sure that this is
really safe in all scenarios it seems worth converting it anyway.

Signed-off-by: Stefan Hajnoczi <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>
(cherry picked from commit c1fe694357a328c807ae3cc6961c19e923448fcc)
  • Loading branch information
stefanhaRH authored and arichardson committed Jul 29, 2024
1 parent d799e49 commit 6846c33
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions util/coroutine-win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/coroutine_int.h"
#include "qemu/coroutine-tls.h"

typedef struct
{
Expand All @@ -34,8 +35,8 @@ typedef struct
CoroutineAction action;
} CoroutineWin32;

static __thread CoroutineWin32 leader;
static __thread Coroutine *current;
QEMU_DEFINE_STATIC_CO_TLS(CoroutineWin32, leader);
QEMU_DEFINE_STATIC_CO_TLS(Coroutine *, current);

/* This function is marked noinline to prevent GCC from inlining it
* into coroutine_trampoline(). If we allow it to do that then it
Expand All @@ -52,7 +53,7 @@ qemu_coroutine_switch(Coroutine *from_, Coroutine *to_,
CoroutineWin32 *from = DO_UPCAST(CoroutineWin32, base, from_);
CoroutineWin32 *to = DO_UPCAST(CoroutineWin32, base, to_);

current = to_;
set_current(to_);

to->action = action;
SwitchToFiber(to->fiber);
Expand Down Expand Up @@ -89,14 +90,21 @@ void qemu_coroutine_delete(Coroutine *co_)

Coroutine *qemu_coroutine_self(void)
{
Coroutine *current = get_current();

if (!current) {
current = &leader.base;
leader.fiber = ConvertThreadToFiber(NULL);
CoroutineWin32 *leader = get_ptr_leader();

current = &leader->base;
set_current(current);
leader->fiber = ConvertThreadToFiber(NULL);
}
return current;
}

bool qemu_in_coroutine(void)
{
Coroutine *current = get_current();

return current && current->caller;
}

0 comments on commit 6846c33

Please sign in to comment.