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: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20220124171253.22072-11-mathieu.desnoyers@efficios.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathieu Desnoyers
2022-01-24 12:12:48 -05:00
committed by Greg Kroah-Hartman
parent dbc1f0ee60
commit 35c6f5047f
9 changed files with 11 additions and 11 deletions

View File

@@ -167,7 +167,7 @@ struct percpu_list_node *this_cpu_list_pop(struct percpu_list *list,
for (;;) { for (;;) {
struct percpu_list_node *head; struct percpu_list_node *head;
intptr_t *targetptr, expectnot, *load; intptr_t *targetptr, expectnot, *load;
off_t offset; long offset;
int ret, cpu; int ret, cpu;
cpu = rseq_cpu_start(); cpu = rseq_cpu_start();

View File

@@ -549,7 +549,7 @@ struct percpu_list_node *this_cpu_list_pop(struct percpu_list *list,
for (;;) { for (;;) {
struct percpu_list_node *head; struct percpu_list_node *head;
intptr_t *targetptr, expectnot, *load; intptr_t *targetptr, expectnot, *load;
off_t offset; long offset;
int ret; int ret;
cpu = rseq_cpu_start(); cpu = rseq_cpu_start();

View File

@@ -217,7 +217,7 @@ error2:
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 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) RSEQ_INJECT_C(9)

View File

@@ -259,7 +259,7 @@ error2:
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 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) RSEQ_INJECT_C(9)

View File

@@ -222,7 +222,7 @@ error2:
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 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) RSEQ_INJECT_C(9)

View File

@@ -270,7 +270,7 @@ error2:
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 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) RSEQ_INJECT_C(9)

View File

@@ -198,7 +198,7 @@ error2:
*/ */
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 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) RSEQ_INJECT_C(9)

View File

@@ -13,7 +13,7 @@ int rseq_cmpeqv_storev(intptr_t *v, intptr_t expect, intptr_t newv, int cpu)
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 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)
{ {
return -1; return -1;
} }

View File

@@ -172,7 +172,7 @@ error2:
*/ */
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 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) RSEQ_INJECT_C(9)
@@ -286,7 +286,7 @@ error1:
* *pval += inc; * *pval += inc;
*/ */
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
int rseq_offset_deref_addv(intptr_t *ptr, off_t off, intptr_t inc, int cpu) int rseq_offset_deref_addv(intptr_t *ptr, long off, intptr_t inc, int cpu)
{ {
RSEQ_INJECT_C(9) RSEQ_INJECT_C(9)
@@ -750,7 +750,7 @@ error2:
*/ */
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
int rseq_cmpnev_storeoffp_load(intptr_t *v, intptr_t expectnot, 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) RSEQ_INJECT_C(9)