* [PATCH v2 0/3] Support rseq on arm64
@ 2018-07-09 14:19 Will Deacon
2018-07-09 14:19 ` [PATCH v2 1/3] arm64: rseq: Implement backend rseq calls and select HAVE_RSEQ Will Deacon
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Will Deacon @ 2018-07-09 14:19 UTC (permalink / raw)
To: linux-arm-kernel, mathieu.desnoyers
Cc: arnd, peterz, paulmck, boqun.feng, peter.maydell, linux-kernel,
Will Deacon
Hello,
This is version two of the patches previously posted here:
http://lkml.kernel.org/r/1529949285-11013-1-git-send-email-will.deacon@arm.com
Changes since v1 include:
* Move abort handler in-line to avoid possibility of it being
out-of-range for conditional branch instructions
I've tested both native and compat (little-endian only) with the selftests
and they pass successfully on my Seattle box.
Thanks,
Will
--->8
Will Deacon (3):
arm64: rseq: Implement backend rseq calls and select HAVE_RSEQ
asm-generic: unistd.h: Wire up sys_rseq
rseq/selftests: Add support for arm64
arch/arm64/Kconfig | 1 +
arch/arm64/include/asm/unistd.h | 2 +-
arch/arm64/include/asm/unistd32.h | 2 +
arch/arm64/kernel/entry.S | 2 +
arch/arm64/kernel/ptrace.c | 2 +
arch/arm64/kernel/signal.c | 3 +
include/uapi/asm-generic/unistd.h | 4 +-
tools/testing/selftests/rseq/param_test.c | 20 +
tools/testing/selftests/rseq/rseq-arm64.h | 594 ++++++++++++++++++++++++++++++
tools/testing/selftests/rseq/rseq.h | 2 +
10 files changed, 630 insertions(+), 2 deletions(-)
create mode 100644 tools/testing/selftests/rseq/rseq-arm64.h
--
2.1.4
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v2 1/3] arm64: rseq: Implement backend rseq calls and select HAVE_RSEQ 2018-07-09 14:19 [PATCH v2 0/3] Support rseq on arm64 Will Deacon @ 2018-07-09 14:19 ` Will Deacon 2018-07-09 14:19 ` [PATCH v2 2/3] asm-generic: unistd.h: Wire up sys_rseq Will Deacon ` (2 subsequent siblings) 3 siblings, 0 replies; 11+ messages in thread From: Will Deacon @ 2018-07-09 14:19 UTC (permalink / raw) To: linux-arm-kernel, mathieu.desnoyers Cc: arnd, peterz, paulmck, boqun.feng, peter.maydell, linux-kernel, Will Deacon Implement calls to rseq_signal_deliver, rseq_handle_notify_resume and rseq_syscall so that we can select HAVE_RSEQ on arm64. Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 2 ++ arch/arm64/kernel/entry.S | 2 ++ arch/arm64/kernel/ptrace.c | 2 ++ arch/arm64/kernel/signal.c | 3 +++ 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 42c090cf0292..26cb550673b2 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -127,6 +127,7 @@ config ARM64 select HAVE_PERF_USER_STACK_DUMP select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RCU_TABLE_FREE + select HAVE_RSEQ select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS select HAVE_KPROBES diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index a0baa9af5487..e0d0f5b856e7 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -43,7 +43,7 @@ #define __ARM_NR_compat_cacheflush (__ARM_NR_COMPAT_BASE+2) #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE+5) -#define __NR_compat_syscalls 398 +#define __NR_compat_syscalls 399 #endif #define __ARCH_WANT_SYS_CLONE diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index ef292160748c..0fdc7ef8a776 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -817,6 +817,8 @@ __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) __SYSCALL(__NR_pkey_free, sys_pkey_free) #define __NR_statx 397 __SYSCALL(__NR_statx, sys_statx) +#define __NR_rseq 398 +__SYSCALL(__NR_rseq, sys_rseq) /* * Please add new compat syscalls above this comment and update diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 28ad8799406f..1eda9e1a1f4a 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -904,6 +904,7 @@ ENDPROC(el0_error) ret_fast_syscall: disable_daif str x0, [sp, #S_X0] // returned x0 +#ifndef CONFIG_DEBUG_RSEQ ldr x1, [tsk, #TSK_TI_FLAGS] // re-check for syscall tracing and x2, x1, #_TIF_SYSCALL_WORK cbnz x2, ret_fast_syscall_trace @@ -911,6 +912,7 @@ ret_fast_syscall: cbnz x2, work_pending enable_step_tsk x1, x2 kernel_exit 0 +#endif ret_fast_syscall_trace: enable_daif b __sys_trace_return_skipped // we already saved x0 diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 5c338ce5a7fa..9f479c111675 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -1656,6 +1656,8 @@ asmlinkage void syscall_trace_exit(struct pt_regs *regs) if (test_thread_flag(TIF_SYSCALL_TRACE)) tracehook_report_syscall(regs, PTRACE_SYSCALL_EXIT); + + rseq_syscall(regs); } /* diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 511af13e8d8f..e3b1d1b0aee8 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -802,6 +802,8 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) int usig = ksig->sig; int ret; + rseq_signal_deliver(ksig, regs); + /* * Set up the stack frame */ @@ -940,6 +942,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, if (thread_flags & _TIF_NOTIFY_RESUME) { clear_thread_flag(TIF_NOTIFY_RESUME); tracehook_notify_resume(regs); + rseq_handle_notify_resume(NULL, regs); } if (thread_flags & _TIF_FOREIGN_FPSTATE) -- 2.1.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 2/3] asm-generic: unistd.h: Wire up sys_rseq 2018-07-09 14:19 [PATCH v2 0/3] Support rseq on arm64 Will Deacon 2018-07-09 14:19 ` [PATCH v2 1/3] arm64: rseq: Implement backend rseq calls and select HAVE_RSEQ Will Deacon @ 2018-07-09 14:19 ` Will Deacon 2018-07-10 17:53 ` Will Deacon 2018-07-09 14:19 ` [PATCH v2 3/3] rseq/selftests: Add support for arm64 Will Deacon 2018-07-09 16:06 ` [PATCH v2 0/3] Support rseq on arm64 Mathieu Desnoyers 3 siblings, 1 reply; 11+ messages in thread From: Will Deacon @ 2018-07-09 14:19 UTC (permalink / raw) To: linux-arm-kernel, mathieu.desnoyers Cc: arnd, peterz, paulmck, boqun.feng, peter.maydell, linux-kernel, Will Deacon The new rseq call arrived in 4.18-rc1, so provide it in the asm-generic unistd.h for architectures such as arm64. Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Will Deacon <will.deacon@arm.com> --- include/uapi/asm-generic/unistd.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 42990676a55e..df4bedb9b01c 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -734,9 +734,11 @@ __SYSCALL(__NR_pkey_free, sys_pkey_free) __SYSCALL(__NR_statx, sys_statx) #define __NR_io_pgetevents 292 __SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents) +#define __NR_rseq 293 +__SYSCALL(__NR_rseq, sys_rseq) #undef __NR_syscalls -#define __NR_syscalls 293 +#define __NR_syscalls 294 /* * 32 bit systems traditionally used different -- 2.1.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2 2/3] asm-generic: unistd.h: Wire up sys_rseq 2018-07-09 14:19 ` [PATCH v2 2/3] asm-generic: unistd.h: Wire up sys_rseq Will Deacon @ 2018-07-10 17:53 ` Will Deacon 2018-07-10 21:32 ` Arnd Bergmann 0 siblings, 1 reply; 11+ messages in thread From: Will Deacon @ 2018-07-10 17:53 UTC (permalink / raw) To: linux-arm-kernel, mathieu.desnoyers, arnd Cc: arnd, peterz, paulmck, boqun.feng, peter.maydell, linux-kernel Hi Arnd, On Mon, Jul 09, 2018 at 03:19:44PM +0100, Will Deacon wrote: > The new rseq call arrived in 4.18-rc1, so provide it in the asm-generic > unistd.h for architectures such as arm64. > > Cc: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Will Deacon <will.deacon@arm.com> > --- > include/uapi/asm-generic/unistd.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Please can you Ack this, so I can take it the arm64 tree? Thanks, Will > diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h > index 42990676a55e..df4bedb9b01c 100644 > --- a/include/uapi/asm-generic/unistd.h > +++ b/include/uapi/asm-generic/unistd.h > @@ -734,9 +734,11 @@ __SYSCALL(__NR_pkey_free, sys_pkey_free) > __SYSCALL(__NR_statx, sys_statx) > #define __NR_io_pgetevents 292 > __SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents) > +#define __NR_rseq 293 > +__SYSCALL(__NR_rseq, sys_rseq) > > #undef __NR_syscalls > -#define __NR_syscalls 293 > +#define __NR_syscalls 294 > > /* > * 32 bit systems traditionally used different > -- > 2.1.4 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 2/3] asm-generic: unistd.h: Wire up sys_rseq 2018-07-10 17:53 ` Will Deacon @ 2018-07-10 21:32 ` Arnd Bergmann 0 siblings, 0 replies; 11+ messages in thread From: Arnd Bergmann @ 2018-07-10 21:32 UTC (permalink / raw) To: Will Deacon Cc: Linux ARM, Mathieu Desnoyers, Peter Zijlstra, Paul E. McKenney, Boqun Feng, peter.maydell, Linux Kernel Mailing List On Tue, Jul 10, 2018 at 7:53 PM, Will Deacon <will.deacon@arm.com> wrote: > Hi Arnd, > > On Mon, Jul 09, 2018 at 03:19:44PM +0100, Will Deacon wrote: >> The new rseq call arrived in 4.18-rc1, so provide it in the asm-generic >> unistd.h for architectures such as arm64. >> >> Cc: Arnd Bergmann <arnd@arndb.de> >> Signed-off-by: Will Deacon <will.deacon@arm.com> >> --- >> include/uapi/asm-generic/unistd.h | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) > > Please can you Ack this, so I can take it the arm64 tree? I just checked again that this syscall is compatible with compat mode on all architectures that need it, so the addition is safe. Acked-by: Arnd Bergmann <arnd@arndb.de> ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 3/3] rseq/selftests: Add support for arm64 2018-07-09 14:19 [PATCH v2 0/3] Support rseq on arm64 Will Deacon 2018-07-09 14:19 ` [PATCH v2 1/3] arm64: rseq: Implement backend rseq calls and select HAVE_RSEQ Will Deacon 2018-07-09 14:19 ` [PATCH v2 2/3] asm-generic: unistd.h: Wire up sys_rseq Will Deacon @ 2018-07-09 14:19 ` Will Deacon 2018-07-09 16:06 ` [PATCH v2 0/3] Support rseq on arm64 Mathieu Desnoyers 3 siblings, 0 replies; 11+ messages in thread From: Will Deacon @ 2018-07-09 14:19 UTC (permalink / raw) To: linux-arm-kernel, mathieu.desnoyers Cc: arnd, peterz, paulmck, boqun.feng, peter.maydell, linux-kernel, Will Deacon Hook up arm64 support to the rseq selftests. Signed-off-by: Will Deacon <will.deacon@arm.com> --- tools/testing/selftests/rseq/param_test.c | 20 + tools/testing/selftests/rseq/rseq-arm64.h | 594 ++++++++++++++++++++++++++++++ tools/testing/selftests/rseq/rseq.h | 2 + 3 files changed, 616 insertions(+) create mode 100644 tools/testing/selftests/rseq/rseq-arm64.h diff --git a/tools/testing/selftests/rseq/param_test.c b/tools/testing/selftests/rseq/param_test.c index 615252331813..fa144c556371 100644 --- a/tools/testing/selftests/rseq/param_test.c +++ b/tools/testing/selftests/rseq/param_test.c @@ -114,6 +114,26 @@ unsigned int yield_mod_cnt, nr_abort; "bne 222b\n\t" \ "333:\n\t" +#elif defined(__AARCH64EL__) + +#define RSEQ_INJECT_INPUT \ + , [loop_cnt_1] "Qo" (loop_cnt[1]) \ + , [loop_cnt_2] "Qo" (loop_cnt[2]) \ + , [loop_cnt_3] "Qo" (loop_cnt[3]) \ + , [loop_cnt_4] "Qo" (loop_cnt[4]) \ + , [loop_cnt_5] "Qo" (loop_cnt[5]) \ + , [loop_cnt_6] "Qo" (loop_cnt[6]) + +#define INJECT_ASM_REG RSEQ_ASM_TMP_REG32 + +#define RSEQ_INJECT_ASM(n) \ + " ldr " INJECT_ASM_REG ", %[loop_cnt_" #n "]\n" \ + " cbz " INJECT_ASM_REG ", 333f\n" \ + "222:\n" \ + " sub " INJECT_ASM_REG ", " INJECT_ASM_REG ", #1\n" \ + " cbnz " INJECT_ASM_REG ", 222b\n" \ + "333:\n" + #elif __PPC__ #define RSEQ_INJECT_INPUT \ diff --git a/tools/testing/selftests/rseq/rseq-arm64.h b/tools/testing/selftests/rseq/rseq-arm64.h new file mode 100644 index 000000000000..954f34671ca6 --- /dev/null +++ b/tools/testing/selftests/rseq/rseq-arm64.h @@ -0,0 +1,594 @@ +/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ +/* + * rseq-arm64.h + * + * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com> + * (C) Copyright 2018 - Will Deacon <will.deacon@arm.com> + */ + +#define RSEQ_SIG 0xd428bc00 /* BRK #0x45E0 */ + +#define rseq_smp_mb() __asm__ __volatile__ ("dmb ish" ::: "memory") +#define rseq_smp_rmb() __asm__ __volatile__ ("dmb ishld" ::: "memory") +#define rseq_smp_wmb() __asm__ __volatile__ ("dmb ishst" ::: "memory") + +#define rseq_smp_load_acquire(p) \ +__extension__ ({ \ + __typeof(*p) ____p1; \ + switch (sizeof(*p)) { \ + case 1: \ + asm volatile ("ldarb %w0, %1" \ + : "=r" (*(__u8 *)p) \ + : "Q" (*p) : "memory"); \ + break; \ + case 2: \ + asm volatile ("ldarh %w0, %1" \ + : "=r" (*(__u16 *)p) \ + : "Q" (*p) : "memory"); \ + break; \ + case 4: \ + asm volatile ("ldar %w0, %1" \ + : "=r" (*(__u32 *)p) \ + : "Q" (*p) : "memory"); \ + break; \ + case 8: \ + asm volatile ("ldar %0, %1" \ + : "=r" (*(__u64 *)p) \ + : "Q" (*p) : "memory"); \ + break; \ + } \ + ____p1; \ +}) + +#define rseq_smp_acquire__after_ctrl_dep() rseq_smp_rmb() + +#define rseq_smp_store_release(p, v) \ +do { \ + switch (sizeof(*p)) { \ + case 1: \ + asm volatile ("stlrb %w1, %0" \ + : "=Q" (*p) \ + : "r" ((__u8)v) \ + : "memory"); \ + break; \ + case 2: \ + asm volatile ("stlrh %w1, %0" \ + : "=Q" (*p) \ + : "r" ((__u16)v) \ + : "memory"); \ + break; \ + case 4: \ + asm volatile ("stlr %w1, %0" \ + : "=Q" (*p) \ + : "r" ((__u32)v) \ + : "memory"); \ + break; \ + case 8: \ + asm volatile ("stlr %1, %0" \ + : "=Q" (*p) \ + : "r" ((__u64)v) \ + : "memory"); \ + break; \ + } \ +} while (0) + +#ifdef RSEQ_SKIP_FASTPATH +#include "rseq-skip.h" +#else /* !RSEQ_SKIP_FASTPATH */ + +#define RSEQ_ASM_TMP_REG32 "w15" +#define RSEQ_ASM_TMP_REG "x15" +#define RSEQ_ASM_TMP_REG_2 "x14" + +#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags, start_ip, \ + post_commit_offset, abort_ip) \ + " .pushsection __rseq_table, \"aw\"\n" \ + " .balign 32\n" \ + __rseq_str(label) ":\n" \ + " .long " __rseq_str(version) ", " __rseq_str(flags) "\n" \ + " .quad " __rseq_str(start_ip) ", " \ + __rseq_str(post_commit_offset) ", " \ + __rseq_str(abort_ip) "\n" \ + " .popsection\n" + +#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) \ + " adrp " RSEQ_ASM_TMP_REG ", " __rseq_str(cs_label) "\n" \ + " add " RSEQ_ASM_TMP_REG ", " RSEQ_ASM_TMP_REG \ + ", :lo12:" __rseq_str(cs_label) "\n" \ + " str " RSEQ_ASM_TMP_REG ", %[" __rseq_str(rseq_cs) "]\n" \ + __rseq_str(label) ":\n" + +#define RSEQ_ASM_DEFINE_ABORT(label, abort_label) \ + " b 222f\n" \ + " .inst " __rseq_str(RSEQ_SIG) "\n" \ + __rseq_str(label) ":\n" \ + " b %l[" __rseq_str(abort_label) "]\n" \ + "222:\n" + +#define RSEQ_ASM_OP_STORE(value, var) \ + " str %[" __rseq_str(value) "], %[" __rseq_str(var) "]\n" + +#define RSEQ_ASM_OP_STORE_RELEASE(value, var) \ + " stlr %[" __rseq_str(value) "], %[" __rseq_str(var) "]\n" + +#define RSEQ_ASM_OP_FINAL_STORE(value, var, post_commit_label) \ + RSEQ_ASM_OP_STORE(value, var) \ + __rseq_str(post_commit_label) ":\n" + +#define RSEQ_ASM_OP_FINAL_STORE_RELEASE(value, var, post_commit_label) \ + RSEQ_ASM_OP_STORE_RELEASE(value, var) \ + __rseq_str(post_commit_label) ":\n" + +#define RSEQ_ASM_OP_CMPEQ(var, expect, label) \ + " ldr " RSEQ_ASM_TMP_REG ", %[" __rseq_str(var) "]\n" \ + " sub " RSEQ_ASM_TMP_REG ", " RSEQ_ASM_TMP_REG \ + ", %[" __rseq_str(expect) "]\n" \ + " cbnz " RSEQ_ASM_TMP_REG ", " __rseq_str(label) "\n" + +#define RSEQ_ASM_OP_CMPEQ32(var, expect, label) \ + " ldr " RSEQ_ASM_TMP_REG32 ", %[" __rseq_str(var) "]\n" \ + " sub " RSEQ_ASM_TMP_REG32 ", " RSEQ_ASM_TMP_REG32 \ + ", %w[" __rseq_str(expect) "]\n" \ + " cbnz " RSEQ_ASM_TMP_REG32 ", " __rseq_str(label) "\n" + +#define RSEQ_ASM_OP_CMPNE(var, expect, label) \ + " ldr " RSEQ_ASM_TMP_REG ", %[" __rseq_str(var) "]\n" \ + " sub " RSEQ_ASM_TMP_REG ", " RSEQ_ASM_TMP_REG \ + ", %[" __rseq_str(expect) "]\n" \ + " cbz " RSEQ_ASM_TMP_REG ", " __rseq_str(label) "\n" + +#define RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, label) \ + RSEQ_INJECT_ASM(2) \ + RSEQ_ASM_OP_CMPEQ32(current_cpu_id, cpu_id, label) + +#define RSEQ_ASM_OP_R_LOAD(var) \ + " ldr " RSEQ_ASM_TMP_REG ", %[" __rseq_str(var) "]\n" + +#define RSEQ_ASM_OP_R_STORE(var) \ + " str " RSEQ_ASM_TMP_REG ", %[" __rseq_str(var) "]\n" + +#define RSEQ_ASM_OP_R_LOAD_OFF(offset) \ + " ldr " RSEQ_ASM_TMP_REG ", [" RSEQ_ASM_TMP_REG \ + ", %[" __rseq_str(offset) "]]\n" + +#define RSEQ_ASM_OP_R_ADD(count) \ + " add " RSEQ_ASM_TMP_REG ", " RSEQ_ASM_TMP_REG \ + ", %[" __rseq_str(count) "]\n" + +#define RSEQ_ASM_OP_R_FINAL_STORE(var, post_commit_label) \ + " str " RSEQ_ASM_TMP_REG ", %[" __rseq_str(var) "]\n" \ + __rseq_str(post_commit_label) ":\n" + +#define RSEQ_ASM_OP_R_BAD_MEMCPY(dst, src, len) \ + " cbz %[" __rseq_str(len) "], 333f\n" \ + " mov " RSEQ_ASM_TMP_REG_2 ", %[" __rseq_str(len) "]\n" \ + "222: sub " RSEQ_ASM_TMP_REG_2 ", " RSEQ_ASM_TMP_REG_2 ", #1\n" \ + " ldrb " RSEQ_ASM_TMP_REG32 ", [%[" __rseq_str(src) "]" \ + ", " RSEQ_ASM_TMP_REG_2 "]\n" \ + " strb " RSEQ_ASM_TMP_REG32 ", [%[" __rseq_str(dst) "]" \ + ", " RSEQ_ASM_TMP_REG_2 "]\n" \ + " cbnz " RSEQ_ASM_TMP_REG_2 ", 222b\n" \ + "333:\n" + +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(1, 2f, 3f, 4f) + RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs) + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f) + RSEQ_INJECT_ASM(3) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[cmpfail]) + RSEQ_INJECT_ASM(4) +#ifdef RSEQ_COMPARE_TWICE + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1]) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[error2]) +#endif + RSEQ_ASM_OP_FINAL_STORE(newv, v, 3) + RSEQ_INJECT_ASM(5) + RSEQ_ASM_DEFINE_ABORT(4, abort) + : /* gcc asm goto does not allow outputs */ + : [cpu_id] "r" (cpu), + [current_cpu_id] "Qo" (__rseq_abi.cpu_id), + [rseq_cs] "m" (__rseq_abi.rseq_cs), + [v] "Qo" (*v), + [expect] "r" (expect), + [newv] "r" (newv) + RSEQ_INJECT_INPUT + : "memory", RSEQ_ASM_TMP_REG + : 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_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(1, 2f, 3f, 4f) + RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs) + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f) + RSEQ_INJECT_ASM(3) + RSEQ_ASM_OP_CMPNE(v, expectnot, %l[cmpfail]) + RSEQ_INJECT_ASM(4) +#ifdef RSEQ_COMPARE_TWICE + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1]) + RSEQ_ASM_OP_CMPNE(v, expectnot, %l[error2]) +#endif + RSEQ_ASM_OP_R_LOAD(v) + RSEQ_ASM_OP_R_STORE(load) + RSEQ_ASM_OP_R_LOAD_OFF(voffp) + RSEQ_ASM_OP_R_FINAL_STORE(v, 3) + RSEQ_INJECT_ASM(5) + RSEQ_ASM_DEFINE_ABORT(4, abort) + : /* gcc asm goto does not allow outputs */ + : [cpu_id] "r" (cpu), + [current_cpu_id] "Qo" (__rseq_abi.cpu_id), + [rseq_cs] "m" (__rseq_abi.rseq_cs), + [v] "Qo" (*v), + [expectnot] "r" (expectnot), + [load] "Qo" (*load), + [voffp] "r" (voffp) + RSEQ_INJECT_INPUT + : "memory", RSEQ_ASM_TMP_REG + : 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(1, 2f, 3f, 4f) + RSEQ_ASM_STORE_RSEQ_CS(2, 1b, 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 + RSEQ_ASM_OP_R_LOAD(v) + RSEQ_ASM_OP_R_ADD(count) + RSEQ_ASM_OP_R_FINAL_STORE(v, 3) + RSEQ_INJECT_ASM(4) + RSEQ_ASM_DEFINE_ABORT(4, abort) + : /* gcc asm goto does not allow outputs */ + : [cpu_id] "r" (cpu), + [current_cpu_id] "Qo" (__rseq_abi.cpu_id), + [rseq_cs] "m" (__rseq_abi.rseq_cs), + [v] "Qo" (*v), + [count] "r" (count) + RSEQ_INJECT_INPUT + : "memory", RSEQ_ASM_TMP_REG + : 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(1, 2f, 3f, 4f) + RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs) + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f) + RSEQ_INJECT_ASM(3) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[cmpfail]) + RSEQ_INJECT_ASM(4) +#ifdef RSEQ_COMPARE_TWICE + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1]) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[error2]) +#endif + RSEQ_ASM_OP_STORE(newv2, v2) + RSEQ_INJECT_ASM(5) + RSEQ_ASM_OP_FINAL_STORE(newv, v, 3) + RSEQ_INJECT_ASM(6) + RSEQ_ASM_DEFINE_ABORT(4, abort) + : /* gcc asm goto does not allow outputs */ + : [cpu_id] "r" (cpu), + [current_cpu_id] "Qo" (__rseq_abi.cpu_id), + [rseq_cs] "m" (__rseq_abi.rseq_cs), + [expect] "r" (expect), + [v] "Qo" (*v), + [newv] "r" (newv), + [v2] "Qo" (*v2), + [newv2] "r" (newv2) + RSEQ_INJECT_INPUT + : "memory", RSEQ_ASM_TMP_REG + : 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_cmpeqv_trystorev_storev_release(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(1, 2f, 3f, 4f) + RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs) + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f) + RSEQ_INJECT_ASM(3) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[cmpfail]) + RSEQ_INJECT_ASM(4) +#ifdef RSEQ_COMPARE_TWICE + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1]) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[error2]) +#endif + RSEQ_ASM_OP_STORE(newv2, v2) + RSEQ_INJECT_ASM(5) + RSEQ_ASM_OP_FINAL_STORE_RELEASE(newv, v, 3) + RSEQ_INJECT_ASM(6) + RSEQ_ASM_DEFINE_ABORT(4, abort) + : /* gcc asm goto does not allow outputs */ + : [cpu_id] "r" (cpu), + [current_cpu_id] "Qo" (__rseq_abi.cpu_id), + [rseq_cs] "m" (__rseq_abi.rseq_cs), + [expect] "r" (expect), + [v] "Qo" (*v), + [newv] "r" (newv), + [v2] "Qo" (*v2), + [newv2] "r" (newv2) + RSEQ_INJECT_INPUT + : "memory", RSEQ_ASM_TMP_REG + : 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_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(1, 2f, 3f, 4f) + RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs) + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f) + RSEQ_INJECT_ASM(3) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[cmpfail]) + RSEQ_INJECT_ASM(4) + RSEQ_ASM_OP_CMPEQ(v2, expect2, %l[cmpfail]) + RSEQ_INJECT_ASM(5) +#ifdef RSEQ_COMPARE_TWICE + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1]) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[error2]) + RSEQ_ASM_OP_CMPEQ(v2, expect2, %l[error3]) +#endif + RSEQ_ASM_OP_FINAL_STORE(newv, v, 3) + RSEQ_INJECT_ASM(6) + RSEQ_ASM_DEFINE_ABORT(4, abort) + : /* gcc asm goto does not allow outputs */ + : [cpu_id] "r" (cpu), + [current_cpu_id] "Qo" (__rseq_abi.cpu_id), + [rseq_cs] "m" (__rseq_abi.rseq_cs), + [v] "Qo" (*v), + [expect] "r" (expect), + [v2] "Qo" (*v2), + [expect2] "r" (expect2), + [newv] "r" (newv) + RSEQ_INJECT_INPUT + : "memory", RSEQ_ASM_TMP_REG + : 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("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) +{ + RSEQ_INJECT_C(9) + + __asm__ __volatile__ goto ( + RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f) + RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs) + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f) + RSEQ_INJECT_ASM(3) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[cmpfail]) + RSEQ_INJECT_ASM(4) +#ifdef RSEQ_COMPARE_TWICE + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1]) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[error2]) +#endif + RSEQ_ASM_OP_R_BAD_MEMCPY(dst, src, len) + RSEQ_INJECT_ASM(5) + RSEQ_ASM_OP_FINAL_STORE(newv, v, 3) + RSEQ_INJECT_ASM(6) + RSEQ_ASM_DEFINE_ABORT(4, abort) + : /* gcc asm goto does not allow outputs */ + : [cpu_id] "r" (cpu), + [current_cpu_id] "Qo" (__rseq_abi.cpu_id), + [rseq_cs] "m" (__rseq_abi.rseq_cs), + [expect] "r" (expect), + [v] "Qo" (*v), + [newv] "r" (newv), + [dst] "r" (dst), + [src] "r" (src), + [len] "r" (len) + RSEQ_INJECT_INPUT + : "memory", RSEQ_ASM_TMP_REG, RSEQ_ASM_TMP_REG_2 + : 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_cmpeqv_trymemcpy_storev_release(intptr_t *v, intptr_t expect, + void *dst, void *src, size_t len, + intptr_t newv, int cpu) +{ + RSEQ_INJECT_C(9) + + __asm__ __volatile__ goto ( + RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f) + RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs) + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, 4f) + RSEQ_INJECT_ASM(3) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[cmpfail]) + RSEQ_INJECT_ASM(4) +#ifdef RSEQ_COMPARE_TWICE + RSEQ_ASM_CMP_CPU_ID(cpu_id, current_cpu_id, %l[error1]) + RSEQ_ASM_OP_CMPEQ(v, expect, %l[error2]) +#endif + RSEQ_ASM_OP_R_BAD_MEMCPY(dst, src, len) + RSEQ_INJECT_ASM(5) + RSEQ_ASM_OP_FINAL_STORE_RELEASE(newv, v, 3) + RSEQ_INJECT_ASM(6) + RSEQ_ASM_DEFINE_ABORT(4, abort) + : /* gcc asm goto does not allow outputs */ + : [cpu_id] "r" (cpu), + [current_cpu_id] "Qo" (__rseq_abi.cpu_id), + [rseq_cs] "m" (__rseq_abi.rseq_cs), + [expect] "r" (expect), + [v] "Qo" (*v), + [newv] "r" (newv), + [dst] "r" (dst), + [src] "r" (src), + [len] "r" (len) + RSEQ_INJECT_INPUT + : "memory", RSEQ_ASM_TMP_REG, RSEQ_ASM_TMP_REG_2 + : 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 +} + +#endif /* !RSEQ_SKIP_FASTPATH */ diff --git a/tools/testing/selftests/rseq/rseq.h b/tools/testing/selftests/rseq/rseq.h index 86ce22417e0d..bbdf472776b3 100644 --- a/tools/testing/selftests/rseq/rseq.h +++ b/tools/testing/selftests/rseq/rseq.h @@ -71,6 +71,8 @@ extern __thread volatile struct rseq __rseq_abi; #include <rseq-x86.h> #elif defined(__ARMEL__) #include <rseq-arm.h> +#elif defined (__AARCH64EL__) +#include <rseq-arm64.h> #elif defined(__PPC__) #include <rseq-ppc.h> #elif defined(__mips__) -- 2.1.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/3] Support rseq on arm64 2018-07-09 14:19 [PATCH v2 0/3] Support rseq on arm64 Will Deacon ` (2 preceding siblings ...) 2018-07-09 14:19 ` [PATCH v2 3/3] rseq/selftests: Add support for arm64 Will Deacon @ 2018-07-09 16:06 ` Mathieu Desnoyers 2018-07-09 16:53 ` Will Deacon 3 siblings, 1 reply; 11+ messages in thread From: Mathieu Desnoyers @ 2018-07-09 16:06 UTC (permalink / raw) To: Will Deacon Cc: linux-arm-kernel, Arnd Bergmann, Peter Zijlstra, Paul E. McKenney, Boqun Feng, peter maydell, linux-kernel ----- On Jul 9, 2018, at 10:19 AM, Will Deacon will.deacon@arm.com wrote: > Hello, > > This is version two of the patches previously posted here: > > http://lkml.kernel.org/r/1529949285-11013-1-git-send-email-will.deacon@arm.com > > Changes since v1 include: > > * Move abort handler in-line to avoid possibility of it being > out-of-range for conditional branch instructions > > I've tested both native and compat (little-endian only) with the selftests > and they pass successfully on my Seattle box. For the whole series: Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Thanks! Mathieu > > Thanks, > > Will > > --->8 > > Will Deacon (3): > arm64: rseq: Implement backend rseq calls and select HAVE_RSEQ > asm-generic: unistd.h: Wire up sys_rseq > rseq/selftests: Add support for arm64 > > arch/arm64/Kconfig | 1 + > arch/arm64/include/asm/unistd.h | 2 +- > arch/arm64/include/asm/unistd32.h | 2 + > arch/arm64/kernel/entry.S | 2 + > arch/arm64/kernel/ptrace.c | 2 + > arch/arm64/kernel/signal.c | 3 + > include/uapi/asm-generic/unistd.h | 4 +- > tools/testing/selftests/rseq/param_test.c | 20 + > tools/testing/selftests/rseq/rseq-arm64.h | 594 ++++++++++++++++++++++++++++++ > tools/testing/selftests/rseq/rseq.h | 2 + > 10 files changed, 630 insertions(+), 2 deletions(-) > create mode 100644 tools/testing/selftests/rseq/rseq-arm64.h > > -- > 2.1.4 -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/3] Support rseq on arm64 2018-07-09 16:06 ` [PATCH v2 0/3] Support rseq on arm64 Mathieu Desnoyers @ 2018-07-09 16:53 ` Will Deacon 2018-07-09 17:17 ` Mathieu Desnoyers 0 siblings, 1 reply; 11+ messages in thread From: Will Deacon @ 2018-07-09 16:53 UTC (permalink / raw) To: Mathieu Desnoyers Cc: linux-arm-kernel, Arnd Bergmann, Peter Zijlstra, Paul E. McKenney, Boqun Feng, peter maydell, linux-kernel On Mon, Jul 09, 2018 at 12:06:22PM -0400, Mathieu Desnoyers wrote: > ----- On Jul 9, 2018, at 10:19 AM, Will Deacon will.deacon@arm.com wrote: > > > Hello, > > > > This is version two of the patches previously posted here: > > > > http://lkml.kernel.org/r/1529949285-11013-1-git-send-email-will.deacon@arm.com > > > > Changes since v1 include: > > > > * Move abort handler in-line to avoid possibility of it being > > out-of-range for conditional branch instructions > > > > I've tested both native and compat (little-endian only) with the selftests > > and they pass successfully on my Seattle box. > > For the whole series: > > Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Thanks, Mathieu! Are you ok with me taking this via the arm64 tree for 4.19 once I have an Ack for the asm-generic change, or would you rather this went via somewhere else? Cheers, Will ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/3] Support rseq on arm64 2018-07-09 16:53 ` Will Deacon @ 2018-07-09 17:17 ` Mathieu Desnoyers 2018-07-10 14:49 ` Will Deacon 0 siblings, 1 reply; 11+ messages in thread From: Mathieu Desnoyers @ 2018-07-09 17:17 UTC (permalink / raw) To: Will Deacon, Thomas Gleixner Cc: linux-arm-kernel, Arnd Bergmann, Peter Zijlstra, Paul E. McKenney, Boqun Feng, peter maydell, linux-kernel ----- On Jul 9, 2018, at 12:53 PM, Will Deacon will.deacon@arm.com wrote: > On Mon, Jul 09, 2018 at 12:06:22PM -0400, Mathieu Desnoyers wrote: >> ----- On Jul 9, 2018, at 10:19 AM, Will Deacon will.deacon@arm.com wrote: >> >> > Hello, >> > >> > This is version two of the patches previously posted here: >> > >> > http://lkml.kernel.org/r/1529949285-11013-1-git-send-email-will.deacon@arm.com >> > >> > Changes since v1 include: >> > >> > * Move abort handler in-line to avoid possibility of it being >> > out-of-range for conditional branch instructions >> > >> > I've tested both native and compat (little-endian only) with the selftests >> > and they pass successfully on my Seattle box. >> >> For the whole series: >> >> Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> > > Thanks, Mathieu! Are you ok with me taking this via the arm64 tree for > 4.19 once I have an Ack for the asm-generic change, or would you rather > this went via somewhere else? Adding Thomas Gleixner in CC. He has been picking up the rseq bits for 4.18. I've noticed it was rather easier to gather rseq stuff through a single tree (less chances of confusion). Also, support for additional architectures (e.g. MIPS) was added to rseq after rc1. Is it too late to merge arm64 support targeting 4.18 ? Thanks, Mathieu > > Cheers, > > Will -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/3] Support rseq on arm64 2018-07-09 17:17 ` Mathieu Desnoyers @ 2018-07-10 14:49 ` Will Deacon 2018-07-10 14:51 ` Mathieu Desnoyers 0 siblings, 1 reply; 11+ messages in thread From: Will Deacon @ 2018-07-10 14:49 UTC (permalink / raw) To: Mathieu Desnoyers Cc: Thomas Gleixner, linux-arm-kernel, Arnd Bergmann, Peter Zijlstra, Paul E. McKenney, Boqun Feng, peter maydell, linux-kernel On Mon, Jul 09, 2018 at 01:17:54PM -0400, Mathieu Desnoyers wrote: > ----- On Jul 9, 2018, at 12:53 PM, Will Deacon will.deacon@arm.com wrote: > > > On Mon, Jul 09, 2018 at 12:06:22PM -0400, Mathieu Desnoyers wrote: > >> ----- On Jul 9, 2018, at 10:19 AM, Will Deacon will.deacon@arm.com wrote: > >> > >> > Hello, > >> > > >> > This is version two of the patches previously posted here: > >> > > >> > http://lkml.kernel.org/r/1529949285-11013-1-git-send-email-will.deacon@arm.com > >> > > >> > Changes since v1 include: > >> > > >> > * Move abort handler in-line to avoid possibility of it being > >> > out-of-range for conditional branch instructions > >> > > >> > I've tested both native and compat (little-endian only) with the selftests > >> > and they pass successfully on my Seattle box. > >> > >> For the whole series: > >> > >> Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> > > > > Thanks, Mathieu! Are you ok with me taking this via the arm64 tree for > > 4.19 once I have an Ack for the asm-generic change, or would you rather > > this went via somewhere else? > > Adding Thomas Gleixner in CC. He has been picking up the rseq bits for > 4.18. I've noticed it was rather easier to gather rseq stuff through a > single tree (less chances of confusion). Whilst I can see that making some sense for the selftests (particularly if the ABI is liable to further changes before 4.18 is released), I'd prefer to take the arm64 bits via the arm64 tree, as they will conflict with some ongoing work to rewrite the syscall entry path in C which I plan to queue in the next week (pending final testing results). > Also, support for additional architectures (e.g. MIPS) was added to rseq > after rc1. Is it too late to merge arm64 support targeting 4.18 ? Personally, I don't see the rush, but I won't stop anybody who wants to try steam-rollering them into mainline ;) Will ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/3] Support rseq on arm64 2018-07-10 14:49 ` Will Deacon @ 2018-07-10 14:51 ` Mathieu Desnoyers 0 siblings, 0 replies; 11+ messages in thread From: Mathieu Desnoyers @ 2018-07-10 14:51 UTC (permalink / raw) To: Will Deacon Cc: Thomas Gleixner, linux-arm-kernel, Arnd Bergmann, Peter Zijlstra, Paul E. McKenney, Boqun Feng, peter maydell, linux-kernel ----- On Jul 10, 2018, at 10:49 AM, Will Deacon will.deacon@arm.com wrote: > On Mon, Jul 09, 2018 at 01:17:54PM -0400, Mathieu Desnoyers wrote: >> ----- On Jul 9, 2018, at 12:53 PM, Will Deacon will.deacon@arm.com wrote: >> >> > On Mon, Jul 09, 2018 at 12:06:22PM -0400, Mathieu Desnoyers wrote: >> >> ----- On Jul 9, 2018, at 10:19 AM, Will Deacon will.deacon@arm.com wrote: >> >> >> >> > Hello, >> >> > >> >> > This is version two of the patches previously posted here: >> >> > >> >> > http://lkml.kernel.org/r/1529949285-11013-1-git-send-email-will.deacon@arm.com >> >> > >> >> > Changes since v1 include: >> >> > >> >> > * Move abort handler in-line to avoid possibility of it being >> >> > out-of-range for conditional branch instructions >> >> > >> >> > I've tested both native and compat (little-endian only) with the selftests >> >> > and they pass successfully on my Seattle box. >> >> >> >> For the whole series: >> >> >> >> Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> >> > >> > Thanks, Mathieu! Are you ok with me taking this via the arm64 tree for >> > 4.19 once I have an Ack for the asm-generic change, or would you rather >> > this went via somewhere else? >> >> Adding Thomas Gleixner in CC. He has been picking up the rseq bits for >> 4.18. I've noticed it was rather easier to gather rseq stuff through a >> single tree (less chances of confusion). > > Whilst I can see that making some sense for the selftests (particularly > if the ABI is liable to further changes before 4.18 is released), I'd > prefer to take the arm64 bits via the arm64 tree, as they will conflict > with some ongoing work to rewrite the syscall entry path in C which I > plan to queue in the next week (pending final testing results). Considering this, indeed going through the arm64 tree seems like the right approach. > >> Also, support for additional architectures (e.g. MIPS) was added to rseq >> after rc1. Is it too late to merge arm64 support targeting 4.18 ? > > Personally, I don't see the rush, but I won't stop anybody who wants to > try steam-rollering them into mainline ;) There is indeed no rush. 4.19 it is then. Thanks! Mathieu -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-07-10 21:32 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-07-09 14:19 [PATCH v2 0/3] Support rseq on arm64 Will Deacon 2018-07-09 14:19 ` [PATCH v2 1/3] arm64: rseq: Implement backend rseq calls and select HAVE_RSEQ Will Deacon 2018-07-09 14:19 ` [PATCH v2 2/3] asm-generic: unistd.h: Wire up sys_rseq Will Deacon 2018-07-10 17:53 ` Will Deacon 2018-07-10 21:32 ` Arnd Bergmann 2018-07-09 14:19 ` [PATCH v2 3/3] rseq/selftests: Add support for arm64 Will Deacon 2018-07-09 16:06 ` [PATCH v2 0/3] Support rseq on arm64 Mathieu Desnoyers 2018-07-09 16:53 ` Will Deacon 2018-07-09 17:17 ` Mathieu Desnoyers 2018-07-10 14:49 ` Will Deacon 2018-07-10 14:51 ` Mathieu Desnoyers
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).