Commit 4f339492 authored by Michael Jeanson's avatar Michael Jeanson Committed by Peter Zijlstra
Browse files

selftests/rseq: riscv: use rseq_get_abi() helper 



Make the RISC-V rseq selftests compatible with glibc-2.35 by using the
rseq_get_abi() helper.

Signed-off-by: default avatarMichael Jeanson <mjeanson@efficios.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/r/20220614154830.1367382-2-mjeanson@efficios.com
parent f3dd3f67

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

+18 −18
Original line number Diff line number Diff line
@@ -194,8 +194,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.arch.ptr),

				    [v]			"m" (*v),

				    [expect]		"r" (expect),

				    [newv]		"r" (newv)
@@ -251,8 +251,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.arch.ptr),

				    [v]			"m" (*v),

				    [expectnot]		"r" (expectnot),

				    [load]		"m" (*load),
@@ -301,8 +301,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.arch.ptr),

				    [v]			"m" (*v),

				    [count]		"r" (count)

				    RSEQ_INJECT_INPUT
@@ -352,8 +352,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.arch.ptr),

				    [expect]		"r" (expect),

				    [v]			"m" (*v),

				    [newv]		"r" (newv),
@@ -411,8 +411,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.arch.ptr),

				    [expect]		"r" (expect),

				    [v]			"m" (*v),

				    [newv]		"r" (newv),
@@ -472,8 +472,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.arch.ptr),

				    [v]			"m" (*v),

				    [expect]		"r" (expect),

				    [v2]			"m" (*v2),
@@ -532,8 +532,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.arch.ptr),

				    [expect]		"r" (expect),

				    [v]			"m" (*v),

				    [newv]		"r" (newv),
@@ -593,8 +593,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.arch.ptr),

				    [expect]		"r" (expect),

				    [v]			"m" (*v),

				    [newv]		"r" (newv),
@@ -651,8 +651,8 @@ int rseq_offset_deref_addv(intptr_t *ptr, off_t off, intptr_t inc, 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.arch.ptr),

				    [ptr]			"r" (ptr),

				    [off]			"er" (off),

				    [inc]			"er" (inc)