Skip to contentSkip to conversation

uprobe: uretprobe speed up

RFC PATCH In review Jiri Olsa 4 participants 33 messages Mar 18, 2024 – Mar 22, 2024

Subsystems (9)
x86 Kselftest BPF perf events +5 more subsystems
lore
Share & tools
lore

Jiri Olsa

author reviewer
#0 lore raw

cover uprobe: uretprobe speed up

hi,
as part of the effort on speeding up the uprobes [0] coming with return uprobe optimization by using syscall instead of the trap on the uretprobe trampoline.

The speed up depends on instruction type that uprobe is installed and depends on specific HW type, please check patch 1 for details.

I added extra bpf selftest to check on registers values before and after uretprobe to make sure the syscall saves all the needed regs.

reasons for this being RFC:

- I'm not sure we want specific uretprobe syscall and not generic uprobe syscall to extend in future.. when I added extra code to read registers from stack I did not see any notable performance degradation, so I think we could survive restoring another register for argument

- I'm not sure how we want to handle assembly code in bpf selftests

thanks,
jirka

[0] https://lore.kernel.org/bpf/ZeCXHKJ--iYYbmLj@krava/
---
Jiri Olsa (3):
uprobe: Add uretprobe syscall to speed up return probe selftests/bpf: Add uretprobe syscall test
selftests/bpf: Mark uprobe trigger functions with nocf_check attribute

 arch/x86/entry/syscalls/syscall_64.tbl                           |  1 +
 arch/x86/kernel/uprobes.c                                        | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/syscalls.h                                         |  2 ++
 include/linux/uprobes.h                                          |  2 ++
 include/uapi/asm-generic/unistd.h                                |  5 ++++-
 kernel/events/uprobes.c                                          | 18 ++++++++++++++----
 kernel/sys_ni.c                                                  |  2 ++
 tools/include/linux/compiler.h                                   |  4 ++++
 tools/testing/selftests/bpf/Makefile                             | 15 +++++++++++++--
 tools/testing/selftests/bpf/benchs/bench_trigger.c               |  6 +++---
 tools/testing/selftests/bpf/prog_tests/arch/x86/uprobe_syscall.S | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c          | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/testing/selftests/bpf/progs/uprobe_syscall.c               | 15 +++++++++++++++
 13 files changed, 281 insertions(+), 10 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/arch/x86/uprobe_syscall.S
 create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
 create mode 100644 tools/testing/selftests/bpf/progs/uprobe_syscall.c
author reviewer
#1 lore raw

RFC PATCH 1/3 uprobe: Add uretprobe syscall to speed up return probe

Adding uretprobe syscall instead of trap to speed up return probe.

At the moment the uretprobe setup/path is:

- install entry uprobe

- when the uprobe is hit overwrite probed function's return address on stack with address of the trampoline that contains breakpoint instruction

- the breakpoint trap code handles the uretprobe consumers execution and jumps back to original return address

This patch changes the above trampoline's breakpoint instruction to new ureprobe syscall call. This syscall does exactly the same job as the trap with some extra work:

- syscall trampoline must save original value for rax/r11/rcx registers on stack - rax is set to syscall number and r11/rcx are changed and used by syscall instruction

- the syscall code reads the original values of those registers and restore those values in task's pt_regs area

Even with the extra registers handling code the having uretprobes handled by syscalls shows speed improvement.

On Intel (11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz)

current:

    base           :   15.173 ± 0.052M/s
    uprobe-nop     :    2.797 ± 0.090M/s
    uprobe-push    :    2.580 ± 0.007M/s
    uprobe-ret     :    1.001 ± 0.003M/s
    uretprobe-nop  :    1.373 ± 0.002M/s
    uretprobe-push :    1.346 ± 0.002M/s
    uretprobe-ret  :    0.747 ± 0.001M/s

with the fix:

    base           :   15.704 ± 0.076M/s
    uprobe-nop     :    2.841 ± 0.008M/s
    uprobe-push    :    2.666 ± 0.029M/s
    uprobe-ret     :    1.037 ± 0.008M/s
    uretprobe-nop  :    1.718 ± 0.010M/s  < ~25% speed up
    uretprobe-push :    1.658 ± 0.008M/s  < ~23% speed up
    uretprobe-ret  :    0.853 ± 0.004M/s  < ~14% speed up

On Amd (AMD Ryzen 7 5700U)

current:

    base           :    5.702 ± 0.003M/s
    uprobe-nop     :    1.505 ± 0.011M/s
    uprobe-push    :    1.388 ± 0.008M/s
    uprobe-ret     :    0.825 ± 0.001M/s
    uretprobe-nop  :    0.782 ± 0.001M/s
    uretprobe-push :    0.750 ± 0.001M/s
    uretprobe-ret  :    0.544 ± 0.001M/s

with the fix:

    base           :    5.669 ± 0.004M/s
    uprobe-nop     :    1.539 ± 0.001M/s
    uprobe-push    :    1.385 ± 0.003M/s
    uprobe-ret     :    0.819 ± 0.001M/s
    uretprobe-nop  :    0.889 ± 0.001M/s < ~13% speed up
    uretprobe-push :    0.846 ± 0.001M/s < ~12% speed up
    uretprobe-ret  :    0.594 ± 0.000M/s <  ~9% speed up
---
 arch/x86/entry/syscalls/syscall_64.tbl |  1 +
 arch/x86/kernel/uprobes.c              | 48 ++++++++++++++++++++++++++
 include/linux/syscalls.h               |  2 ++
 include/linux/uprobes.h                |  2 ++
 include/uapi/asm-generic/unistd.h      |  5 ++-
 kernel/events/uprobes.c                | 18 +++++++---
 kernel/sys_ni.c                        |  2 ++
 7 files changed, 73 insertions(+), 5 deletions(-)
arch/x86/entry/syscalls/syscall_64.tbl +1 -0
index 7e8d46f4147f..af0a33ab06ee 100644
@@ -383,6 +383,7 @@
 459	common	lsm_get_self_attr	sys_lsm_get_self_attr
 460	common	lsm_set_self_attr	sys_lsm_set_self_attr
 461	common	lsm_list_modules	sys_lsm_list_modules
+462	64	uretprobe		sys_uretprobe
 
 #
 # Due to a historical design error, certain syscalls are numbered differently
arch/x86/kernel/uprobes.c +48 -0

60 lines not on this page · raw message

include/linux/syscalls.h +2 -0
index 77eb9b0e7685..db150794f89d 100644
@@ -972,6 +972,8 @@ asmlinkage long sys_lsm_list_modules(u64 *ids, size_t *size, u32 flags);
 /* x86 */
 asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
 
+asmlinkage long sys_uretprobe(void);
+
 /* pciconfig: alpha, arm, arm64, ia64, sparc */
 asmlinkage long sys_pciconfig_read(unsigned long bus, unsigned long dfn,
 				unsigned long off, unsigned long len,
include/linux/uprobes.h +2 -0
index f46e0ca0169c..a490146ad89d 100644
@@ -138,6 +138,8 @@ extern bool arch_uretprobe_is_alive(struct return_instance *ret, enum rp_check c
 extern bool arch_uprobe_ignore(struct arch_uprobe *aup, struct pt_regs *regs);
 extern void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,
 					 void *src, unsigned long len);
+extern void uprobe_handle_trampoline(struct pt_regs *regs);
+extern void *arch_uprobe_trampoline(unsigned long *psize);
 #else /* !CONFIG_UPROBES */
 struct uprobes_state {
 };
include/uapi/asm-generic/unistd.h +4 -1
index 75f00965ab15..8a747cd1d735 100644
@@ -842,8 +842,11 @@ __SYSCALL(__NR_lsm_set_self_attr, sys_lsm_set_self_attr)
 #define __NR_lsm_list_modules 461
 __SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules)
 
+#define __NR_uretprobe 462
+__SYSCALL(__NR_uretprobe, sys_uretprobe)
+
 #undef __NR_syscalls
-#define __NR_syscalls 462
+#define __NR_syscalls 463
 
 /*
  * 32 bit systems traditionally used different
kernel/events/uprobes.c +14 -4
index 929e98c62965..90395b16bde0 100644
@@ -1474,11 +1474,20 @@ static int xol_add_vma(struct mm_struct *mm, struct xol_area *area)
 	return ret;
 }
 
+void * __weak arch_uprobe_trampoline(unsigned long *psize)
+{
+	static uprobe_opcode_t insn = UPROBE_SWBP_INSN;
+
+	*psize = UPROBE_SWBP_INSN_SIZE;
+	return &insn;
+}
+
 static struct xol_area *__create_xol_area(unsigned long vaddr)
 {
 	struct mm_struct *mm = current->mm;
-	uprobe_opcode_t insn = UPROBE_SWBP_INSN;
+	unsigned long insns_size;
 	struct xol_area *area;
+	void *insns;
 
 	area = kmalloc(sizeof(*area), GFP_KERNEL);
 	if (unlikely(!area))
@@ -1502,7 +1511,8 @@ static struct xol_area *__create_xol_area(unsigned long vaddr)
 	/* Reserve the 1st slot for get_trampoline_vaddr() */
 	set_bit(0, area->bitmap);
 	atomic_set(&area->slot_count, 1);
-	arch_uprobe_copy_ixol(area->pages[0], 0, &insn, UPROBE_SWBP_INSN_SIZE);
+	insns = arch_uprobe_trampoline(&insns_size);
+	arch_uprobe_copy_ixol(area->pages[0], 0, insns, insns_size);
 
 	if (!xol_add_vma(mm, area))
 		return area;
@@ -2123,7 +2133,7 @@ static struct return_instance *find_next_ret_chain(struct return_instance *ri)
 	return ri;
 }
 
-static void handle_trampoline(struct pt_regs *regs)
+void uprobe_handle_trampoline(struct pt_regs *regs)
 {
 	struct uprobe_task *utask;
 	struct return_instance *ri, *next;
@@ -2188,7 +2198,7 @@ static void handle_swbp(struct pt_regs *regs)
 
 	bp_vaddr = uprobe_get_swbp_addr(regs);
 	if (bp_vaddr == get_trampoline_vaddr())
-		return handle_trampoline(regs);
+		return uprobe_handle_trampoline(regs);
 
 	uprobe = find_active_uprobe(bp_vaddr, &is_swbp);
 	if (!uprobe) {
kernel/sys_ni.c +2 -0
index faad00cce269..be6195e0d078 100644
@@ -391,3 +391,5 @@ COND_SYSCALL(setuid16);
 
 /* restartable sequence */
 COND_SYSCALL(rseq);
+
+COND_SYSCALL(uretprobe);
Signature · 1 line
2.44.0
maintainer Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH RFC bpf-next 1/3] uprobe: Add uretprobe syscall to speed up return probe

arch/x86/kernel/uprobes.c static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool · line 346

Quoted 12 lines · Jiri Olsa
arch/x86/kernel/uprobes.c +11 -0
+SYSCALL_DEFINE0(uretprobe)
+{
+	struct pt_regs *regs = task_pt_regs(current);
+	unsigned long sregs[3], err;
+
+	/*
+	 * We set rax and syscall itself changes rcx and r11, so the syscall
+	 * trampoline saves their original values on stack. We need to read
+	 * them and set original register values and fix the rsp pointer back.
+	 */
+	err = copy_from_user((void *) &sregs, (void *) regs->sp, sizeof(sregs));
                                              ^^^^^^^^^^^^^^^^^

IIUC, it should be (void __user *)regs->sp to shut up the sparse checks. The 1st "(void *)" typecast is not needed.

Correctness-wise looks good to me, FWIW

Acked-by on v1 1/3
#3 lore raw

Re: [PATCH RFC bpf-next 1/3] uprobe: Add uretprobe syscall to speed up return probe

In reply to Jiri Olsa
Quoted 73 lines · Jiri Olsa

Adding uretprobe syscall instead of trap to speed up return probe.

At the moment the uretprobe setup/path is:

- install entry uprobe

- when the uprobe is hit overwrite probed function's return address on stack with address of the trampoline that contains breakpoint instruction

- the breakpoint trap code handles the uretprobe consumers execution and jumps back to original return address

This patch changes the above trampoline's breakpoint instruction to new ureprobe syscall call. This syscall does exactly the same job as the trap with some extra work:

- syscall trampoline must save original value for rax/r11/rcx registers on stack - rax is set to syscall number and r11/rcx are changed and used by syscall instruction

- the syscall code reads the original values of those registers and restore those values in task's pt_regs area

Even with the extra registers handling code the having uretprobes handled by syscalls shows speed improvement.

On Intel (11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz)

current:

    base           :   15.173 ± 0.052M/s
    uprobe-nop     :    2.797 ± 0.090M/s
    uprobe-push    :    2.580 ± 0.007M/s
    uprobe-ret     :    1.001 ± 0.003M/s
    uretprobe-nop  :    1.373 ± 0.002M/s
    uretprobe-push :    1.346 ± 0.002M/s
    uretprobe-ret  :    0.747 ± 0.001M/s

with the fix:

    base           :   15.704 ± 0.076M/s
    uprobe-nop     :    2.841 ± 0.008M/s
    uprobe-push    :    2.666 ± 0.029M/s
    uprobe-ret     :    1.037 ± 0.008M/s
    uretprobe-nop  :    1.718 ± 0.010M/s  < ~25% speed up
    uretprobe-push :    1.658 ± 0.008M/s  < ~23% speed up
    uretprobe-ret  :    0.853 ± 0.004M/s  < ~14% speed up

On Amd (AMD Ryzen 7 5700U)

current:

    base           :    5.702 ± 0.003M/s
    uprobe-nop     :    1.505 ± 0.011M/s
    uprobe-push    :    1.388 ± 0.008M/s
    uprobe-ret     :    0.825 ± 0.001M/s
    uretprobe-nop  :    0.782 ± 0.001M/s
    uretprobe-push :    0.750 ± 0.001M/s
    uretprobe-ret  :    0.544 ± 0.001M/s

with the fix:

    base           :    5.669 ± 0.004M/s
    uprobe-nop     :    1.539 ± 0.001M/s
    uprobe-push    :    1.385 ± 0.003M/s
    uprobe-ret     :    0.819 ± 0.001M/s
    uretprobe-nop  :    0.889 ± 0.001M/s < ~13% speed up
    uretprobe-push :    0.846 ± 0.001M/s < ~12% speed up
    uretprobe-ret  :    0.594 ± 0.000M/s <  ~9% speed up
Quoted 10 lines
---
 arch/x86/entry/syscalls/syscall_64.tbl |  1 +
 arch/x86/kernel/uprobes.c              | 48 ++++++++++++++++++++++++++
 include/linux/syscalls.h               |  2 ++
 include/linux/uprobes.h                |  2 ++
 include/uapi/asm-generic/unistd.h      |  5 ++-
 kernel/events/uprobes.c                | 18 +++++++---
 kernel/sys_ni.c                        |  2 ++
 7 files changed, 73 insertions(+), 5 deletions(-)

LGTM, but see some questions and nits below:

Quoted 27 lines
arch/x86/entry/syscalls/syscall_64.tbl +1 -0
index 7e8d46f4147f..af0a33ab06ee 100644
@@ -383,6 +383,7 @@
 459    common  lsm_get_self_attr       sys_lsm_get_self_attr
 460    common  lsm_set_self_attr       sys_lsm_set_self_attr
 461    common  lsm_list_modules        sys_lsm_list_modules
+462    64      uretprobe               sys_uretprobe
 
 #
 # Due to a historical design error, certain syscalls are numbered differently
arch/x86/kernel/uprobes.c +1 -0
index 6c07f6daaa22..069371e86180 100644
@@ -12,6 +12,7 @@
 #include <linux/ptrace.h>
 #include <linux/uprobes.h>
 #include <linux/uaccess.h>
+#include <linux/syscalls.h>
 
 #include <linux/kdebug.h>
 #include <asm/processor.h>
@@ -308,6 +309,53 @@ static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool
 }
 

arch/x86/kernel/uprobes.c static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool · line 320

Quoted 10 lines
arch/x86/kernel/uprobes.c +9 -0
 #ifdef CONFIG_X86_64
+
+asm (
+       ".pushsection .rodata\n"
+       ".global uretprobe_syscall_entry\n"
+       "uretprobe_syscall_entry:\n"
+       "pushq %rax\n"
+       "pushq %rcx\n"
+       "pushq %r11\n"
+       "movq $462, %rax\n"

nit: is it possible to avoid hardcoding 462 here? Can we use __NR_uretprobe instead?

arch/x86/kernel/uprobes.c static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool · line 321

Quoted 1 line
arch/x86/kernel/uprobes.c +1 -0
+       "syscall\n"

oh, btw, do we need to save flags register as well or it's handled somehow? I think according to manual syscall instruction does something to rflags register. So do we need pushfq before syscall?

Quoted 24 lines
arch/x86/kernel/uprobes.c +24 -0
+       ".global uretprobe_syscall_end\n"
+       "uretprobe_syscall_end:\n"
+       ".popsection\n"
+);
+
+extern u8 uretprobe_syscall_entry[];
+extern u8 uretprobe_syscall_end[];
+
+void *arch_uprobe_trampoline(unsigned long *psize)
+{
+       *psize = uretprobe_syscall_end - uretprobe_syscall_entry;
+       return uretprobe_syscall_entry;
+}
+
+SYSCALL_DEFINE0(uretprobe)
+{
+       struct pt_regs *regs = task_pt_regs(current);
+       unsigned long sregs[3], err;
+
+       /*
+        * We set rax and syscall itself changes rcx and r11, so the syscall
+        * trampoline saves their original values on stack. We need to read
+        * them and set original register values and fix the rsp pointer back.
+        */

arch/x86/kernel/uprobes.c static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool · line 355

Quoted 10 lines
arch/x86/kernel/uprobes.c +10 -0
+       err = copy_from_user((void *) &sregs, (void *) regs->sp, sizeof(sregs));
+       WARN_ON_ONCE(err);
+
+       regs->r11 = sregs[0];
+       regs->cx = sregs[1];
+       regs->ax = sregs[2];
+       regs->orig_ax = -1;
+       regs->sp += sizeof(sregs);
+
+       uprobe_handle_trampoline(regs);

probably worth leaving a comment that uprobe_handle_trampoline() is rewriting userspace RIP and so syscall "returns" to the original caller.

arch/x86/kernel/uprobes.c static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool · line 356

Quoted 1 line
arch/x86/kernel/uprobes.c +1 -0
+       return regs->ax;

and this is making sure that caller function gets the correct function return value, right? It's all a bit magical, so worth leaving a comment here, IMO.

Quoted 115 lines
arch/x86/kernel/uprobes.c +2 -0
+}
+
 /*
  * If arch_uprobe->insn doesn't use rip-relative addressing, return
  * immediately.  Otherwise, rewrite the instruction so that it accesses
include/linux/syscalls.h +2 -0
index 77eb9b0e7685..db150794f89d 100644
@@ -972,6 +972,8 @@ asmlinkage long sys_lsm_list_modules(u64 *ids, size_t *size, u32 flags);
 /* x86 */
 asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
 
+asmlinkage long sys_uretprobe(void);
+
 /* pciconfig: alpha, arm, arm64, ia64, sparc */
 asmlinkage long sys_pciconfig_read(unsigned long bus, unsigned long dfn,
                                unsigned long off, unsigned long len,
include/linux/uprobes.h +2 -0
index f46e0ca0169c..a490146ad89d 100644
@@ -138,6 +138,8 @@ extern bool arch_uretprobe_is_alive(struct return_instance *ret, enum rp_check c
 extern bool arch_uprobe_ignore(struct arch_uprobe *aup, struct pt_regs *regs);
 extern void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,
                                         void *src, unsigned long len);
+extern void uprobe_handle_trampoline(struct pt_regs *regs);
+extern void *arch_uprobe_trampoline(unsigned long *psize);
 #else /* !CONFIG_UPROBES */
 struct uprobes_state {
 };
include/uapi/asm-generic/unistd.h +4 -1
index 75f00965ab15..8a747cd1d735 100644
@@ -842,8 +842,11 @@ __SYSCALL(__NR_lsm_set_self_attr, sys_lsm_set_self_attr)
 #define __NR_lsm_list_modules 461
 __SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules)
 
+#define __NR_uretprobe 462
+__SYSCALL(__NR_uretprobe, sys_uretprobe)
+
 #undef __NR_syscalls
-#define __NR_syscalls 462
+#define __NR_syscalls 463
 
 /*
  * 32 bit systems traditionally used different
kernel/events/uprobes.c +14 -4
index 929e98c62965..90395b16bde0 100644
@@ -1474,11 +1474,20 @@ static int xol_add_vma(struct mm_struct *mm, struct xol_area *area)
        return ret;
 }
 
+void * __weak arch_uprobe_trampoline(unsigned long *psize)
+{
+       static uprobe_opcode_t insn = UPROBE_SWBP_INSN;
+
+       *psize = UPROBE_SWBP_INSN_SIZE;
+       return &insn;
+}
+
 static struct xol_area *__create_xol_area(unsigned long vaddr)
 {
        struct mm_struct *mm = current->mm;
-       uprobe_opcode_t insn = UPROBE_SWBP_INSN;
+       unsigned long insns_size;
        struct xol_area *area;
+       void *insns;
 
        area = kmalloc(sizeof(*area), GFP_KERNEL);
        if (unlikely(!area))
@@ -1502,7 +1511,8 @@ static struct xol_area *__create_xol_area(unsigned long vaddr)
        /* Reserve the 1st slot for get_trampoline_vaddr() */
        set_bit(0, area->bitmap);
        atomic_set(&area->slot_count, 1);
-       arch_uprobe_copy_ixol(area->pages[0], 0, &insn, UPROBE_SWBP_INSN_SIZE);
+       insns = arch_uprobe_trampoline(&insns_size);
+       arch_uprobe_copy_ixol(area->pages[0], 0, insns, insns_size);
 
        if (!xol_add_vma(mm, area))
                return area;
@@ -2123,7 +2133,7 @@ static struct return_instance *find_next_ret_chain(struct return_instance *ri)
        return ri;
 }
 
-static void handle_trampoline(struct pt_regs *regs)
+void uprobe_handle_trampoline(struct pt_regs *regs)
 {
        struct uprobe_task *utask;
        struct return_instance *ri, *next;
@@ -2188,7 +2198,7 @@ static void handle_swbp(struct pt_regs *regs)
 
        bp_vaddr = uprobe_get_swbp_addr(regs);
        if (bp_vaddr == get_trampoline_vaddr())
-               return handle_trampoline(regs);
+               return uprobe_handle_trampoline(regs);
 
        uprobe = find_active_uprobe(bp_vaddr, &is_swbp);
        if (!uprobe) {
kernel/sys_ni.c +2 -1
index faad00cce269..be6195e0d078 100644
@@ -391,3 +391,5 @@ COND_SYSCALL(setuid16);
 
 /* restartable sequence */
 COND_SYSCALL(rseq);
+
+COND_SYSCALL(uretprobe);
--

2.44.0

maintainer
#4 lore raw

Re: [PATCH RFC bpf-next 1/3] uprobe: Add uretprobe syscall to speed up return probe

Quoted 6 lines · Andrii Nakryiko
Quoted 2 lines

+ "syscall\n"

oh, btw, do we need to save flags register as well or it's handled somehow? I think according to manual syscall instruction does something to rflags register. So do we need pushfq before syscall?

The comment above entry_SYSCALL_64() says

64-bit SYSCALL saves rip to rcx, clears rflags.RF, then saves rflags to r11

then entry_SYSCALL_64 does

	pushq   %r11                                    /* pt_regs->flags */

which should be restored on return to userspace. So I think that only X86_EFLAGS_RF can be lost, we probably do not care.

Oleg.

#5 lore raw

Re: [PATCH RFC bpf-next 1/3] uprobe: Add uretprobe syscall to speed up return probe

Quoted 11 lines · Oleg Nesterov
Quoted 6 lines · Andrii Nakryiko
Quoted 2 lines

+ "syscall\n"

oh, btw, do we need to save flags register as well or it's handled somehow? I think according to manual syscall instruction does something to rflags register. So do we need pushfq before syscall?

The comment above entry_SYSCALL_64() says

Quoted 9 lines

64-bit SYSCALL saves rip to rcx, clears rflags.RF, then saves rflags to r11

then entry_SYSCALL_64 does

        pushq   %r11                                    /* pt_regs->flags */

which should be restored on return to userspace. So I think that only X86_EFLAGS_RF can be lost, we probably do not care.

Cool, thanks for elaborating!

Quoted 2 lines

Oleg.

#6 lore raw

Re: [PATCH RFC bpf-next 1/3] uprobe: Add uretprobe syscall to speed up return probe

In reply to Andrii Nakryiko

On Mon, Mar 18, 2024 at 06:11:06PM -0700, Andrii Nakryiko wrote:

SNIP

Quoted 27 lines
Quoted 27 lines
arch/x86/entry/syscalls/syscall_64.tbl +1 -0
index 7e8d46f4147f..af0a33ab06ee 100644
@@ -383,6 +383,7 @@
 459    common  lsm_get_self_attr       sys_lsm_get_self_attr
 460    common  lsm_set_self_attr       sys_lsm_set_self_attr
 461    common  lsm_list_modules        sys_lsm_list_modules
+462    64      uretprobe               sys_uretprobe
 
 #
 # Due to a historical design error, certain syscalls are numbered differently
arch/x86/kernel/uprobes.c +1 -0
index 6c07f6daaa22..069371e86180 100644
@@ -12,6 +12,7 @@
 #include <linux/ptrace.h>
 #include <linux/uprobes.h>
 #include <linux/uaccess.h>
+#include <linux/syscalls.h>
 
 #include <linux/kdebug.h>
 #include <asm/processor.h>
@@ -308,6 +309,53 @@ static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool
 }
 
Quoted 13 lines

arch/x86/kernel/uprobes.c static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool · line 320

Quoted 10 lines
arch/x86/kernel/uprobes.c +9 -0
 #ifdef CONFIG_X86_64
+
+asm (
+       ".pushsection .rodata\n"
+       ".global uretprobe_syscall_entry\n"
+       "uretprobe_syscall_entry:\n"
+       "pushq %rax\n"
+       "pushq %rcx\n"
+       "pushq %r11\n"
+       "movq $462, %rax\n"

nit: is it possible to avoid hardcoding 462 here? Can we use __NR_uretprobe instead?

yep, will do that

Quoted 6 lines

arch/x86/kernel/uprobes.c static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool · line 321

Quoted 2 lines
arch/x86/kernel/uprobes.c +1 -0
+       "syscall\n"

oh, btw, do we need to save flags register as well or it's handled somehow? I think according to manual syscall instruction does something to rflags register. So do we need pushfq before syscall?

it's saved and restored by syscall instruction.. but apart from RF flag as Oleg mentioned, it looks like we don't need to care about that one

Quoted 40 lines
Quoted 25 lines
arch/x86/kernel/uprobes.c +24 -0
+       ".global uretprobe_syscall_end\n"
+       "uretprobe_syscall_end:\n"
+       ".popsection\n"
+);
+
+extern u8 uretprobe_syscall_entry[];
+extern u8 uretprobe_syscall_end[];
+
+void *arch_uprobe_trampoline(unsigned long *psize)
+{
+       *psize = uretprobe_syscall_end - uretprobe_syscall_entry;
+       return uretprobe_syscall_entry;
+}
+
+SYSCALL_DEFINE0(uretprobe)
+{
+       struct pt_regs *regs = task_pt_regs(current);
+       unsigned long sregs[3], err;
+
+       /*
+        * We set rax and syscall itself changes rcx and r11, so the syscall
+        * trampoline saves their original values on stack. We need to read
+        * them and set original register values and fix the rsp pointer back.
+        */

arch/x86/kernel/uprobes.c static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool · line 355

Quoted 10 lines
arch/x86/kernel/uprobes.c +10 -0
+       err = copy_from_user((void *) &sregs, (void *) regs->sp, sizeof(sregs));
+       WARN_ON_ONCE(err);
+
+       regs->r11 = sregs[0];
+       regs->cx = sregs[1];
+       regs->ax = sregs[2];
+       regs->orig_ax = -1;
+       regs->sp += sizeof(sregs);
+
+       uprobe_handle_trampoline(regs);

probably worth leaving a comment that uprobe_handle_trampoline() is rewriting userspace RIP and so syscall "returns" to the original caller.

Quoted 5 lines

arch/x86/kernel/uprobes.c static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool · line 356

Quoted 1 line
arch/x86/kernel/uprobes.c +1 -0
+       return regs->ax;

and this is making sure that caller function gets the correct function return value, right? It's all a bit magical, so worth leaving a comment here, IMO.

ok will add more comments about that

thanks,
jirka

author reviewer
#7 lore raw

RFC PATCH 2/3 selftests/bpf: Add uretprobe syscall test

In reply to Jiri Olsa

Add uretprobe syscall test and compare register values before and after the uretprobe is hit. Also compare the register values seen from attached bpf program.

---
 tools/testing/selftests/bpf/Makefile          | 13 ++-
 .../bpf/prog_tests/arch/x86/uprobe_syscall.S  | 89 +++++++++++++++++++
 .../selftests/bpf/prog_tests/uprobe_syscall.c | 84 +++++++++++++++++
 .../selftests/bpf/progs/uprobe_syscall.c      | 15 ++++
 4 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/arch/x86/uprobe_syscall.S
 create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
 create mode 100644 tools/testing/selftests/bpf/progs/uprobe_syscall.c
tools/testing/selftests/bpf/Makefile +12 -1
index 3b9eb40d6343..e425a946276b 100644
@@ -490,6 +490,9 @@ TRUNNER_TEST_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.test.o,	\
 				 $$(notdir $$(wildcard $(TRUNNER_TESTS_DIR)/*.c)))
 TRUNNER_EXTRA_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.o,		\
 				 $$(filter %.c,$(TRUNNER_EXTRA_SOURCES)))
+TRUNNER_ASM_OBJS := $$(patsubst %.S,$$(TRUNNER_OUTPUT)/%.arch.o,	\
+				 $$(notdir $$(wildcard $(TRUNNER_TESTS_DIR)/arch/$(SRCARCH)/*.S)))
+
 TRUNNER_EXTRA_HDRS := $$(filter %.h,$(TRUNNER_EXTRA_SOURCES))
 TRUNNER_TESTS_HDR := $(TRUNNER_TESTS_DIR)/tests.h
 TRUNNER_BPF_SRCS := $$(notdir $$(wildcard $(TRUNNER_BPF_PROGS_DIR)/*.c))
@@ -597,6 +600,13 @@ $(TRUNNER_EXTRA_OBJS): $(TRUNNER_OUTPUT)/%.o:				\
 	$$(call msg,EXT-OBJ,$(TRUNNER_BINARY),$$@)
 	$(Q)$$(CC) $$(CFLAGS) -c $$< $$(LDLIBS) -o $$@
 
+$(TRUNNER_ASM_OBJS): $(TRUNNER_OUTPUT)/%.arch.o:			\
+		       $(TRUNNER_TESTS_DIR)/arch/$(SRCARCH)/%.S		\
+		       $(TRUNNER_TESTS_HDR)				\
+		       $$(BPFOBJ) | $(TRUNNER_OUTPUT)
+	$$(call msg,ASM-OBJ,$(TRUNNER_BINARY),$$@)
+	$(Q)$$(CC) $$(CFLAGS) -c $$< $$(LDLIBS) -o $$@
+
 # non-flavored in-srctree builds receive special treatment, in particular, we
 # do not need to copy extra resources (see e.g. test_btf_dump_case())
 $(TRUNNER_BINARY)-extras: $(TRUNNER_EXTRA_FILES) | $(TRUNNER_OUTPUT)
@@ -606,7 +616,8 @@ ifneq ($2:$(OUTPUT),:$(shell pwd))
 endif
 
 $(OUTPUT)/$(TRUNNER_BINARY): $(TRUNNER_TEST_OBJS)			\
-			     $(TRUNNER_EXTRA_OBJS) $$(BPFOBJ)		\
+			     $(TRUNNER_EXTRA_OBJS) $(TRUNNER_ASM_OBJS)	\
+			     $$(BPFOBJ)					\
 			     $(RESOLVE_BTFIDS)				\
 			     $(TRUNNER_BPFTOOL)				\
 			     | $(TRUNNER_BINARY)-extras
tools/testing/selftests/bpf/prog_tests/arch/x86/uprobe_syscall.S new file +89 -0

89 lines not on this page · raw message

tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c new file +84 -0

84 lines not on this page · raw message

tools/testing/selftests/bpf/progs/uprobe_syscall.c new file +15 -0
new file mode 100644
index 000000000000..0cc7e8761410
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include <string.h>
+
+struct pt_regs regs;
+
+char _license[] SEC("license") = "GPL";
+
+SEC("uretprobe//proc/self/exe:uprobe_syscall_arch_test")
+int uretprobe(struct pt_regs *ctx)
+{
+	memcpy(&regs, ctx, sizeof(regs));
+	return 0;
+}
Signature · 1 line
2.44.0
#8 lore raw

Re: [PATCH RFC bpf-next 2/3] selftests/bpf: Add uretprobe syscall test

Quoted 6 lines · Jiri Olsa

Add uretprobe syscall test and compare register values before and after the uretprobe is hit. Also compare the register values seen from attached bpf program.

Quoted 10 lines
---
 tools/testing/selftests/bpf/Makefile          | 13 ++-
 .../bpf/prog_tests/arch/x86/uprobe_syscall.S  | 89 +++++++++++++++++++
 .../selftests/bpf/prog_tests/uprobe_syscall.c | 84 +++++++++++++++++
 .../selftests/bpf/progs/uprobe_syscall.c      | 15 ++++
 4 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/arch/x86/uprobe_syscall.S
 create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
 create mode 100644 tools/testing/selftests/bpf/progs/uprobe_syscall.c

Can all the above be achieved with inline assembly inside .c files? It would probably simplify logistics overall. We can guard with arch-specific #ifdefs, of course.

[...]

Quoted 9 lines
tools/testing/selftests/bpf/progs/uprobe_syscall.c new file +3 -0
new file mode 100644
index 000000000000..0cc7e8761410
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>

tools/testing/selftests/bpf/progs/uprobe_syscall.c line 13

Quoted 10 lines
tools/testing/selftests/bpf/progs/uprobe_syscall.c new file +10 -0
+#include <string.h>
+
+struct pt_regs regs;
+
+char _license[] SEC("license") = "GPL";
+
+SEC("uretprobe//proc/self/exe:uprobe_syscall_arch_test")
+int uretprobe(struct pt_regs *ctx)
+{
+       memcpy(&regs, ctx, sizeof(regs));

nit: please use __builtin_memcpy(), given this is BPF code. And we don't need string.h include.

Quoted 5 lines
tools/testing/selftests/bpf/progs/uprobe_syscall.c new file +2 -1
+       return 0;
+}
--

2.44.0

#9 lore raw

Re: [PATCH RFC bpf-next 2/3] selftests/bpf: Add uretprobe syscall test

Quoted 18 lines · Andrii Nakryiko
Quoted 6 lines · Jiri Olsa

Add uretprobe syscall test and compare register values before and after the uretprobe is hit. Also compare the register values seen from attached bpf program.

Quoted 10 lines
---
 tools/testing/selftests/bpf/Makefile          | 13 ++-
 .../bpf/prog_tests/arch/x86/uprobe_syscall.S  | 89 +++++++++++++++++++
 .../selftests/bpf/prog_tests/uprobe_syscall.c | 84 +++++++++++++++++
 .../selftests/bpf/progs/uprobe_syscall.c      | 15 ++++
 4 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/arch/x86/uprobe_syscall.S
 create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
 create mode 100644 tools/testing/selftests/bpf/progs/uprobe_syscall.c
Quoted 3 lines

Can all the above be achieved with inline assembly inside .c files? It would probably simplify logistics overall. We can guard with arch-specific #ifdefs, of course.

ok, probably yes.. I'll check

Quoted 17 lines

[...]

Quoted 14 lines
tools/testing/selftests/bpf/progs/uprobe_syscall.c new file +8 -0
new file mode 100644
index 000000000000..0cc7e8761410
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include <string.h>
+
+struct pt_regs regs;
+
+char _license[] SEC("license") = "GPL";
Quoted 8 lines

tools/testing/selftests/bpf/progs/uprobe_syscall.c line 13

Quoted 5 lines
tools/testing/selftests/bpf/progs/uprobe_syscall.c new file +5 -0
+
+SEC("uretprobe//proc/self/exe:uprobe_syscall_arch_test")
+int uretprobe(struct pt_regs *ctx)
+{
+       memcpy(&regs, ctx, sizeof(regs));

nit: please use __builtin_memcpy(), given this is BPF code. And we don't need string.h include.

right, thanks

jirka

Quoted 6 lines
Quoted 6 lines
tools/testing/selftests/bpf/progs/uprobe_syscall.c new file +2 -1
+       return 0;
+}
--

2.44.0

author reviewer
#10 lore raw

RFC PATCH 3/3 selftests/bpf: Mark uprobe trigger functions with nocf_check attribute

In reply to Jiri Olsa

Some distros seem to enable the -fcf-protection=branch by default, which breaks our setup on first instruction of uprobe trigger functions and place there endbr64 instruction.

Marking them with nocf_check attribute to skip that.

Adding -Wno-attributes for bench objects, becase nocf_check can be used only when -fcf-protection=branch is enabled, otherwise we get a warning and break compilation.

---
 tools/include/linux/compiler.h                     | 4 ++++
 tools/testing/selftests/bpf/Makefile               | 2 +-
 tools/testing/selftests/bpf/benchs/bench_trigger.c | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)
tools/include/linux/compiler.h +4 -0
index 7b65566f3e42..14038ce04ca4 100644
@@ -58,6 +58,10 @@
 #define noinline
 #endif
 
+#ifndef __nocfcheck
+#define __nocfcheck __attribute__((nocf_check))
+#endif
+
 /* Are two types/vars the same type (ignoring qualifiers)? */
 #ifndef __same_type
 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
tools/testing/selftests/bpf/Makefile +1 -1
index e425a946276b..506d3d592093 100644
@@ -726,7 +726,7 @@ $(OUTPUT)/test_cpp: test_cpp.cpp $(OUTPUT)/test_core_extern.skel.h $(BPFOBJ)
 # Benchmark runner
 $(OUTPUT)/bench_%.o: benchs/bench_%.c bench.h $(BPFOBJ)
 	$(call msg,CC,,$@)
-	$(Q)$(CC) $(CFLAGS) -O2 -c $(filter %.c,$^) $(LDLIBS) -o $@
+	$(Q)$(CC) $(CFLAGS) -O2 -Wno-attributes -c $(filter %.c,$^) $(LDLIBS) -o $@
 $(OUTPUT)/bench_rename.o: $(OUTPUT)/test_overhead.skel.h
 $(OUTPUT)/bench_trigger.o: $(OUTPUT)/trigger_bench.skel.h
 $(OUTPUT)/bench_ringbufs.o: $(OUTPUT)/ringbuf_bench.skel.h \
tools/testing/selftests/bpf/benchs/bench_trigger.c +3 -3
index ace0d1011a8e..3aecc3ef74e9 100644
@@ -137,7 +137,7 @@ static void trigger_fmodret_setup(void)
  * GCC doesn't generate stack setup preample for these functions due to them
  * having no input arguments and doing nothing in the body.
  */
-__weak void uprobe_target_nop(void)
+__nocfcheck __weak void uprobe_target_nop(void)
 {
 	asm volatile ("nop");
 }
@@ -146,7 +146,7 @@ __weak void opaque_noop_func(void)
 {
 }
 
-__weak int uprobe_target_push(void)
+__nocfcheck __weak int uprobe_target_push(void)
 {
 	/* overhead of function call is negligible compared to uprobe
 	 * triggering, so this shouldn't affect benchmark results much
@@ -155,7 +155,7 @@ __weak int uprobe_target_push(void)
 	return 1;
 }
 
-__weak void uprobe_target_ret(void)
+__nocfcheck __weak void uprobe_target_ret(void)
 {
 	asm volatile ("");
 }
Signature · 1 line
2.44.0
#11 lore raw

Re: [PATCH RFC bpf-next 3/3] selftests/bpf: Mark uprobe trigger functions with nocf_check attribute

Quoted 23 lines · Jiri Olsa

Some distros seem to enable the -fcf-protection=branch by default, which breaks our setup on first instruction of uprobe trigger functions and place there endbr64 instruction.

Marking them with nocf_check attribute to skip that.

Adding -Wno-attributes for bench objects, becase nocf_check can be used only when -fcf-protection=branch is enabled, otherwise we get a warning and break compilation.

---
 tools/include/linux/compiler.h                     | 4 ++++
 tools/testing/selftests/bpf/Makefile               | 2 +-
 tools/testing/selftests/bpf/benchs/bench_trigger.c | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)
tools/include/linux/compiler.h +0 -0
index 7b65566f3e42..14038ce04ca4 100644

tools/include/linux/compiler.h line 63

Quoted 6 lines
tools/include/linux/compiler.h +3 -0
@@ -58,6 +58,10 @@
 #define noinline
 #endif
 
+#ifndef __nocfcheck
+#define __nocfcheck __attribute__((nocf_check))
+#endif

Let's preserve spelling of the attribut, __nocf_check ?

BTW, just FYI, seems like kernel is defining it as:

#define __noendbr __attribute__((nocf_check))

Thought somewhere deep in x86-specific code, so probably not a good idea to use it here?

Quoted 9 lines
tools/include/linux/compiler.h +1 -0
+
 /* Are two types/vars the same type (ignoring qualifiers)? */
 #ifndef __same_type
 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
tools/testing/selftests/bpf/Makefile +0 -0
index e425a946276b..506d3d592093 100644

tools/testing/selftests/bpf/Makefile $(OUTPUT)/test_cpp: test_cpp.cpp $(OUTPUT)/test_core_extern.skel.h $(BPFOBJ) · line 729

Quoted 5 lines
tools/testing/selftests/bpf/Makefile +1 -1
@@ -726,7 +726,7 @@ $(OUTPUT)/test_cpp: test_cpp.cpp $(OUTPUT)/test_core_extern.skel.h $(BPFOBJ)
 # Benchmark runner
 $(OUTPUT)/bench_%.o: benchs/bench_%.c bench.h $(BPFOBJ)
        $(call msg,CC,,$@)
-       $(Q)$(CC) $(CFLAGS) -O2 -c $(filter %.c,$^) $(LDLIBS) -o $@
+       $(Q)$(CC) $(CFLAGS) -O2 -Wno-attributes -c $(filter %.c,$^) $(LDLIBS) -o $@

let's better use #pragma warning disable in relevant .c files, instead of this global flag?

Quoted 3 lines
tools/testing/selftests/bpf/Makefile +0 -0
 $(OUTPUT)/bench_rename.o: $(OUTPUT)/test_overhead.skel.h
 $(OUTPUT)/bench_trigger.o: $(OUTPUT)/trigger_bench.skel.h
 $(OUTPUT)/bench_ringbufs.o: $(OUTPUT)/ringbuf_bench.skel.h \

[...]

#12 lore raw

Re: [PATCH RFC bpf-next 3/3] selftests/bpf: Mark uprobe trigger functions with nocf_check attribute

Quoted 33 lines · Andrii Nakryiko
Quoted 23 lines · Jiri Olsa

Some distros seem to enable the -fcf-protection=branch by default, which breaks our setup on first instruction of uprobe trigger functions and place there endbr64 instruction.

Marking them with nocf_check attribute to skip that.

Adding -Wno-attributes for bench objects, becase nocf_check can be used only when -fcf-protection=branch is enabled, otherwise we get a warning and break compilation.

---
 tools/include/linux/compiler.h                     | 4 ++++
 tools/testing/selftests/bpf/Makefile               | 2 +-
 tools/testing/selftests/bpf/benchs/bench_trigger.c | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)
tools/include/linux/compiler.h +0 -0
index 7b65566f3e42..14038ce04ca4 100644

tools/include/linux/compiler.h line 63

Quoted 6 lines
tools/include/linux/compiler.h +3 -0
@@ -58,6 +58,10 @@
 #define noinline
 #endif
 
+#ifndef __nocfcheck
+#define __nocfcheck __attribute__((nocf_check))
+#endif

Let's preserve spelling of the attribut, __nocf_check ?

Quoted 6 lines

BTW, just FYI, seems like kernel is defining it as:

#define __noendbr __attribute__((nocf_check))

Thought somewhere deep in x86-specific code, so probably not a good idea to use it here?

ugh, I missed it.. better to use __noendbr

Quoted 10 lines
Quoted 10 lines
tools/include/linux/compiler.h +1 -0
+
 /* Are two types/vars the same type (ignoring qualifiers)? */
 #ifndef __same_type
 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
tools/testing/selftests/bpf/Makefile +0 -0
index e425a946276b..506d3d592093 100644
@@ -726,7 +726,7 @@ $(OUTPUT)/test_cpp: test_cpp.cpp $(OUTPUT)/test_core_extern.skel.h $(BPFOBJ)
Quoted 8 lines

tools/testing/selftests/bpf/Makefile $(OUTPUT)/test_cpp: test_cpp.cpp $(OUTPUT)/test_core_extern.skel.h $(BPFOBJ) · line 729

Quoted 5 lines
tools/testing/selftests/bpf/Makefile +1 -1
 # Benchmark runner
 $(OUTPUT)/bench_%.o: benchs/bench_%.c bench.h $(BPFOBJ)
        $(call msg,CC,,$@)
-       $(Q)$(CC) $(CFLAGS) -O2 -c $(filter %.c,$^) $(LDLIBS) -o $@
+       $(Q)$(CC) $(CFLAGS) -O2 -Wno-attributes -c $(filter %.c,$^) $(LDLIBS) -o $@

let's better use #pragma warning disable in relevant .c files, instead of this global flag?

ok, will try that

thanks,
jirka

#13 lore raw

Re: [PATCH RFC bpf-next 3/3] selftests/bpf: Mark uprobe trigger functions with nocf_check attribute

Quoted 34 lines · Jiri Olsa
Quoted 33 lines · Andrii Nakryiko
Quoted 23 lines · Jiri Olsa

Some distros seem to enable the -fcf-protection=branch by default, which breaks our setup on first instruction of uprobe trigger functions and place there endbr64 instruction.

Marking them with nocf_check attribute to skip that.

Adding -Wno-attributes for bench objects, becase nocf_check can be used only when -fcf-protection=branch is enabled, otherwise we get a warning and break compilation.

---
 tools/include/linux/compiler.h                     | 4 ++++
 tools/testing/selftests/bpf/Makefile               | 2 +-
 tools/testing/selftests/bpf/benchs/bench_trigger.c | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)
tools/include/linux/compiler.h +0 -0
index 7b65566f3e42..14038ce04ca4 100644

tools/include/linux/compiler.h line 63

Quoted 6 lines
tools/include/linux/compiler.h +3 -0
@@ -58,6 +58,10 @@
 #define noinline
 #endif
 
+#ifndef __nocfcheck
+#define __nocfcheck __attribute__((nocf_check))
+#endif

Let's preserve spelling of the attribut, __nocf_check ?

Quoted 8 lines
Quoted 6 lines

BTW, just FYI, seems like kernel is defining it as:

#define __noendbr __attribute__((nocf_check))

Thought somewhere deep in x86-specific code, so probably not a good idea to use it here?

ugh, I missed it.. better to use __noendbr

nah, I'll keep using __nocf_check, __noendbr is bery arch specific as you said

jirka

Quoted 24 lines
Quoted 11 lines
Quoted 11 lines
tools/include/linux/compiler.h +1 -0
+
 /* Are two types/vars the same type (ignoring qualifiers)? */
 #ifndef __same_type
 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
tools/testing/selftests/bpf/Makefile +0 -0
index e425a946276b..506d3d592093 100644
@@ -726,7 +726,7 @@ $(OUTPUT)/test_cpp: test_cpp.cpp $(OUTPUT)/test_core_extern.skel.h $(BPFOBJ)
Quoted 8 lines

tools/testing/selftests/bpf/Makefile $(OUTPUT)/test_cpp: test_cpp.cpp $(OUTPUT)/test_core_extern.skel.h $(BPFOBJ) · line 729

Quoted 5 lines
tools/testing/selftests/bpf/Makefile +1 -1
 # Benchmark runner
 $(OUTPUT)/bench_%.o: benchs/bench_%.c bench.h $(BPFOBJ)
        $(call msg,CC,,$@)
-       $(Q)$(CC) $(CFLAGS) -O2 -c $(filter %.c,$^) $(LDLIBS) -o $@
+       $(Q)$(CC) $(CFLAGS) -O2 -Wno-attributes -c $(filter %.c,$^) $(LDLIBS) -o $@

let's better use #pragma warning disable in relevant .c files, instead of this global flag?

ok, will try that

thanks,
jirka

maintainer
#14 lore raw

[PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

In reply to Jiri Olsa

Obviously not for inclusion yet ;) untested, lacks the comments, and I am not sure it makes sense.

But I am wondering if this change can speedup uretprobes a bit more. Any chance you can test it?

With 1/3 sys_uretprobe() changes regs->r11/cx, this is correct but implies iret. See the /* SYSRET requires RCX == RIP and R11 == EFLAGS */ code in do_syscall_64().

With this patch uretprobe_syscall_entry restores rcx/r11 itself and does retq, sys_uretprobe() needs to hijack regs->ip after uprobe_handle_trampoline() to make it possible.

Comments?

Oleg.
---

arch/x86/kernel/uprobes.c +13 -13
index 069371e86180..b99f1d80a8c8 100644
@@ -319,6 +319,9 @@ asm (
 	"pushq %r11\n"
 	"movq $462, %rax\n"
 	"syscall\n"
+	"popq %r11\n"
+	"popq %rcx\n"
+	"retq\n"
 	".global uretprobe_syscall_end\n"
 	"uretprobe_syscall_end:\n"
 	".popsection\n"
@@ -336,23 +339,20 @@ void *arch_uprobe_trampoline(unsigned long *psize)
 SYSCALL_DEFINE0(uretprobe)
 {
 	struct pt_regs *regs = task_pt_regs(current);
-	unsigned long sregs[3], err;
+	unsigned long __user *ax_and_ret = (unsigned long __user *)regs->sp + 2;
+	unsigned long ip, err;
 
-	/*
-	 * We set rax and syscall itself changes rcx and r11, so the syscall
-	 * trampoline saves their original values on stack. We need to read
-	 * them and set original register values and fix the rsp pointer back.
-	 */
-	err = copy_from_user((void *) &sregs, (void *) regs->sp, sizeof(sregs));
-	WARN_ON_ONCE(err);
-
-	regs->r11 = sregs[0];
-	regs->cx = sregs[1];
-	regs->ax = sregs[2];
+	ip = regs->ip;
 	regs->orig_ax = -1;
-	regs->sp += sizeof(sregs);
+	err = get_user(regs->ax, ax_and_ret);
+	WARN_ON_ONCE(err);
 
 	uprobe_handle_trampoline(regs);
+
+	err = put_user(regs->ip, ax_and_ret);
+	WARN_ON_ONCE(err);
+	regs->ip = ip;
+
 	return regs->ax;
 }
 
#15 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 8 lines · Oleg Nesterov

Obviously not for inclusion yet ;) untested, lacks the comments, and I am not sure it makes sense.

But I am wondering if this change can speedup uretprobes a bit more. Any chance you can test it?

With 1/3 sys_uretprobe() changes regs->r11/cx, this is correct but implies iret. See the /* SYSRET requires RCX == RIP and R11 == EFLAGS */ code in do_syscall_64().

nice idea, looks like sysexit should be faster

Quoted 15 lines

With this patch uretprobe_syscall_entry restores rcx/r11 itself and does retq, sys_uretprobe() needs to hijack regs->ip after uprobe_handle_trampoline() to make it possible.

Comments?

Oleg.
---

arch/x86/kernel/uprobes.c +0 -0
index 069371e86180..b99f1d80a8c8 100644

arch/x86/kernel/uprobes.c asm ( · line 324

Quoted 6 lines
arch/x86/kernel/uprobes.c +3 -0
@@ -319,6 +319,9 @@ asm (
 	"pushq %r11\n"
 	"movq $462, %rax\n"
 	"syscall\n"
+	"popq %r11\n"
+	"popq %rcx\n"
+	"retq\n"

using rax space on stack for return pointer, cool :)

I'll run the test with this change

thanks,
jirka

Quoted 38 lines
arch/x86/kernel/uprobes.c +10 -13
 	".global uretprobe_syscall_end\n"
 	"uretprobe_syscall_end:\n"
 	".popsection\n"
@@ -336,23 +339,20 @@ void *arch_uprobe_trampoline(unsigned long *psize)
 SYSCALL_DEFINE0(uretprobe)
 {
 	struct pt_regs *regs = task_pt_regs(current);
-	unsigned long sregs[3], err;
+	unsigned long __user *ax_and_ret = (unsigned long __user *)regs->sp + 2;
+	unsigned long ip, err;
 
-	/*
-	 * We set rax and syscall itself changes rcx and r11, so the syscall
-	 * trampoline saves their original values on stack. We need to read
-	 * them and set original register values and fix the rsp pointer back.
-	 */
-	err = copy_from_user((void *) &sregs, (void *) regs->sp, sizeof(sregs));
-	WARN_ON_ONCE(err);
-
-	regs->r11 = sregs[0];
-	regs->cx = sregs[1];
-	regs->ax = sregs[2];
+	ip = regs->ip;
 	regs->orig_ax = -1;
-	regs->sp += sizeof(sregs);
+	err = get_user(regs->ax, ax_and_ret);
+	WARN_ON_ONCE(err);
 
 	uprobe_handle_trampoline(regs);
+
+	err = put_user(regs->ip, ax_and_ret);
+	WARN_ON_ONCE(err);
+	regs->ip = ip;
+
 	return regs->ax;
 }
 
#16 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 37 lines · Jiri Olsa
Quoted 8 lines · Oleg Nesterov

Obviously not for inclusion yet ;) untested, lacks the comments, and I am not sure it makes sense.

But I am wondering if this change can speedup uretprobes a bit more. Any chance you can test it?

With 1/3 sys_uretprobe() changes regs->r11/cx, this is correct but implies iret. See the /* SYSRET requires RCX == RIP and R11 == EFLAGS */ code in do_syscall_64().

nice idea, looks like sysexit should be faster

Quoted 15 lines

With this patch uretprobe_syscall_entry restores rcx/r11 itself and does retq, sys_uretprobe() needs to hijack regs->ip after uprobe_handle_trampoline() to make it possible.

Comments?

Oleg.
---

arch/x86/kernel/uprobes.c +0 -0
index 069371e86180..b99f1d80a8c8 100644

arch/x86/kernel/uprobes.c asm ( · line 324

Quoted 6 lines
arch/x86/kernel/uprobes.c +3 -0
@@ -319,6 +319,9 @@ asm (
      "pushq %r11\n"
      "movq $462, %rax\n"
      "syscall\n"
+     "popq %r11\n"
+     "popq %rcx\n"
+     "retq\n"

using rax space on stack for return pointer, cool :)

Quoted 2 lines

I'll run the test with this change

I can do some benchmarking on my side as well, given I have everything set up for this anyways. Thanks for the help with speeding all this up!

BTW, Jiri, what are you plans regarding sys_uprobe (entry probe optimization through syscall), while we are on the topic?

Quoted 41 lines

thanks,
jirka

Quoted 38 lines
arch/x86/kernel/uprobes.c +10 -13
      ".global uretprobe_syscall_end\n"
      "uretprobe_syscall_end:\n"
      ".popsection\n"
@@ -336,23 +339,20 @@ void *arch_uprobe_trampoline(unsigned long *psize)
 SYSCALL_DEFINE0(uretprobe)
 {
      struct pt_regs *regs = task_pt_regs(current);
-     unsigned long sregs[3], err;
+     unsigned long __user *ax_and_ret = (unsigned long __user *)regs->sp + 2;
+     unsigned long ip, err;
 
-     /*
-      * We set rax and syscall itself changes rcx and r11, so the syscall
-      * trampoline saves their original values on stack. We need to read
-      * them and set original register values and fix the rsp pointer back.
-      */
-     err = copy_from_user((void *) &sregs, (void *) regs->sp, sizeof(sregs));
-     WARN_ON_ONCE(err);
-
-     regs->r11 = sregs[0];
-     regs->cx = sregs[1];
-     regs->ax = sregs[2];
+     ip = regs->ip;
      regs->orig_ax = -1;
-     regs->sp += sizeof(sregs);
+     err = get_user(regs->ax, ax_and_ret);
+     WARN_ON_ONCE(err);
 
      uprobe_handle_trampoline(regs);
+
+     err = put_user(regs->ip, ax_and_ret);
+     WARN_ON_ONCE(err);
+     regs->ip = ip;
+
      return regs->ax;
 }
 
maintainer
#17 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 10 lines · Andrii Nakryiko
Quoted 4 lines · Jiri Olsa

I'll run the test with this change

I can do some benchmarking on my side as well, given I have everything set up for this anyways. Thanks for the help with speeding all this up!

Great, thank you both!

but just in case let me repeat, this is just a poc, the patch is obviously incomplete and needs more discussion even _if_ it actually makes the syscall faster, and I am not sure it does.

Oleg.

#18 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

In reply to Andrii Nakryiko
Quoted 38 lines · Andrii Nakryiko
Quoted 37 lines · Jiri Olsa
Quoted 8 lines · Oleg Nesterov

Obviously not for inclusion yet ;) untested, lacks the comments, and I am not sure it makes sense.

But I am wondering if this change can speedup uretprobes a bit more. Any chance you can test it?

With 1/3 sys_uretprobe() changes regs->r11/cx, this is correct but implies iret. See the /* SYSRET requires RCX == RIP and R11 == EFLAGS */ code in do_syscall_64().

nice idea, looks like sysexit should be faster

Quoted 15 lines

With this patch uretprobe_syscall_entry restores rcx/r11 itself and does retq, sys_uretprobe() needs to hijack regs->ip after uprobe_handle_trampoline() to make it possible.

Comments?

Oleg.
---

arch/x86/kernel/uprobes.c +0 -0
index 069371e86180..b99f1d80a8c8 100644

arch/x86/kernel/uprobes.c asm ( · line 324

Quoted 6 lines
arch/x86/kernel/uprobes.c +3 -0
@@ -319,6 +319,9 @@ asm (
      "pushq %r11\n"
      "movq $462, %rax\n"
      "syscall\n"
+     "popq %r11\n"
+     "popq %rcx\n"
+     "retq\n"

using rax space on stack for return pointer, cool :)

Quoted 4 lines
Quoted 2 lines

I'll run the test with this change

I can do some benchmarking on my side as well, given I have everything

that'd be great, thanks

Quoted 5 lines

set up for this anyways. Thanks for the help with speeding all this up!

BTW, Jiri, what are you plans regarding sys_uprobe (entry probe optimization through syscall), while we are on the topic?

I plan to work on that after this one is sorted out

jirka

#19 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

In reply to Jiri Olsa
Quoted 36 lines · Jiri Olsa
Quoted 8 lines · Oleg Nesterov

Obviously not for inclusion yet ;) untested, lacks the comments, and I am not sure it makes sense.

But I am wondering if this change can speedup uretprobes a bit more. Any chance you can test it?

With 1/3 sys_uretprobe() changes regs->r11/cx, this is correct but implies iret. See the /* SYSRET requires RCX == RIP and R11 == EFLAGS */ code in do_syscall_64().

nice idea, looks like sysexit should be faster

Quoted 15 lines

With this patch uretprobe_syscall_entry restores rcx/r11 itself and does retq, sys_uretprobe() needs to hijack regs->ip after uprobe_handle_trampoline() to make it possible.

Comments?

Oleg.
---

arch/x86/kernel/uprobes.c +0 -0
index 069371e86180..b99f1d80a8c8 100644

arch/x86/kernel/uprobes.c asm ( · line 324

Quoted 6 lines
arch/x86/kernel/uprobes.c +3 -0
@@ -319,6 +319,9 @@ asm (
 	"pushq %r11\n"
 	"movq $462, %rax\n"
 	"syscall\n"
+	"popq %r11\n"
+	"popq %rcx\n"
+	"retq\n"

using rax space on stack for return pointer, cool :)

Quoted 1 line

I'll run the test with this change

I got bigger speed up on intel, amd stays the same (I'll double check that)

current:

  base           :   16.133 ± 0.035M/s
  uprobe-nop     :    3.003 ± 0.002M/s
  uprobe-push    :    2.829 ± 0.001M/s
  uprobe-ret     :    1.101 ± 0.001M/s
  uretprobe-nop  :    1.485 ± 0.001M/s

uretprobe-push : 1.447 ± 0.000M/s
uretprobe-ret : 0.812 ± 0.000M/s

fix:

  base           :   16.522 ± 0.103M/s
  uprobe-nop     :    2.920 ± 0.034M/s
  uprobe-push    :    2.749 ± 0.047M/s
  uprobe-ret     :    1.094 ± 0.003M/s
  uretprobe-nop  :    2.004 ± 0.006M/s  < ~34% speed up
  uretprobe-push :    1.940 ± 0.003M/s  < ~34% speed up
  uretprobe-ret  :    0.921 ± 0.050M/s  < ~13% speed up

original fix:

  base           :   15.704 ± 0.076M/s
  uprobe-nop     :    2.841 ± 0.008M/s
  uprobe-push    :    2.666 ± 0.029M/s
  uprobe-ret     :    1.037 ± 0.008M/s
  uretprobe-nop  :    1.718 ± 0.010M/s  < ~25% speed up
  uretprobe-push :    1.658 ± 0.008M/s  < ~23% speed up
  uretprobe-ret  :    0.853 ± 0.004M/s  < ~14% speed up

jirka

#20 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 60 lines · Jiri Olsa
Quoted 36 lines · Jiri Olsa
Quoted 8 lines · Oleg Nesterov

Obviously not for inclusion yet ;) untested, lacks the comments, and I am not sure it makes sense.

But I am wondering if this change can speedup uretprobes a bit more. Any chance you can test it?

With 1/3 sys_uretprobe() changes regs->r11/cx, this is correct but implies iret. See the /* SYSRET requires RCX == RIP and R11 == EFLAGS */ code in do_syscall_64().

nice idea, looks like sysexit should be faster

Quoted 15 lines

With this patch uretprobe_syscall_entry restores rcx/r11 itself and does retq, sys_uretprobe() needs to hijack regs->ip after uprobe_handle_trampoline() to make it possible.

Comments?

Oleg.
---

arch/x86/kernel/uprobes.c +0 -0
index 069371e86180..b99f1d80a8c8 100644

arch/x86/kernel/uprobes.c asm ( · line 324

Quoted 6 lines
arch/x86/kernel/uprobes.c +3 -0
@@ -319,6 +319,9 @@ asm (
    "pushq %r11\n"
    "movq $462, %rax\n"
    "syscall\n"
+   "popq %r11\n"
+   "popq %rcx\n"
+   "retq\n"

using rax space on stack for return pointer, cool :)

Quoted 1 line

I'll run the test with this change

I got bigger speed up on intel, amd stays the same (I'll double check that)

current:

  base           :   16.133 ± 0.035M/s
  uprobe-nop     :    3.003 ± 0.002M/s
  uprobe-push    :    2.829 ± 0.001M/s
  uprobe-ret     :    1.101 ± 0.001M/s
  uretprobe-nop  :    1.485 ± 0.001M/s

uretprobe-push : 1.447 ± 0.000M/s
uretprobe-ret : 0.812 ± 0.000M/s

fix:

  base           :   16.522 ± 0.103M/s
  uprobe-nop     :    2.920 ± 0.034M/s
  uprobe-push    :    2.749 ± 0.047M/s
  uprobe-ret     :    1.094 ± 0.003M/s
  uretprobe-nop  :    2.004 ± 0.006M/s  < ~34% speed up
  uretprobe-push :    1.940 ± 0.003M/s  < ~34% speed up
  uretprobe-ret  :    0.921 ± 0.050M/s  < ~13% speed up
Quoted 9 lines

original fix:

  base           :   15.704 ± 0.076M/s
  uprobe-nop     :    2.841 ± 0.008M/s
  uprobe-push    :    2.666 ± 0.029M/s
  uprobe-ret     :    1.037 ± 0.008M/s
  uretprobe-nop  :    1.718 ± 0.010M/s  < ~25% speed up
  uretprobe-push :    1.658 ± 0.008M/s  < ~23% speed up
  uretprobe-ret  :    0.853 ± 0.004M/s  < ~14% speed up

My machine is slower, even though I turned out mitigations and stuff like that, I feel like there are still some slow downs. But either way, data is at least consistent as far as baseline goes (it's called syscall-count now in my local changes I'm yet to submit), and yes, Oleg's change does produce a noticeable speed up:

baseline
========

usermode-count :   79.509 ± 0.038M/s
syscall-count  :    9.550 ± 0.002M/s
uprobe-nop     :    1.530 ± 0.000M/s
uprobe-push    :    1.457 ± 0.000M/s
uprobe-ret     :    0.642 ± 0.000M/s
uretprobe-nop  :    0.777 ± 0.000M/s
uretprobe-push :    0.761 ± 0.000M/s
uretprobe-ret  :    0.459 ± 0.000M/s

Jiri
====

usermode-count :   79.515 ± 0.014M/s
syscall-count  :    9.439 ± 0.006M/s
uprobe-nop     :    1.520 ± 0.001M/s
uprobe-push    :    1.464 ± 0.000M/s
uprobe-ret     :    0.640 ± 0.000M/s
uretprobe-nop  :    0.893 ± 0.000M/s (+15%)
uretprobe-push :    0.867 ± 0.000M/s (+14%)
uretprobe-ret  :    0.498 ± 0.000M/s (+8.5%)

Oleg+Jiri
=========

usermode-count :   79.471 ± 0.078M/s
syscall-count  :    9.434 ± 0.007M/s
uprobe-nop     :    1.516 ± 0.003M/s
uprobe-push    :    1.463 ± 0.000M/s
uprobe-ret     :    0.640 ± 0.001M/s
uretprobe-nop  :    1.020 ± 0.001M/s (+31%)
uretprobe-push :    0.998 ± 0.001M/s (+31%)
uretprobe-ret  :    0.537 ± 0.000M/s (+17%)

So it's 2x of just Jiri's changes, which is a very nice boost! I only tested on Intel CPU.

Quoted 2 lines

jirka

#21 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

In reply to Jiri Olsa
Quoted 37 lines · Jiri Olsa
Quoted 36 lines · Jiri Olsa
Quoted 8 lines · Oleg Nesterov

Obviously not for inclusion yet ;) untested, lacks the comments, and I am not sure it makes sense.

But I am wondering if this change can speedup uretprobes a bit more. Any chance you can test it?

With 1/3 sys_uretprobe() changes regs->r11/cx, this is correct but implies iret. See the /* SYSRET requires RCX == RIP and R11 == EFLAGS */ code in do_syscall_64().

nice idea, looks like sysexit should be faster

Quoted 15 lines

With this patch uretprobe_syscall_entry restores rcx/r11 itself and does retq, sys_uretprobe() needs to hijack regs->ip after uprobe_handle_trampoline() to make it possible.

Comments?

Oleg.
---

arch/x86/kernel/uprobes.c +0 -0
index 069371e86180..b99f1d80a8c8 100644

arch/x86/kernel/uprobes.c asm ( · line 324

Quoted 6 lines
arch/x86/kernel/uprobes.c +3 -0
@@ -319,6 +319,9 @@ asm (
 	"pushq %r11\n"
 	"movq $462, %rax\n"
 	"syscall\n"
+	"popq %r11\n"
+	"popq %rcx\n"
+	"retq\n"

using rax space on stack for return pointer, cool :)

Quoted 3 lines
Quoted 1 line

I'll run the test with this change

I got bigger speed up on intel, amd stays the same (I'll double check that)

yes, I'm getting no speed up on AMD, but Intel's great

Oleg,
are you ok if I squash the patches together or you want to send it separately?

jirka

Quoted 30 lines

current:

  base           :   16.133 ± 0.035M/s
  uprobe-nop     :    3.003 ± 0.002M/s
  uprobe-push    :    2.829 ± 0.001M/s
  uprobe-ret     :    1.101 ± 0.001M/s
  uretprobe-nop  :    1.485 ± 0.001M/s

uretprobe-push : 1.447 ± 0.000M/s
uretprobe-ret : 0.812 ± 0.000M/s

fix:

  base           :   16.522 ± 0.103M/s
  uprobe-nop     :    2.920 ± 0.034M/s
  uprobe-push    :    2.749 ± 0.047M/s
  uprobe-ret     :    1.094 ± 0.003M/s
  uretprobe-nop  :    2.004 ± 0.006M/s  < ~34% speed up
  uretprobe-push :    1.940 ± 0.003M/s  < ~34% speed up
  uretprobe-ret  :    0.921 ± 0.050M/s  < ~13% speed up

original fix:

  base           :   15.704 ± 0.076M/s
  uprobe-nop     :    2.841 ± 0.008M/s
  uprobe-push    :    2.666 ± 0.029M/s
  uprobe-ret     :    1.037 ± 0.008M/s
  uretprobe-nop  :    1.718 ± 0.010M/s  < ~25% speed up
  uretprobe-push :    1.658 ± 0.008M/s  < ~23% speed up
  uretprobe-ret  :    0.853 ± 0.004M/s  < ~14% speed up

jirka

maintainer
#22 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 2 lines · Jiri Olsa

are you ok if I squash the patches together

Yes, thanks, I am fine.

But lets discuss this change a bit more. So, with this poc we have the (intentionally) oversimplified

	SYSCALL_DEFINE0(uretprobe)
	{
		struct pt_regs *regs = task_pt_regs(current);
		unsigned long __user *ax_and_ret = (unsigned long __user *)regs->sp + 2;
		unsigned long ip, err;

		ip = regs->ip;
		regs->orig_ax = -1;
		err = get_user(regs->ax, ax_and_ret);
		WARN_ON_ONCE(err);

		uprobe_handle_trampoline(regs);

		err = put_user(regs->ip, ax_and_ret);
		WARN_ON_ONCE(err);
		regs->ip = ip;

		return regs->ax;
	}

I have no idea what uprobe consumers / bpf programs can do, so let me ask:

- uprobe_consumer's will see the "wrong" values of regs->cx/r11/sp Is it OK? If not - easy to fix.

- can uprobe_consumer change regs->cx/r11 ? If yes - easy to fix.

- can uprobe_consumer change regs->sp ? If yes - easy to fix too, but needs a separate check/code.

Oleg.

maintainer
#23 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 32 lines · Oleg Nesterov
Quoted 2 lines · Jiri Olsa

are you ok if I squash the patches together

Yes, thanks, I am fine.

But lets discuss this change a bit more. So, with this poc we have the (intentionally) oversimplified

	SYSCALL_DEFINE0(uretprobe)
	{
		struct pt_regs *regs = task_pt_regs(current);
		unsigned long __user *ax_and_ret = (unsigned long __user *)regs->sp + 2;
		unsigned long ip, err;

		ip = regs->ip;
		regs->orig_ax = -1;
		err = get_user(regs->ax, ax_and_ret);
		WARN_ON_ONCE(err);

		uprobe_handle_trampoline(regs);

		err = put_user(regs->ip, ax_and_ret);
		WARN_ON_ONCE(err);
		regs->ip = ip;

		return regs->ax;
	}

I have no idea what uprobe consumers / bpf programs can do, so let me ask:

Quoted 7 lines

- uprobe_consumer's will see the "wrong" values of regs->cx/r11/sp Is it OK? If not - easy to fix.

- can uprobe_consumer change regs->cx/r11 ? If yes - easy to fix.

- can uprobe_consumer change regs->sp ? If yes - easy to fix too, but needs a separate check/code.

IOW. If answer is "yes" to all the questions above, then we probably need something like

	SYSCALL_DEFINE0(uretprobe)
	{
		struct pt_regs *regs = task_pt_regs(current);
		unsigned long err, ip, sp, r11_cx_ax[3];

		err = copy_from_user(r11_cx_ax, (void __user*)regs->sp, sizeof(r11_cx_ax));
		WARN_ON_ONCE(err);

		// Q1: apart from ax, do we really care?
		// expose the "right" values of r11/cx/ax/sp to uprobe_consumer's
		regs->r11 = r11_cx_ax[0];
		regs->cx  = r11_cx_ax[1];
		regs->ax  = r11_cx_ax[2];
		regs->sp += sizeof(r11_cx_ax);
		regs->orig_ax = -1;

		ip = regs->ip;
		sp = regs->sp;

		uprobe_handle_trampoline(regs);

		// Q2: is it possible? do we care?
		// uprobe_consumer has changed sp, we can do nothing,
		// just return via iret.
		if (regs->sp != sp)
			return regs->ax;
		regs->sp -= sizeof(r11_cx_ax);

		// Q3: is it possible? do we care?
		// for the case uprobe_consumer has changed r11/cx
		r11_cx_ax[0] = regs->r11;
		r11_cx_ax[1] = regs->cx;

		// comment to explain this hack
		r11_cx_ax[2] = regs->ip;
		regs->ip = ip;

		err = copy_to_user((void __user*)regs->sp, r11_cx_ax, sizeof(r11_cx_ax));
		WARN_ON_ONCE(err);

		// ensure sysret, see do_syscall_64()
		regs->r11 = regs->flags;
		regs->cx  = regs->ip;

		return regs->ax;
	}

Oleg.

#24 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 37 lines · Oleg Nesterov
Quoted 35 lines · Oleg Nesterov
Quoted 2 lines · Jiri Olsa

are you ok if I squash the patches together

Yes, thanks, I am fine.

But lets discuss this change a bit more. So, with this poc we have the (intentionally) oversimplified

      SYSCALL_DEFINE0(uretprobe)
      {
              struct pt_regs *regs = task_pt_regs(current);
              unsigned long __user *ax_and_ret = (unsigned long __user *)regs->sp + 2;
              unsigned long ip, err;

              ip = regs->ip;
              regs->orig_ax = -1;
              err = get_user(regs->ax, ax_and_ret);
              WARN_ON_ONCE(err);

              uprobe_handle_trampoline(regs);

              err = put_user(regs->ip, ax_and_ret);
              WARN_ON_ONCE(err);
              regs->ip = ip;

              return regs->ax;
      }

I have no idea what uprobe consumers / bpf programs can do, so let me ask:

- uprobe_consumer's will see the "wrong" values of regs->cx/r11/sp Is it OK? If not - easy to fix.

Quoted 7 lines
Quoted 4 lines

- can uprobe_consumer change regs->cx/r11 ? If yes - easy to fix.

- can uprobe_consumer change regs->sp ? If yes - easy to fix too, but needs a separate check/code.

IOW. If answer is "yes" to all the questions above, then we probably need something like

yes to first, so ideally we fix registers to "correct" values (especially sp), but no to the last two (at least as far as BPF is concerned)

Quoted 50 lines
        SYSCALL_DEFINE0(uretprobe)
        {
                struct pt_regs *regs = task_pt_regs(current);
                unsigned long err, ip, sp, r11_cx_ax[3];

                err = copy_from_user(r11_cx_ax, (void __user*)regs->sp, sizeof(r11_cx_ax));
                WARN_ON_ONCE(err);

                // Q1: apart from ax, do we really care?
                // expose the "right" values of r11/cx/ax/sp to uprobe_consumer's
                regs->r11 = r11_cx_ax[0];
                regs->cx  = r11_cx_ax[1];
                regs->ax  = r11_cx_ax[2];
                regs->sp += sizeof(r11_cx_ax);
                regs->orig_ax = -1;

                ip = regs->ip;
                sp = regs->sp;

                uprobe_handle_trampoline(regs);

                // Q2: is it possible? do we care?
                // uprobe_consumer has changed sp, we can do nothing,
                // just return via iret.
                if (regs->sp != sp)
                        return regs->ax;
                regs->sp -= sizeof(r11_cx_ax);

                // Q3: is it possible? do we care?
                // for the case uprobe_consumer has changed r11/cx
                r11_cx_ax[0] = regs->r11;
                r11_cx_ax[1] = regs->cx;

                // comment to explain this hack
                r11_cx_ax[2] = regs->ip;
                regs->ip = ip;

                err = copy_to_user((void __user*)regs->sp, r11_cx_ax, sizeof(r11_cx_ax));
                WARN_ON_ONCE(err);

                // ensure sysret, see do_syscall_64()
                regs->r11 = regs->flags;
                regs->cx  = regs->ip;

                return regs->ax;
        }

Oleg.

#25 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 43 lines · Andrii Nakryiko
Quoted 42 lines · Oleg Nesterov
Quoted 39 lines · Oleg Nesterov
Quoted 2 lines · Jiri Olsa

are you ok if I squash the patches together

Yes, thanks, I am fine.

But lets discuss this change a bit more. So, with this poc we have the (intentionally) oversimplified

      SYSCALL_DEFINE0(uretprobe)
      {
              struct pt_regs *regs = task_pt_regs(current);
              unsigned long __user *ax_and_ret = (unsigned long __user *)regs->sp + 2;
              unsigned long ip, err;

              ip = regs->ip;
              regs->orig_ax = -1;
              err = get_user(regs->ax, ax_and_ret);
              WARN_ON_ONCE(err);

              uprobe_handle_trampoline(regs);

              err = put_user(regs->ip, ax_and_ret);
              WARN_ON_ONCE(err);
              regs->ip = ip;

              return regs->ax;
      }

I have no idea what uprobe consumers / bpf programs can do, so let me ask:

- uprobe_consumer's will see the "wrong" values of regs->cx/r11/sp Is it OK? If not - easy to fix.

- can uprobe_consumer change regs->cx/r11 ? If yes - easy to fix.

- can uprobe_consumer change regs->sp ? If yes - easy to fix too, but needs a separate check/code.

Quoted 6 lines
Quoted 2 lines

IOW. If answer is "yes" to all the questions above, then we probably need something like

yes to first, so ideally we fix registers to "correct" values (especially sp), but no to the last two (at least as far as BPF is concerned)

I think we should keep the same behaviour as it was for the trap, so I think we should restore all registers and allow consumer to change it

jirka

Quoted 51 lines
Quoted 51 lines

        SYSCALL_DEFINE0(uretprobe)
        {
                struct pt_regs *regs = task_pt_regs(current);
                unsigned long err, ip, sp, r11_cx_ax[3];

                err = copy_from_user(r11_cx_ax, (void __user*)regs->sp, sizeof(r11_cx_ax));
                WARN_ON_ONCE(err);

                // Q1: apart from ax, do we really care?
                // expose the "right" values of r11/cx/ax/sp to uprobe_consumer's
                regs->r11 = r11_cx_ax[0];
                regs->cx  = r11_cx_ax[1];
                regs->ax  = r11_cx_ax[2];
                regs->sp += sizeof(r11_cx_ax);
                regs->orig_ax = -1;

                ip = regs->ip;
                sp = regs->sp;

                uprobe_handle_trampoline(regs);

                // Q2: is it possible? do we care?
                // uprobe_consumer has changed sp, we can do nothing,
                // just return via iret.
                if (regs->sp != sp)
                        return regs->ax;
                regs->sp -= sizeof(r11_cx_ax);

                // Q3: is it possible? do we care?
                // for the case uprobe_consumer has changed r11/cx
                r11_cx_ax[0] = regs->r11;
                r11_cx_ax[1] = regs->cx;

                // comment to explain this hack
                r11_cx_ax[2] = regs->ip;
                regs->ip = ip;

                err = copy_to_user((void __user*)regs->sp, r11_cx_ax, sizeof(r11_cx_ax));
                WARN_ON_ONCE(err);

                // ensure sysret, see do_syscall_64()
                regs->r11 = regs->flags;
                regs->cx  = regs->ip;

                return regs->ax;
        }

Oleg.

maintainer
#26 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 17 lines · Jiri Olsa
Quoted 15 lines · Andrii Nakryiko
Quoted 13 lines · Oleg Nesterov
Quoted 10 lines

I have no idea what uprobe consumers / bpf programs can do, so let me ask:

- uprobe_consumer's will see the "wrong" values of regs->cx/r11/sp Is it OK? If not - easy to fix.

- can uprobe_consumer change regs->cx/r11 ? If yes - easy to fix.

- can uprobe_consumer change regs->sp ? If yes - easy to fix too, but needs a separate check/code.

IOW. If answer is "yes" to all the questions above, then we probably need something like

Quoted 6 lines
Quoted 3 lines

yes to first, so ideally we fix registers to "correct" values (especially sp), but no to the last two (at least as far as BPF is concerned)

I think we should keep the same behaviour as it was for the trap, so I think we should restore all registers and allow consumer to change it

OK, agreed. Then something like the code below.

Oleg.

Quoted 50 lines
Quoted 49 lines
Quoted 49 lines
        SYSCALL_DEFINE0(uretprobe)
        {
                struct pt_regs *regs = task_pt_regs(current);
                unsigned long err, ip, sp, r11_cx_ax[3];

                err = copy_from_user(r11_cx_ax, (void __user*)regs->sp, sizeof(r11_cx_ax));
                WARN_ON_ONCE(err);

                // Q1: apart from ax, do we really care?
                // expose the "right" values of r11/cx/ax/sp to uprobe_consumer's
                regs->r11 = r11_cx_ax[0];
                regs->cx  = r11_cx_ax[1];
                regs->ax  = r11_cx_ax[2];
                regs->sp += sizeof(r11_cx_ax);
                regs->orig_ax = -1;

                ip = regs->ip;
                sp = regs->sp;

                uprobe_handle_trampoline(regs);

                // Q2: is it possible? do we care?
                // uprobe_consumer has changed sp, we can do nothing,
                // just return via iret.
                if (regs->sp != sp)
                        return regs->ax;
                regs->sp -= sizeof(r11_cx_ax);

                // Q3: is it possible? do we care?
                // for the case uprobe_consumer has changed r11/cx
                r11_cx_ax[0] = regs->r11;
                r11_cx_ax[1] = regs->cx;

                // comment to explain this hack
                r11_cx_ax[2] = regs->ip;
                regs->ip = ip;

                err = copy_to_user((void __user*)regs->sp, r11_cx_ax, sizeof(r11_cx_ax));
                WARN_ON_ONCE(err);

                // ensure sysret, see do_syscall_64()
                regs->r11 = regs->flags;
                regs->cx  = regs->ip;

                return regs->ax;
        }

Oleg.

#27 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

In reply to Oleg Nesterov

On Wed, Mar 20, 2024 at 04:28:48PM +0100, Oleg Nesterov wrote:

SNIP

Quoted 24 lines
	SYSCALL_DEFINE0(uretprobe)
	{
		struct pt_regs *regs = task_pt_regs(current);
		unsigned long err, ip, sp, r11_cx_ax[3];

		err = copy_from_user(r11_cx_ax, (void __user*)regs->sp, sizeof(r11_cx_ax));
		WARN_ON_ONCE(err);

		// Q1: apart from ax, do we really care?
		// expose the "right" values of r11/cx/ax/sp to uprobe_consumer's
		regs->r11 = r11_cx_ax[0];
		regs->cx  = r11_cx_ax[1];
		regs->ax  = r11_cx_ax[2];
		regs->sp += sizeof(r11_cx_ax);
		regs->orig_ax = -1;

		ip = regs->ip;
		sp = regs->sp;

		uprobe_handle_trampoline(regs);

		// Q2: is it possible? do we care?
		// uprobe_consumer has changed sp, we can do nothing,
		// just return via iret.
Quoted 8 lines
		if (regs->sp != sp)
			return regs->ax;
		regs->sp -= sizeof(r11_cx_ax);

		// Q3: is it possible? do we care?
		// for the case uprobe_consumer has changed r11/cx
		r11_cx_ax[0] = regs->r11;
		r11_cx_ax[1] = regs->cx;

I wonder we could add test for this as well, and check we return proper register values in case the consuer changed them, will check

Quoted 4 lines
		// comment to explain this hack
		r11_cx_ax[2] = regs->ip;
		regs->ip = ip;

we still need restore regs->ip in case do_syscall_64 decides to do iret for some reason, right?

overall lgtm, thanks

jirka

Quoted 13 lines
		err = copy_to_user((void __user*)regs->sp, r11_cx_ax, sizeof(r11_cx_ax));
		WARN_ON_ONCE(err);

		// ensure sysret, see do_syscall_64()
		regs->r11 = regs->flags;
		regs->cx  = regs->ip;

		return regs->ax;
	}

Oleg.

maintainer
#28 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 42 lines · Jiri Olsa

On Wed, Mar 20, 2024 at 04:28:48PM +0100, Oleg Nesterov wrote:

SNIP

Quoted 24 lines
	SYSCALL_DEFINE0(uretprobe)
	{
		struct pt_regs *regs = task_pt_regs(current);
		unsigned long err, ip, sp, r11_cx_ax[3];

		err = copy_from_user(r11_cx_ax, (void __user*)regs->sp, sizeof(r11_cx_ax));
		WARN_ON_ONCE(err);

		// Q1: apart from ax, do we really care?
		// expose the "right" values of r11/cx/ax/sp to uprobe_consumer's
		regs->r11 = r11_cx_ax[0];
		regs->cx  = r11_cx_ax[1];
		regs->ax  = r11_cx_ax[2];
		regs->sp += sizeof(r11_cx_ax);
		regs->orig_ax = -1;

		ip = regs->ip;
		sp = regs->sp;

		uprobe_handle_trampoline(regs);

		// Q2: is it possible? do we care?
		// uprobe_consumer has changed sp, we can do nothing,
		// just return via iret.
Quoted 8 lines
		if (regs->sp != sp)
			return regs->ax;
		regs->sp -= sizeof(r11_cx_ax);

		// Q3: is it possible? do we care?
		// for the case uprobe_consumer has changed r11/cx
		r11_cx_ax[0] = regs->r11;
		r11_cx_ax[1] = regs->cx;

I wonder we could add test for this as well, and check we return proper register values in case the consuer changed them, will check

Quoted 1 line
Quoted 6 lines
Quoted 3 lines
		// comment to explain this hack
		r11_cx_ax[2] = regs->ip;
		regs->ip = ip;

we still need restore regs->ip in case do_syscall_64 decides to do iret for some reason, right?

I don't understand... could you spell?

AFAICS everything should work correctly even if do_syscall_64() returns F and entry_SYSCALL_64() returns via iret. No?

Quoted 1 line

overall lgtm, thanks

OK, great, feel free to update this code according to your preferences and use it in V2.

Oleg.

#29 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 43 lines · Oleg Nesterov
Quoted 42 lines · Jiri Olsa

On Wed, Mar 20, 2024 at 04:28:48PM +0100, Oleg Nesterov wrote:

SNIP

Quoted 24 lines
	SYSCALL_DEFINE0(uretprobe)
	{
		struct pt_regs *regs = task_pt_regs(current);
		unsigned long err, ip, sp, r11_cx_ax[3];

		err = copy_from_user(r11_cx_ax, (void __user*)regs->sp, sizeof(r11_cx_ax));
		WARN_ON_ONCE(err);

		// Q1: apart from ax, do we really care?
		// expose the "right" values of r11/cx/ax/sp to uprobe_consumer's
		regs->r11 = r11_cx_ax[0];
		regs->cx  = r11_cx_ax[1];
		regs->ax  = r11_cx_ax[2];
		regs->sp += sizeof(r11_cx_ax);
		regs->orig_ax = -1;

		ip = regs->ip;
		sp = regs->sp;

		uprobe_handle_trampoline(regs);

		// Q2: is it possible? do we care?
		// uprobe_consumer has changed sp, we can do nothing,
		// just return via iret.
Quoted 8 lines
		if (regs->sp != sp)
			return regs->ax;
		regs->sp -= sizeof(r11_cx_ax);

		// Q3: is it possible? do we care?
		// for the case uprobe_consumer has changed r11/cx
		r11_cx_ax[0] = regs->r11;
		r11_cx_ax[1] = regs->cx;

I wonder we could add test for this as well, and check we return proper register values in case the consuer changed them, will check

Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
		// comment to explain this hack
		r11_cx_ax[2] = regs->ip;
		regs->ip = ip;

we still need restore regs->ip in case do_syscall_64 decides to do iret for some reason, right?

I don't understand... could you spell?

I was wondering why to restore regs->ip for sysret path, but do_syscall_64 can decide to do iret return (for which we need proper regs->ip) even if we prepare cx/r11 registers for sysexit

Quoted 8 lines

AFAICS everything should work correctly even if do_syscall_64() returns F and entry_SYSCALL_64() returns via iret. No?

Quoted 1 line

overall lgtm, thanks

OK, great, feel free to update this code according to your preferences and use it in V2.

will do, thanks

jirka

maintainer
#30 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 49 lines · Jiri Olsa
Quoted 47 lines · Oleg Nesterov
Quoted 46 lines · Jiri Olsa

On Wed, Mar 20, 2024 at 04:28:48PM +0100, Oleg Nesterov wrote:

SNIP

Quoted 24 lines
	SYSCALL_DEFINE0(uretprobe)
	{
		struct pt_regs *regs = task_pt_regs(current);
		unsigned long err, ip, sp, r11_cx_ax[3];

		err = copy_from_user(r11_cx_ax, (void __user*)regs->sp, sizeof(r11_cx_ax));
		WARN_ON_ONCE(err);

		// Q1: apart from ax, do we really care?
		// expose the "right" values of r11/cx/ax/sp to uprobe_consumer's
		regs->r11 = r11_cx_ax[0];
		regs->cx  = r11_cx_ax[1];
		regs->ax  = r11_cx_ax[2];
		regs->sp += sizeof(r11_cx_ax);
		regs->orig_ax = -1;

		ip = regs->ip;
		sp = regs->sp;

		uprobe_handle_trampoline(regs);

		// Q2: is it possible? do we care?
		// uprobe_consumer has changed sp, we can do nothing,
		// just return via iret.
Quoted 8 lines
		if (regs->sp != sp)
			return regs->ax;
		regs->sp -= sizeof(r11_cx_ax);

		// Q3: is it possible? do we care?
		// for the case uprobe_consumer has changed r11/cx
		r11_cx_ax[0] = regs->r11;
		r11_cx_ax[1] = regs->cx;

I wonder we could add test for this as well, and check we return proper register values in case the consuer changed them, will check

Quoted 4 lines
		// comment to explain this hack
		r11_cx_ax[2] = regs->ip;
		regs->ip = ip;
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

we still need restore regs->ip in case do_syscall_64 decides to do iret for some reason, right?

I don't understand... could you spell?

I was wondering why to restore regs->ip for sysret path, but do_syscall_64 can decide to do iret return (for which we need proper regs->ip) even if we prepare cx/r11 registers for sysexit

Still don't understand... Yes, we prepare cx/r11 to avoid iret if possible. But (apart from performance) we do not care if do_syscall_64() picks iret. Either way

			regs->ip = ip;

above ensures that usermode returns to uretprobe_syscall_entry right after the syscall insn. Then popq %r11/cx will restore r11/cx even if they were changed by uprobe_consumer's. And then "retq" will return to the address "returned" by handle_trampoline(regs) because we do

			// comment to explain this hack
			r11_cx_ax[2] = regs->ip;

after handle_trampoline(). This all doesn't depend on iret-or-sysret.

OK, I am sure you understand this, so I guess I misunderstood your concerns.

Oleg.

#31 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 59 lines · Oleg Nesterov
Quoted 49 lines · Jiri Olsa
Quoted 47 lines · Oleg Nesterov
Quoted 46 lines · Jiri Olsa

On Wed, Mar 20, 2024 at 04:28:48PM +0100, Oleg Nesterov wrote:

SNIP

Quoted 24 lines
	SYSCALL_DEFINE0(uretprobe)
	{
		struct pt_regs *regs = task_pt_regs(current);
		unsigned long err, ip, sp, r11_cx_ax[3];

		err = copy_from_user(r11_cx_ax, (void __user*)regs->sp, sizeof(r11_cx_ax));
		WARN_ON_ONCE(err);

		// Q1: apart from ax, do we really care?
		// expose the "right" values of r11/cx/ax/sp to uprobe_consumer's
		regs->r11 = r11_cx_ax[0];
		regs->cx  = r11_cx_ax[1];
		regs->ax  = r11_cx_ax[2];
		regs->sp += sizeof(r11_cx_ax);
		regs->orig_ax = -1;

		ip = regs->ip;
		sp = regs->sp;

		uprobe_handle_trampoline(regs);

		// Q2: is it possible? do we care?
		// uprobe_consumer has changed sp, we can do nothing,
		// just return via iret.
Quoted 8 lines
		if (regs->sp != sp)
			return regs->ax;
		regs->sp -= sizeof(r11_cx_ax);

		// Q3: is it possible? do we care?
		// for the case uprobe_consumer has changed r11/cx
		r11_cx_ax[0] = regs->r11;
		r11_cx_ax[1] = regs->cx;

I wonder we could add test for this as well, and check we return proper register values in case the consuer changed them, will check

Quoted 4 lines
		// comment to explain this hack
		r11_cx_ax[2] = regs->ip;
		regs->ip = ip;
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

we still need restore regs->ip in case do_syscall_64 decides to do iret for some reason, right?

I don't understand... could you spell?

I was wondering why to restore regs->ip for sysret path, but do_syscall_64 can decide to do iret return (for which we need proper regs->ip) even if we prepare cx/r11 registers for sysexit

Quoted 8 lines

Still don't understand... Yes, we prepare cx/r11 to avoid iret if possible. But (apart from performance) we do not care if do_syscall_64() picks iret. Either way

			regs->ip = ip;

above ensures that usermode returns to uretprobe_syscall_entry right after the syscall insn.

hm, I think above ensures that do_syscall_64 will skip the 'regs->cx != regs->ip' check.. and after the sysret returns to rcx register value and ignores regs->ip

but in any case we need to set it

Quoted 10 lines

... Then popq %r11/cx will restore r11/cx even if they were changed by uprobe_consumer's. And then "retq" will return to the address "returned" by handle_trampoline(regs) because we do

			// comment to explain this hack
			r11_cx_ax[2] = regs->ip;

after handle_trampoline(). This all doesn't depend on iret-or-sysret.

OK, I am sure you understand this, so I guess I misunderstood your concerns.

thanks for the patience ;-)

jirka

maintainer
#32 lore raw

Re: [PATCH RFC bpf-next 4/3] uprobe: ensure sys_uretprobe uses sysret

Quoted 11 lines · Jiri Olsa
Quoted 6 lines · Oleg Nesterov

Either way

			regs->ip = ip;

above ensures that usermode returns to uretprobe_syscall_entry right after the syscall insn.

hm, I think above ensures that do_syscall_64 will skip the 'regs->cx != regs->ip' check.. and after the sysret returns to rcx register value and ignores regs->ip

                                                                 ^^^^^^^^^^^^^^^^

Yes, that is why do_syscall_64() returns F if regs->cx != regs->ip.

IOW. To oversimplify, the logic is

	// %rcx == ret ip
	entry_SYSCALL_64:

		pt_regs->ip = %rcx;
		pt_regs->cx = %rcx;

		do-syscall;

		%rcx = pt_regs->cx; // POP_REGS

		if (%rcx == pt_regs->ip) {
			// OK, we can use sysret which returns to rcx
			sysret;
		} else {
			// debugger/whatever changed rcx or ip, can't use sysret.
			// return to pt_regs->ip, see the "Return frame for iretq"
			// comment in struct pt_regs.
			iret;
		}

So return-to-usermode always returns to regs->ip and restores all the registers from pt_regs, just it can be faster if we can use sysret.

Quoted 1 line

but in any case we need to set it

Yes, yes, sure.

Oleg.