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

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

selftests/rseq: Fix ppc32 offsets by using long rather than off_t 



commit 26dc8a6d8e11552f3b797b5aafe01071ca32d692 upstream.

The semantic of off_t is for file offsets. We mean to use it as an
offset from a pointer. We really expect it to fit in a single register,
and not use a 64-bit type on 32-bit architectures.

Fix runtime issues on ppc32 where the offset is always 0 due to
inconsistency between the argument type (off_t -> 64-bit) and type
expected by the inline assembler (32-bit).

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


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

tools/testing/selftests/rseq/basic_percpu_ops_test.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct percpu_list_node *this_cpu_list_pop(struct percpu_list *list, 
	for (;;) {

		struct percpu_list_node *head;

		intptr_t *targetptr, expectnot, *load;

		off_t offset;

		long offset;

		int ret, cpu;



		cpu = rseq_cpu_start();

tools/testing/selftests/rseq/param_test.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ struct percpu_list_node *this_cpu_list_pop(struct percpu_list *list, 
	for (;;) {

		struct percpu_list_node *head;

		intptr_t *targetptr, expectnot, *load;

		off_t offset;

		long offset;

		int ret;



		cpu = rseq_cpu_start();

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

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu) 


static inline __attribute__((always_inline))

int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot,

			       off_t voffp, intptr_t *load, int cpu)

			       long voffp, intptr_t *load, int cpu)

{

	RSEQ_INJECT_C(9)

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

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu) 


static inline __attribute__((always_inline))

int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot,

			       off_t voffp, intptr_t *load, int cpu)

			       long voffp, intptr_t *load, int cpu)

{

	RSEQ_INJECT_C(9)

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

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu) 


static inline __attribute__((always_inline))

int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot,

			       off_t voffp, intptr_t *load, int cpu)

			       long voffp, intptr_t *load, int cpu)

{

	RSEQ_INJECT_C(9)