Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1209969pxj; Fri, 18 Jun 2021 01:57:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGZEFsvjdeteB5KKPv1qs2zbKSRd04X1KbqEMXQ8cxgccIEWte9V0xrmixf8y6BggtsEC/ X-Received: by 2002:a17:906:5285:: with SMTP id c5mr9824581ejm.282.1624006645907; Fri, 18 Jun 2021 01:57:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624006645; cv=none; d=google.com; s=arc-20160816; b=t/MT6zyU0Iu85voc3oDL4CtT/0zLfR5MmQoCAwu/c92pWXni8F7gkLxSXl9EG3CVVo 5m+jBj/QgIwJk/JgWla1XPW/Ak+iYrpRxoOValRCPF4wenqDPQ8Y8wP2u06pG/1Jn+bk 8ogJ0Cr6IJnr7bcJ44qzAMQChQAbgiRvAbydZGLsT8pCRGlby4gf8fAwNTcBnopn943J CsEyoPN/K4fU5sXHQG6i2GahvTKbNI6WaRCw9RMqH6ySdTRmSjBdTIElCuF0dfCqfGxp xTfZ6Gx9ZrVhGVGJpngNOiYkCN8KHzHKH1yTrj8ae/VkkbDWmKhPE39xZ+HcfKOkRTkf ZDCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:message-id:date:subject:cc:to:from:dkim-signature; bh=0h/4eZGYYfSZRrx0THZ4/11IHEODo3E4aeFD4D1bC6Q=; b=t+0S6Jy61NqguB7SI8gXZSrv0DLY7xtawJCb+ur91hyWl0N1K26biHH6SvJgBoFtpD Y/w+9/UcZ7yQNZ1ud4BTwf4SRCVD0HPsLMnBmtWz8h/Cm498uHabfv9UfXVYEX1JMcqX gOe7jHoBr6aKekUAOPgGaIIspczswgieTU8pAFjP86Kcgg2zU8QqxxHV1th66FYtrswQ 8y2UEjf0lhz7ccNZDz6fuA42CM/nwb/nq6ZG65gXloAbwGo/dysmt1fEvkl5fLiCHAZw TXivY/lDZmxaW9uAufGDS7H19n8F2OsOB0tGmSFEn7uDy3tbwUbXcU0IaV3fzGVSU29V Ha+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=k7HMcBwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s3si8103980edd.265.2021.06.18.01.57.02; Fri, 18 Jun 2021 01:57:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=k7HMcBwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232398AbhFRHHg (ORCPT + 99 others); Fri, 18 Jun 2021 03:07:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:44732 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229580AbhFRHHe (ORCPT ); Fri, 18 Jun 2021 03:07:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB90D6100A; Fri, 18 Jun 2021 07:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623999925; bh=V+te0YsjqY4RP3vJbTeLlJ3qSIHi0766SO5TpEU4fQM=; h=From:To:Cc:Subject:Date:From; b=k7HMcBwe7B9fwrFJqotIpl5p6t7QZvh/K8vXkb80Gv0BUAu3UKZN8SjK2QAqlyy1H qxh7v4FI2z7kNXNesS9aky+KAY8AZI6i21ayKwqcGamzfno3CxgVxCT7+ajwuIVCpC TMojDNy+08QwIAY4WBy6c1ST+krD7qMnfRJUPXQdGg9C6p1teYwNF9XmSclcaQjSB2 BcZkTms8LKX7U1yNrauJB7ajSYdLnajhdsA5MXnBDQ/ew3HBvzrVfCWgoWg0oSWN0A +Tp+ezQ/ZYRagQWkUMppYnM74uKoYp8KoXMR6zlcVmA1soXXgHZxXktnxPcE9MXvr0 gXI9dYoC3BkYw== From: Masami Hiramatsu To: Steven Rostedt , Josh Poimboeuf , Ingo Molnar Cc: X86 ML , Masami Hiramatsu , Daniel Xu , linux-kernel@vger.kernel.org, bpf@vger.kernel.org, kuba@kernel.org, mingo@redhat.com, ast@kernel.org, Thomas Gleixner , Borislav Petkov , Peter Zijlstra , kernel-team@fb.com, yhs@fb.com, linux-ia64@vger.kernel.org, Abhishek Sagar , Andrii Nakryiko Subject: [PATCH -tip v8 00/13] kprobes: Fix stacktrace with kretprobes on x86 Date: Fri, 18 Jun 2021 16:05:22 +0900 Message-Id: <162399992186.506599.8457763707951687195.stgit@devnote2> X-Mailer: git-send-email 2.25.1 User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, Here is the 8th version of the series to fix the stacktrace with kretprobe on x86. The previous version is; https://lore.kernel.org/bpf/162209754288.436794.3904335049560916855.stgit@devnote2/ This version fixes to call appropriate function and drop some unneeded patches. Changes from v7: [03/13]: Call dereference_kernel_function_descriptor() for getting the address of kretprobe_trampoline. [09/13]: Update the title and description to explain why it is needed. [10/13][11/13]: Add Josh's Acked-by. With this series, unwinder can unwind stack correctly from ftrace as below; # cd /sys/kernel/debug/tracing # echo > trace # echo 1 > options/sym-offset # echo r vfs_read >> kprobe_events # echo r full_proxy_read >> kprobe_events # echo traceoff:1 > events/kprobes/r_vfs_read_0/trigger # echo stacktrace:1 > events/kprobes/r_full_proxy_read_0/trigger # echo 1 > events/kprobes/enable # cat /sys/kernel/debug/kprobes/list ffffffff8133b740 r full_proxy_read+0x0 [FTRACE] ffffffff812560b0 r vfs_read+0x0 [FTRACE] # echo 0 > events/kprobes/enable # cat trace # tracer: nop # # entries-in-buffer/entries-written: 3/3 #P:8 # # _-----=> irqs-off # / _----=> need-resched # | / _---=> hardirq/softirq # || / _--=> preempt-depth # ||| / delay # TASK-PID CPU# |||| TIMESTAMP FUNCTION # | | | |||| | | <...>-134 [007] ...1 16.185877: r_full_proxy_read_0: (vfs_read+0x98/0x180 <- full_proxy_read) <...>-134 [007] ...1 16.185901: => kretprobe_trace_func+0x209/0x300 => kretprobe_dispatcher+0x4a/0x70 => __kretprobe_trampoline_handler+0xd4/0x170 => trampoline_handler+0x43/0x60 => kretprobe_trampoline+0x2a/0x50 => vfs_read+0x98/0x180 => ksys_read+0x5f/0xe0 => do_syscall_64+0x37/0x90 => entry_SYSCALL_64_after_hwframe+0x44/0xae <...>-134 [007] ...1 16.185902: r_vfs_read_0: (ksys_read+0x5f/0xe0 <- vfs_read) This shows the double return probes (vfs_read and full_proxy_read) on the stack correctly unwinded. (vfs_read will return to ksys_read+0x5f and full_proxy_read will return to vfs_read+0x98) This actually changes the kretprobe behavisor a bit, now the instraction pointer in the pt_regs passed to kretprobe user handler is correctly set the real return address. So user handlers can get it via instruction_pointer() API, and can use stack_trace_save_regs(). You can also get this series from git://git.kernel.org/pub/scm/linux/kernel/git/mhiramat/linux.git kprobes/kretprobe-stackfix-v8 Thank you, --- Josh Poimboeuf (1): x86/kprobes: Add UNWIND_HINT_FUNC on kretprobe_trampoline code Masami Hiramatsu (12): ia64: kprobes: Fix to pass correct trampoline address to the handler kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor() kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() kprobes: Add kretprobe_find_ret_addr() for searching return address ARC: Add instruction_pointer_set() API ia64: Add instruction_pointer_set() API arm: kprobes: Make a space for regs->ARM_pc at kretprobe_trampoline kprobes: Enable stacktrace from pt_regs in kretprobe handler x86/kprobes: Push a fake return address at kretprobe_trampoline x86/unwind: Recover kretprobe trampoline entry tracing: Show kretprobe unknown indicator only for kretprobe_trampoline x86/kprobes: Fixup return address in generic trampoline handler arch/arc/include/asm/ptrace.h | 5 ++ arch/arc/kernel/kprobes.c | 2 - arch/arm/probes/kprobes/core.c | 5 +- arch/arm64/kernel/probes/kprobes.c | 3 - arch/csky/kernel/probes/kprobes.c | 2 - arch/ia64/include/asm/ptrace.h | 5 ++ arch/ia64/kernel/kprobes.c | 15 ++--- arch/mips/kernel/kprobes.c | 3 - arch/parisc/kernel/kprobes.c | 4 + arch/powerpc/kernel/kprobes.c | 13 ---- arch/riscv/kernel/probes/kprobes.c | 2 - arch/s390/kernel/kprobes.c | 2 - arch/sh/kernel/kprobes.c | 2 - arch/sparc/kernel/kprobes.c | 2 - arch/x86/include/asm/kprobes.h | 1 arch/x86/include/asm/unwind.h | 23 +++++++ arch/x86/include/asm/unwind_hints.h | 5 ++ arch/x86/kernel/kprobes/core.c | 53 +++++++++++++++-- arch/x86/kernel/unwind_frame.c | 3 - arch/x86/kernel/unwind_guess.c | 3 - arch/x86/kernel/unwind_orc.c | 18 +++++- include/linux/kprobes.h | 44 ++++++++++++-- kernel/kprobes.c | 108 +++++++++++++++++++++++++---------- kernel/trace/trace_output.c | 17 +----- lib/error-inject.c | 3 + 25 files changed, 238 insertions(+), 105 deletions(-) -- Masami Hiramatsu (Linaro)