Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f491e073 authored by Mathieu Desnoyers's avatar Mathieu Desnoyers Committed by Greg Kroah-Hartman
Browse files

selftests/rseq: Introduce rseq_get_abi() helper 



commit e546cd48ccc456074ddb8920732aef4af65d7ca7 upstream.

This is done in preparation for the selftest uplift to become compatible
with glibc-2.35.

glibc-2.35 exposes the rseq per-thread data in the TCB, accessible
at an offset from the thread pointer, rather than through an actual
Thread-Local Storage (TLS) variable, as the kernel selftests initially
expected.

Introduce a rseq_get_abi() helper, initially using the __rseq_abi
TLS variable, in preparation for changing this userspace ABI for one
which is compatible with glibc-2.35.

Note that the __rseq_abi TLS and glibc-2.35's ABI for per-thread data
cannot actively coexist in a process, because the kernel supports only
a single rseq registration per thread.

Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20220124171253.22072-6-mathieu.desnoyers@efficios.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 158d91ff

tools/testing/selftests/rseq/rseq-arm.h

+16 −16
Original line number Diff line number Diff line
@@ -185,8 +185,8 @@ int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu) 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

		  [newv]		"r" (newv)
@@ -255,8 +255,8 @@ int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expectnot]		"r" (expectnot),
@@ -316,8 +316,8 @@ int rseq_addv(intptr_t *v, intptr_t count, int cpu) 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [v]			"m" (*v),

		  [count]		"Ir" (count)

		  RSEQ_INJECT_INPUT
@@ -381,8 +381,8 @@ int rseq_cmpeqv_trystorev_storev(intptr_t *v, intptr_t expect, 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* try store input */

		  [v2]			"m" (*v2),

		  [newv2]		"r" (newv2),
@@ -457,8 +457,8 @@ int rseq_cmpeqv_trystorev_storev_release(intptr_t *v, intptr_t expect, 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* try store input */

		  [v2]			"m" (*v2),

		  [newv2]		"r" (newv2),
@@ -537,8 +537,8 @@ int rseq_cmpeqv_cmpeqv_storev(intptr_t *v, intptr_t expect, 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* cmp2 input */

		  [v2]			"m" (*v2),

		  [expect2]		"r" (expect2),
@@ -657,8 +657,8 @@ int rseq_cmpeqv_trymemcpy_storev(intptr_t *v, intptr_t expect, 
		"8:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),
@@ -782,8 +782,8 @@ int rseq_cmpeqv_trymemcpy_storev_release(intptr_t *v, intptr_t expect, 
		"8:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

tools/testing/selftests/rseq/rseq-arm64.h

+16 −16
Original line number Diff line number Diff line
@@ -230,8 +230,8 @@ int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu) 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"Qo" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"Qo" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [v]			"Qo" (*v),

		  [expect]		"r" (expect),

		  [newv]		"r" (newv)
@@ -287,8 +287,8 @@ int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"Qo" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"Qo" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [v]			"Qo" (*v),

		  [expectnot]		"r" (expectnot),

		  [load]		"Qo" (*load),
@@ -337,8 +337,8 @@ int rseq_addv(intptr_t *v, intptr_t count, int cpu) 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"Qo" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"Qo" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [v]			"Qo" (*v),

		  [count]		"r" (count)

		  RSEQ_INJECT_INPUT
@@ -388,8 +388,8 @@ int rseq_cmpeqv_trystorev_storev(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"Qo" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"Qo" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [expect]		"r" (expect),

		  [v]			"Qo" (*v),

		  [newv]		"r" (newv),
@@ -447,8 +447,8 @@ int rseq_cmpeqv_trystorev_storev_release(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"Qo" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"Qo" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [expect]		"r" (expect),

		  [v]			"Qo" (*v),

		  [newv]		"r" (newv),
@@ -508,8 +508,8 @@ int rseq_cmpeqv_cmpeqv_storev(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"Qo" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"Qo" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [v]			"Qo" (*v),

		  [expect]		"r" (expect),

		  [v2]			"Qo" (*v2),
@@ -569,8 +569,8 @@ int rseq_cmpeqv_trymemcpy_storev(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"Qo" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"Qo" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [expect]		"r" (expect),

		  [v]			"Qo" (*v),

		  [newv]		"r" (newv),
@@ -629,8 +629,8 @@ int rseq_cmpeqv_trymemcpy_storev_release(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"Qo" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"Qo" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [expect]		"r" (expect),

		  [v]			"Qo" (*v),

		  [newv]		"r" (newv),

tools/testing/selftests/rseq/rseq-mips.h

+16 −16
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu) 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

		  [newv]		"r" (newv)
@@ -258,8 +258,8 @@ int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expectnot]		"r" (expectnot),
@@ -319,8 +319,8 @@ int rseq_addv(intptr_t *v, intptr_t count, int cpu) 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [v]			"m" (*v),

		  [count]		"Ir" (count)

		  RSEQ_INJECT_INPUT
@@ -382,8 +382,8 @@ int rseq_cmpeqv_trystorev_storev(intptr_t *v, intptr_t expect, 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* try store input */

		  [v2]			"m" (*v2),

		  [newv2]		"r" (newv2),
@@ -456,8 +456,8 @@ int rseq_cmpeqv_trystorev_storev_release(intptr_t *v, intptr_t expect, 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* try store input */

		  [v2]			"m" (*v2),

		  [newv2]		"r" (newv2),
@@ -532,8 +532,8 @@ int rseq_cmpeqv_cmpeqv_storev(intptr_t *v, intptr_t expect, 
		"5:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* cmp2 input */

		  [v2]			"m" (*v2),

		  [expect2]		"r" (expect2),
@@ -649,8 +649,8 @@ int rseq_cmpeqv_trymemcpy_storev(intptr_t *v, intptr_t expect, 
		"8:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),
@@ -771,8 +771,8 @@ int rseq_cmpeqv_trymemcpy_storev_release(intptr_t *v, intptr_t expect, 
		"8:\n\t"

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

tools/testing/selftests/rseq/rseq-ppc.h

+16 −16
Original line number Diff line number Diff line
@@ -235,8 +235,8 @@ int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu) 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

		  [newv]		"r" (newv)
@@ -301,8 +301,8 @@ int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expectnot]		"r" (expectnot),
@@ -359,8 +359,8 @@ int rseq_addv(intptr_t *v, intptr_t count, int cpu) 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [count]		"r" (count)
@@ -419,8 +419,8 @@ int rseq_cmpeqv_trystorev_storev(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* try store input */

		  [v2]			"m" (*v2),

		  [newv2]		"r" (newv2),
@@ -489,8 +489,8 @@ int rseq_cmpeqv_trystorev_storev_release(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* try store input */

		  [v2]			"m" (*v2),

		  [newv2]		"r" (newv2),
@@ -560,8 +560,8 @@ int rseq_cmpeqv_cmpeqv_storev(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* cmp2 input */

		  [v2]			"m" (*v2),

		  [expect2]		"r" (expect2),
@@ -635,8 +635,8 @@ int rseq_cmpeqv_trymemcpy_storev(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),
@@ -711,8 +711,8 @@ int rseq_cmpeqv_trymemcpy_storev_release(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

tools/testing/selftests/rseq/rseq-s390.h

+12 −12
Original line number Diff line number Diff line
@@ -165,8 +165,8 @@ int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu) 
		RSEQ_ASM_DEFINE_ABORT(4, "", abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

		  [newv]		"r" (newv)
@@ -233,8 +233,8 @@ int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 
		RSEQ_ASM_DEFINE_ABORT(4, "", abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expectnot]		"r" (expectnot),
@@ -288,8 +288,8 @@ int rseq_addv(intptr_t *v, intptr_t count, int cpu) 
		RSEQ_ASM_DEFINE_ABORT(4, "", abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [count]		"r" (count)
@@ -347,8 +347,8 @@ int rseq_cmpeqv_trystorev_storev(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, "", abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* try store input */

		  [v2]			"m" (*v2),

		  [newv2]		"r" (newv2),
@@ -426,8 +426,8 @@ int rseq_cmpeqv_cmpeqv_storev(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_ABORT(4, "", abort)

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* cmp2 input */

		  [v2]			"m" (*v2),

		  [expect2]		"r" (expect2),
@@ -534,8 +534,8 @@ int rseq_cmpeqv_trymemcpy_storev(intptr_t *v, intptr_t expect, 
#endif

		: /* gcc asm goto does not allow outputs */

		: [cpu_id]		"r" (cpu),

		  [current_cpu_id]	"m" (__rseq_abi.cpu_id),

		  [rseq_cs]		"m" (__rseq_abi.rseq_cs),

		  [current_cpu_id]	"m" (rseq_get_abi()->cpu_id),

		  [rseq_cs]		"m" (rseq_get_abi()->rseq_cs),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),