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

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

selftests/rseq: x86-64: use %fs segment selector for accessing rseq thread area 



commit 4e15bb766b6c6e963a4d33629034d0ec3b7637df upstream.

Rather than use rseq_get_abi() and pass its result through a register to
the inline assembler, directly access the per-thread rseq area through a
memory reference combining the %fs segment selector, the constant offset
of the field in struct rseq, and the rseq_offset value (in a register).

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-15-mathieu.desnoyers@efficios.com


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

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

+30 −28
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 


#ifdef __x86_64__



#define RSEQ_ASM_TP_SEGMENT	%%fs



#define rseq_smp_mb()	\

	__asm__ __volatile__ ("lock; addl $0,-128(%%rsp)" ::: "memory", "cc")

#define rseq_smp_rmb()	rseq_barrier()
@@ -123,14 +125,14 @@ int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu) 
		RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])

#endif

		/* Start rseq by storing table entry pointer into rseq_cs. */

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_CS_OFFSET(%[rseq_abi]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), 4f)

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_ASM_TP_SEGMENT:RSEQ_CS_OFFSET(%[rseq_offset]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), 4f)

		RSEQ_INJECT_ASM(3)

		"cmpq %[v], %[expect]\n\t"

		"jnz %l[cmpfail]\n\t"

		RSEQ_INJECT_ASM(4)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), %l[error1])

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])

		"cmpq %[v], %[expect]\n\t"

		"jnz %l[error2]\n\t"

#endif
@@ -141,7 +143,7 @@ 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),

		  [rseq_abi]		"r" (rseq_get_abi()),

		  [rseq_offset]		"r" ((long)rseq_offset),

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

		  [newv]		"r" (newv)
@@ -189,15 +191,15 @@ int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 
		RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])

#endif

		/* Start rseq by storing table entry pointer into rseq_cs. */

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_CS_OFFSET(%[rseq_abi]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), 4f)

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_ASM_TP_SEGMENT:RSEQ_CS_OFFSET(%[rseq_offset]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), 4f)

		RSEQ_INJECT_ASM(3)

		"movq %[v], %%rbx\n\t"

		"cmpq %%rbx, %[expectnot]\n\t"

		"je %l[cmpfail]\n\t"

		RSEQ_INJECT_ASM(4)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), %l[error1])

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])

		"movq %[v], %%rbx\n\t"

		"cmpq %%rbx, %[expectnot]\n\t"

		"je %l[error2]\n\t"
@@ -212,7 +214,7 @@ 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),

		  [rseq_abi]		"r" (rseq_get_abi()),

		  [rseq_offset]		"r" ((long)rseq_offset),

		  /* final store input */

		  [v]			"m" (*v),

		  [expectnot]		"r" (expectnot),
@@ -255,11 +257,11 @@ int rseq_addv(intptr_t *v, intptr_t count, int cpu) 
		RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])

#endif

		/* Start rseq by storing table entry pointer into rseq_cs. */

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_CS_OFFSET(%[rseq_abi]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), 4f)

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_ASM_TP_SEGMENT:RSEQ_CS_OFFSET(%[rseq_offset]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), 4f)

		RSEQ_INJECT_ASM(3)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), %l[error1])

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])

#endif

		/* final store */

		"addq %[count], %[v]\n\t"
@@ -268,7 +270,7 @@ 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),

		  [rseq_abi]		"r" (rseq_get_abi()),

		  [rseq_offset]		"r" ((long)rseq_offset),

		  /* final store input */

		  [v]			"m" (*v),

		  [count]		"er" (count)
@@ -309,11 +311,11 @@ int rseq_offset_deref_addv(intptr_t *ptr, long off, intptr_t inc, int cpu) 
		RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])

#endif

		/* Start rseq by storing table entry pointer into rseq_cs. */

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_CS_OFFSET(%[rseq_abi]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), 4f)

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_ASM_TP_SEGMENT:RSEQ_CS_OFFSET(%[rseq_offset]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), 4f)

		RSEQ_INJECT_ASM(3)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), %l[error1])

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])

#endif

		/* get p+v */

		"movq %[ptr], %%rbx\n\t"
@@ -327,7 +329,7 @@ int rseq_offset_deref_addv(intptr_t *ptr, long off, intptr_t inc, int cpu) 
		RSEQ_ASM_DEFINE_ABORT(4, "", abort)

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

		: [cpu_id]		"r" (cpu),

		  [rseq_abi]		"r" (rseq_get_abi()),

		  [rseq_offset]		"r" ((long)rseq_offset),

		  /* final store input */

		  [ptr]			"m" (*ptr),

		  [off]			"er" (off),
@@ -364,14 +366,14 @@ int rseq_cmpeqv_trystorev_storev(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])

#endif

		/* Start rseq by storing table entry pointer into rseq_cs. */

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_CS_OFFSET(%[rseq_abi]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), 4f)

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_ASM_TP_SEGMENT:RSEQ_CS_OFFSET(%[rseq_offset]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), 4f)

		RSEQ_INJECT_ASM(3)

		"cmpq %[v], %[expect]\n\t"

		"jnz %l[cmpfail]\n\t"

		RSEQ_INJECT_ASM(4)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), %l[error1])

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])

		"cmpq %[v], %[expect]\n\t"

		"jnz %l[error2]\n\t"

#endif
@@ -385,7 +387,7 @@ 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),

		  [rseq_abi]		"r" (rseq_get_abi()),

		  [rseq_offset]		"r" ((long)rseq_offset),

		  /* try store input */

		  [v2]			"m" (*v2),

		  [newv2]		"r" (newv2),
@@ -444,8 +446,8 @@ int rseq_cmpeqv_cmpeqv_storev(intptr_t *v, intptr_t expect, 
		RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error3])

#endif

		/* Start rseq by storing table entry pointer into rseq_cs. */

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_CS_OFFSET(%[rseq_abi]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), 4f)

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_ASM_TP_SEGMENT:RSEQ_CS_OFFSET(%[rseq_offset]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), 4f)

		RSEQ_INJECT_ASM(3)

		"cmpq %[v], %[expect]\n\t"

		"jnz %l[cmpfail]\n\t"
@@ -454,7 +456,7 @@ int rseq_cmpeqv_cmpeqv_storev(intptr_t *v, intptr_t expect, 
		"jnz %l[cmpfail]\n\t"

		RSEQ_INJECT_ASM(5)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), %l[error1])

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])

		"cmpq %[v], %[expect]\n\t"

		"jnz %l[error2]\n\t"

		"cmpq %[v2], %[expect2]\n\t"
@@ -467,7 +469,7 @@ 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),

		  [rseq_abi]		"r" (rseq_get_abi()),

		  [rseq_offset]		"r" ((long)rseq_offset),

		  /* cmp2 input */

		  [v2]			"m" (*v2),

		  [expect2]		"r" (expect2),
@@ -524,14 +526,14 @@ int rseq_cmpeqv_trymemcpy_storev(intptr_t *v, intptr_t expect, 
		"movq %[dst], %[rseq_scratch1]\n\t"

		"movq %[len], %[rseq_scratch2]\n\t"

		/* Start rseq by storing table entry pointer into rseq_cs. */

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_CS_OFFSET(%[rseq_abi]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), 4f)

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, RSEQ_ASM_TP_SEGMENT:RSEQ_CS_OFFSET(%[rseq_offset]))

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), 4f)

		RSEQ_INJECT_ASM(3)

		"cmpq %[v], %[expect]\n\t"

		"jnz 5f\n\t"

		RSEQ_INJECT_ASM(4)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_CPU_ID_OFFSET(%[rseq_abi]), 6f)

		RSEQ_ASM_CMP_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_CPU_ID_OFFSET(%[rseq_offset]), 6f)

		"cmpq %[v], %[expect]\n\t"

		"jnz 7f\n\t"

#endif
@@ -579,7 +581,7 @@ int rseq_cmpeqv_trymemcpy_storev(intptr_t *v, intptr_t expect, 
#endif

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

		: [cpu_id]		"r" (cpu),

		  [rseq_abi]		"r" (rseq_get_abi()),

		  [rseq_offset]		"r" ((long)rseq_offset),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),