xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-26 21:10:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

coroutine-win32: use QEMU_DEFINE_STATIC_CO_TLS()

Browse Source 
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 <stefanha@redhat.com>
Message-Id: <20220307153853.602859-4-stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2022-03-07 15:38:53 +00:00 committed by Kevin Wolf
parent ac387a08a9
commit c1fe694357
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/coroutine-win32.c
View File

@ -24,6 +24,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/coroutine_int.h" #include "qemu/coroutine_int.h"
#include "qemu/coroutine-tls.h"
typedef struct typedef struct
{ {
@ -33,8 +34,8 @@ typedef struct
CoroutineAction action; CoroutineAction action;
} CoroutineWin32; } CoroutineWin32;
static __thread CoroutineWin32 leader; QEMU_DEFINE_STATIC_CO_TLS(CoroutineWin32, leader);
static __thread Coroutine *current; QEMU_DEFINE_STATIC_CO_TLS(Coroutine *, current);
/* This function is marked noinline to prevent GCC from inlining it /* This function is marked noinline to prevent GCC from inlining it
* into coroutine_trampoline(). If we allow it to do that then it * into coroutine_trampoline(). If we allow it to do that then it
@ -51,7 +52,7 @@ qemu_coroutine_switch(Coroutine *from_, Coroutine *to_,
CoroutineWin32 *from = DO_UPCAST(CoroutineWin32, base, from_); CoroutineWin32 *from = DO_UPCAST(CoroutineWin32, base, from_);
CoroutineWin32 *to = DO_UPCAST(CoroutineWin32, base, to_); CoroutineWin32 *to = DO_UPCAST(CoroutineWin32, base, to_);
current = to_; set_current(to_);
to->action = action; to->action = action;
SwitchToFiber(to->fiber); SwitchToFiber(to->fiber);
@ -88,14 +89,21 @@ void qemu_coroutine_delete(Coroutine *co_)
Coroutine *qemu_coroutine_self(void) Coroutine *qemu_coroutine_self(void)
{ {
Coroutine *current = get_current();
if (!current) { if (!current) {
current = &leader.base; CoroutineWin32 *leader = get_ptr_leader();
leader.fiber = ConvertThreadToFiber(NULL);
current = &leader->base;
set_current(current);
leader->fiber = ConvertThreadToFiber(NULL);
} }
return current; return current;
} }
bool qemu_in_coroutine(void) bool qemu_in_coroutine(void)
{ {
Coroutine *current = get_current();
return current && current->caller; return current && current->caller;
} }