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

Commit 4c14d1ce authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Martin Schwidefsky
Browse files

rseq/selftests: add s390 support 



Implement support for s390 in the rseq selftests, in order to sanity
check the recently enabled rseq syscall. The Implementation covers both
64-bit and 31-bit mode.

Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 26f84384

tools/testing/selftests/rseq/param_test.c

+24 −0
Original line number Diff line number Diff line
@@ -90,6 +90,30 @@ unsigned int yield_mod_cnt, nr_abort; 
#error "Unsupported architecture"

#endif



#elif defined(__s390__)



#define RSEQ_INJECT_INPUT \

	, [loop_cnt_1]"m"(loop_cnt[1]) \

	, [loop_cnt_2]"m"(loop_cnt[2]) \

	, [loop_cnt_3]"m"(loop_cnt[3]) \

	, [loop_cnt_4]"m"(loop_cnt[4]) \

	, [loop_cnt_5]"m"(loop_cnt[5]) \

	, [loop_cnt_6]"m"(loop_cnt[6])



#define INJECT_ASM_REG	"r12"



#define RSEQ_INJECT_CLOBBER \

	, INJECT_ASM_REG



#define RSEQ_INJECT_ASM(n) \

	"l %%" INJECT_ASM_REG ", %[loop_cnt_" #n "]\n\t" \

	"ltr %%" INJECT_ASM_REG ", %%" INJECT_ASM_REG "\n\t" \

	"je 333f\n\t" \

	"222:\n\t" \

	"ahi %%" INJECT_ASM_REG ", -1\n\t" \

	"jnz 222b\n\t" \

	"333:\n\t"



#elif defined(__ARMEL__)



#define RSEQ_INJECT_INPUT \

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

0 → 100644
+513 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 OR MIT */



#define RSEQ_SIG	0x53053053



#define rseq_smp_mb()	__asm__ __volatile__ ("bcr 15,0" ::: "memory")

#define rseq_smp_rmb()	rseq_smp_mb()

#define rseq_smp_wmb()	rseq_smp_mb()



#define rseq_smp_load_acquire(p)					\

__extension__ ({							\

	__typeof(*p) ____p1 = RSEQ_READ_ONCE(*p);			\

	rseq_barrier();							\

	____p1;								\

})



#define rseq_smp_acquire__after_ctrl_dep()	rseq_smp_rmb()



#define rseq_smp_store_release(p, v)					\

do {									\

	rseq_barrier();							\

	RSEQ_WRITE_ONCE(*p, v);						\

} while (0)



#ifdef RSEQ_SKIP_FASTPATH

#include "rseq-skip.h"

#else /* !RSEQ_SKIP_FASTPATH */



#ifdef __s390x__



#define LONG_L			"lg"

#define LONG_S			"stg"

#define LONG_LT_R		"ltgr"

#define LONG_CMP		"cg"

#define LONG_CMP_R		"cgr"

#define LONG_ADDI		"aghi"

#define LONG_ADD_R		"agr"



#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags,			\

				start_ip, post_commit_offset, abort_ip)	\

		".pushsection __rseq_table, \"aw\"\n\t"			\

		".balign 32\n\t"					\

		__rseq_str(label) ":\n\t"				\

		".long " __rseq_str(version) ", " __rseq_str(flags) "\n\t" \

		".quad " __rseq_str(start_ip) ", " __rseq_str(post_commit_offset) ", " __rseq_str(abort_ip) "\n\t" \

		".popsection\n\t"



#elif __s390__



#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags,			\

				start_ip, post_commit_offset, abort_ip)	\

		".pushsection __rseq_table, \"aw\"\n\t"			\

		".balign 32\n\t"					\

		__rseq_str(label) ":\n\t"				\

		".long " __rseq_str(version) ", " __rseq_str(flags) "\n\t" \

		".long 0x0, " __rseq_str(start_ip) ", 0x0, " __rseq_str(post_commit_offset) ", 0x0, " __rseq_str(abort_ip) "\n\t" \

		".popsection\n\t"



#define LONG_L			"l"

#define LONG_S			"st"

#define LONG_LT_R		"ltr"

#define LONG_CMP		"c"

#define LONG_CMP_R		"cr"

#define LONG_ADDI		"ahi"

#define LONG_ADD_R		"ar"



#endif



#define RSEQ_ASM_DEFINE_TABLE(label, start_ip, post_commit_ip, abort_ip) \

	__RSEQ_ASM_DEFINE_TABLE(label, 0x0, 0x0, start_ip,		\

				(post_commit_ip - start_ip), abort_ip)



#define RSEQ_ASM_STORE_RSEQ_CS(label, cs_label, rseq_cs)		\

		RSEQ_INJECT_ASM(1)					\

		"larl %%r0, " __rseq_str(cs_label) "\n\t"		\

		LONG_S " %%r0, %[" __rseq_str(rseq_cs) "]\n\t"		\

		__rseq_str(label) ":\n\t"



#define RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, label)		\

		RSEQ_INJECT_ASM(2)					\

		"c %[" __rseq_str(cpu_id) "], %[" __rseq_str(current_cpu_id) "]\n\t" \

		"jnz " __rseq_str(label) "\n\t"



#define RSEQ_ASM_DEFINE_ABORT(label, teardown, abort_label)		\

		".pushsection __rseq_failure, \"ax\"\n\t"		\

		".long " __rseq_str(RSEQ_SIG) "\n\t"			\

		__rseq_str(label) ":\n\t"				\

		teardown						\

		"j %l[" __rseq_str(abort_label) "]\n\t"			\

		".popsection\n\t"



#define RSEQ_ASM_DEFINE_CMPFAIL(label, teardown, cmpfail_label)		\

		".pushsection __rseq_failure, \"ax\"\n\t"		\

		__rseq_str(label) ":\n\t"				\

		teardown						\

		"j %l[" __rseq_str(cmpfail_label) "]\n\t"		\

		".popsection\n\t"



static inline __attribute__((always_inline))

int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu)

{

	RSEQ_INJECT_C(9)



	__asm__ __volatile__ goto (

		RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */

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

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, rseq_cs)

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f)

		RSEQ_INJECT_ASM(3)

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

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

		RSEQ_INJECT_ASM(4)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1])

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

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

#endif

		/* final store */

		LONG_S " %[newv], %[v]\n\t"

		"2:\n\t"

		RSEQ_INJECT_ASM(5)

		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),

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

		  [newv]		"r" (newv)

		  RSEQ_INJECT_INPUT

		: "memory", "cc", "r0"

		  RSEQ_INJECT_CLOBBER

		: abort, cmpfail

#ifdef RSEQ_COMPARE_TWICE

		  , error1, error2

#endif

	);

	return 0;

abort:

	RSEQ_INJECT_FAILED

	return -1;

cmpfail:

	return 1;

#ifdef RSEQ_COMPARE_TWICE

error1:

	rseq_bug("cpu_id comparison failed");

error2:

	rseq_bug("expected value comparison failed");

#endif

}



/*

 * Compare @v against @expectnot. When it does _not_ match, load @v

 * into @load, and store the content of *@v + voffp into @v.

 */

static inline __attribute__((always_inline))

int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot,

			       off_t voffp, intptr_t *load, int cpu)

{

	RSEQ_INJECT_C(9)



	__asm__ __volatile__ goto (

		RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */

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

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, rseq_cs)

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f)

		RSEQ_INJECT_ASM(3)

		LONG_L " %%r1, %[v]\n\t"

		LONG_CMP_R " %%r1, %[expectnot]\n\t"

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

		RSEQ_INJECT_ASM(4)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1])

		LONG_L " %%r1, %[v]\n\t"

		LONG_CMP_R " %%r1, %[expectnot]\n\t"

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

#endif

		LONG_S " %%r1, %[load]\n\t"

		LONG_ADD_R " %%r1, %[voffp]\n\t"

		LONG_L " %%r1, 0(%%r1)\n\t"

		/* final store */

		LONG_S " %%r1, %[v]\n\t"

		"2:\n\t"

		RSEQ_INJECT_ASM(5)

		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),

		  /* final store input */

		  [v]			"m" (*v),

		  [expectnot]		"r" (expectnot),

		  [voffp]		"r" (voffp),

		  [load]		"m" (*load)

		  RSEQ_INJECT_INPUT

		: "memory", "cc", "r0", "r1"

		  RSEQ_INJECT_CLOBBER

		: abort, cmpfail

#ifdef RSEQ_COMPARE_TWICE

		  , error1, error2

#endif

	);

	return 0;

abort:

	RSEQ_INJECT_FAILED

	return -1;

cmpfail:

	return 1;

#ifdef RSEQ_COMPARE_TWICE

error1:

	rseq_bug("cpu_id comparison failed");

error2:

	rseq_bug("expected value comparison failed");

#endif

}



static inline __attribute__((always_inline))

int rseq_addv(intptr_t *v, intptr_t count, int cpu)

{

	RSEQ_INJECT_C(9)



	__asm__ __volatile__ goto (

		RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */

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

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, rseq_cs)

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f)

		RSEQ_INJECT_ASM(3)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1])

#endif

		LONG_L " %%r0, %[v]\n\t"

		LONG_ADD_R " %%r0, %[count]\n\t"

		/* final store */

		LONG_S " %%r0, %[v]\n\t"

		"2:\n\t"

		RSEQ_INJECT_ASM(4)

		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),

		  /* final store input */

		  [v]			"m" (*v),

		  [count]		"r" (count)

		  RSEQ_INJECT_INPUT

		: "memory", "cc", "r0"

		  RSEQ_INJECT_CLOBBER

		: abort

#ifdef RSEQ_COMPARE_TWICE

		  , error1

#endif

	);

	return 0;

abort:

	RSEQ_INJECT_FAILED

	return -1;

#ifdef RSEQ_COMPARE_TWICE

error1:

	rseq_bug("cpu_id comparison failed");

#endif

}



static inline __attribute__((always_inline))

int rseq_cmpeqv_trystorev_storev(intptr_t *v, intptr_t expect,

				 intptr_t *v2, intptr_t newv2,

				 intptr_t newv, int cpu)

{

	RSEQ_INJECT_C(9)



	__asm__ __volatile__ goto (

		RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */

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

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, rseq_cs)

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f)

		RSEQ_INJECT_ASM(3)

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

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

		RSEQ_INJECT_ASM(4)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1])

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

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

#endif

		/* try store */

		LONG_S " %[newv2], %[v2]\n\t"

		RSEQ_INJECT_ASM(5)

		/* final store */

		LONG_S " %[newv], %[v]\n\t"

		"2:\n\t"

		RSEQ_INJECT_ASM(6)

		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),

		  /* try store input */

		  [v2]			"m" (*v2),

		  [newv2]		"r" (newv2),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

		  [newv]		"r" (newv)

		  RSEQ_INJECT_INPUT

		: "memory", "cc", "r0"

		  RSEQ_INJECT_CLOBBER

		: abort, cmpfail

#ifdef RSEQ_COMPARE_TWICE

		  , error1, error2

#endif

	);

	return 0;

abort:

	RSEQ_INJECT_FAILED

	return -1;

cmpfail:

	return 1;

#ifdef RSEQ_COMPARE_TWICE

error1:

	rseq_bug("cpu_id comparison failed");

error2:

	rseq_bug("expected value comparison failed");

#endif

}



/* s390 is TSO. */

static inline __attribute__((always_inline))

int rseq_cmpeqv_trystorev_storev_release(intptr_t *v, intptr_t expect,

					 intptr_t *v2, intptr_t newv2,

					 intptr_t newv, int cpu)

{

	return rseq_cmpeqv_trystorev_storev(v, expect, v2, newv2, newv, cpu);

}



static inline __attribute__((always_inline))

int rseq_cmpeqv_cmpeqv_storev(intptr_t *v, intptr_t expect,

			      intptr_t *v2, intptr_t expect2,

			      intptr_t newv, int cpu)

{

	RSEQ_INJECT_C(9)



	__asm__ __volatile__ goto (

		RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */

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

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, rseq_cs)

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f)

		RSEQ_INJECT_ASM(3)

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

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

		RSEQ_INJECT_ASM(4)

		LONG_CMP " %[expect2], %[v2]\n\t"

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

		RSEQ_INJECT_ASM(5)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1])

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

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

		LONG_CMP " %[expect2], %[v2]\n\t"

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

#endif

		/* final store */

		LONG_S " %[newv], %[v]\n\t"

		"2:\n\t"

		RSEQ_INJECT_ASM(6)

		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),

		  /* cmp2 input */

		  [v2]			"m" (*v2),

		  [expect2]		"r" (expect2),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

		  [newv]		"r" (newv)

		  RSEQ_INJECT_INPUT

		: "memory", "cc", "r0"

		  RSEQ_INJECT_CLOBBER

		: abort, cmpfail

#ifdef RSEQ_COMPARE_TWICE

		  , error1, error2, error3

#endif

	);

	return 0;

abort:

	RSEQ_INJECT_FAILED

	return -1;

cmpfail:

	return 1;

#ifdef RSEQ_COMPARE_TWICE

error1:

	rseq_bug("cpu_id comparison failed");

error2:

	rseq_bug("1st expected value comparison failed");

error3:

	rseq_bug("2nd expected value comparison failed");

#endif

}



static inline __attribute__((always_inline))

int rseq_cmpeqv_trymemcpy_storev(intptr_t *v, intptr_t expect,

				 void *dst, void *src, size_t len,

				 intptr_t newv, int cpu)

{

	uint64_t rseq_scratch[3];



	RSEQ_INJECT_C(9)



	__asm__ __volatile__ goto (

		RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */

		LONG_S " %[src], %[rseq_scratch0]\n\t"

		LONG_S " %[dst], %[rseq_scratch1]\n\t"

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

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

		RSEQ_ASM_STORE_RSEQ_CS(1, 3b, rseq_cs)

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f)

		RSEQ_INJECT_ASM(3)

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

		"jnz 5f\n\t"

		RSEQ_INJECT_ASM(4)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 6f)

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

		"jnz 7f\n\t"

#endif

		/* try memcpy */

		LONG_LT_R " %[len], %[len]\n\t"

		"jz 333f\n\t"

		"222:\n\t"

		"ic %%r0,0(%[src])\n\t"

		"stc %%r0,0(%[dst])\n\t"

		LONG_ADDI " %[src], 1\n\t"

		LONG_ADDI " %[dst], 1\n\t"

		LONG_ADDI " %[len], -1\n\t"

		"jnz 222b\n\t"

		"333:\n\t"

		RSEQ_INJECT_ASM(5)

		/* final store */

		LONG_S " %[newv], %[v]\n\t"

		"2:\n\t"

		RSEQ_INJECT_ASM(6)

		/* teardown */

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

		LONG_L " %[dst], %[rseq_scratch1]\n\t"

		LONG_L " %[src], %[rseq_scratch0]\n\t"

		RSEQ_ASM_DEFINE_ABORT(4,

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

			LONG_L " %[dst], %[rseq_scratch1]\n\t"

			LONG_L " %[src], %[rseq_scratch0]\n\t",

			abort)

		RSEQ_ASM_DEFINE_CMPFAIL(5,

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

			LONG_L " %[dst], %[rseq_scratch1]\n\t"

			LONG_L " %[src], %[rseq_scratch0]\n\t",

			cmpfail)

#ifdef RSEQ_COMPARE_TWICE

		RSEQ_ASM_DEFINE_CMPFAIL(6,

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

			LONG_L " %[dst], %[rseq_scratch1]\n\t"

			LONG_L " %[src], %[rseq_scratch0]\n\t",

			error1)

		RSEQ_ASM_DEFINE_CMPFAIL(7,

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

			LONG_L " %[dst], %[rseq_scratch1]\n\t"

			LONG_L " %[src], %[rseq_scratch0]\n\t",

			error2)

#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),

		  /* final store input */

		  [v]			"m" (*v),

		  [expect]		"r" (expect),

		  [newv]		"r" (newv),

		  /* try memcpy input */

		  [dst]			"r" (dst),

		  [src]			"r" (src),

		  [len]			"r" (len),

		  [rseq_scratch0]	"m" (rseq_scratch[0]),

		  [rseq_scratch1]	"m" (rseq_scratch[1]),

		  [rseq_scratch2]	"m" (rseq_scratch[2])

		  RSEQ_INJECT_INPUT

		: "memory", "cc", "r0"

		  RSEQ_INJECT_CLOBBER

		: abort, cmpfail

#ifdef RSEQ_COMPARE_TWICE

		  , error1, error2

#endif

	);

	return 0;

abort:

	RSEQ_INJECT_FAILED

	return -1;

cmpfail:

	return 1;

#ifdef RSEQ_COMPARE_TWICE

error1:

	rseq_bug("cpu_id comparison failed");

error2:

	rseq_bug("expected value comparison failed");

#endif

}



/* s390 is TSO. */

static inline __attribute__((always_inline))

int rseq_cmpeqv_trymemcpy_storev_release(intptr_t *v, intptr_t expect,

					 void *dst, void *src, size_t len,

					 intptr_t newv, int cpu)

{

	return rseq_cmpeqv_trymemcpy_storev(v, expect, dst, src, len,

					    newv, cpu);

}

#endif /* !RSEQ_SKIP_FASTPATH */

tools/testing/selftests/rseq/rseq.h

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ extern __thread volatile struct rseq __rseq_abi; 
#include <rseq-ppc.h>

#elif defined(__mips__)

#include <rseq-mips.h>

#elif defined(__s390__)

#include <rseq-s390.h>

#else

#error unsupported target

#endif