All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: "Naveen N . Rao" <naveen.n.rao@linux.vnet.ibm.com>,
	Ananth N Mavinakayanahalli <ananth@linux.ibm.com>,
	Ingo Molnar <mingo@kernel.org>,
	linux-kernel@vger.kernel.org, mhiramat@kernel.org,
	Sven Schnelle <svens@linux.ibm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	Russell King <linux@armlinux.org.uk>,
	Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 3/9] x86/unwind: Compile kretprobe fixup code only if CONFIG_KRETPROBES=y
Date: Thu, 21 Oct 2021 09:54:42 +0900	[thread overview]
Message-ID: <163477768249.264901.5797532967197120056.stgit@devnote2> (raw)
In-Reply-To: <163477765570.264901.3851692300287671122.stgit@devnote2>

Compile kretprobe related stacktrace entry recovery code and
unwind_state::kr_cur field only when CONFIG_KRETPROBES=y.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 arch/x86/include/asm/unwind.h |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/x86/include/asm/unwind.h b/arch/x86/include/asm/unwind.h
index fca2e783e3ce..2a1f8734416d 100644
--- a/arch/x86/include/asm/unwind.h
+++ b/arch/x86/include/asm/unwind.h
@@ -16,7 +16,9 @@ struct unwind_state {
 	unsigned long stack_mask;
 	struct task_struct *task;
 	int graph_idx;
+#ifdef CONFIG_KRETPROBES
 	struct llist_node *kr_cur;
+#endif
 	bool error;
 #if defined(CONFIG_UNWINDER_ORC)
 	bool signal, full_regs;
@@ -105,9 +107,13 @@ static inline
 unsigned long unwind_recover_kretprobe(struct unwind_state *state,
 				       unsigned long addr, unsigned long *addr_p)
 {
+#ifdef CONFIG_KRETPROBES
 	return is_kretprobe_trampoline(addr) ?
 		kretprobe_find_ret_addr(state->task, addr_p, &state->kr_cur) :
 		addr;
+#else
+	return addr;
+#endif
 }
 
 /* Recover the return address modified by kretprobe and ftrace_graph. */


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: "Naveen N . Rao" <naveen.n.rao@linux.vnet.ibm.com>,
	Ananth N Mavinakayanahalli <ananth@linux.ibm.com>,
	Ingo Molnar <mingo@kernel.org>,
	linux-kernel@vger.kernel.org, mhiramat@kernel.org,
	Sven Schnelle <svens@linux.ibm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	Russell King <linux@armlinux.org.uk>,
	Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 3/9] x86/unwind: Compile kretprobe fixup code only if CONFIG_KRETPROBES=y
Date: Thu, 21 Oct 2021 09:54:42 +0900	[thread overview]
Message-ID: <163477768249.264901.5797532967197120056.stgit@devnote2> (raw)
In-Reply-To: <163477765570.264901.3851692300287671122.stgit@devnote2>

Compile kretprobe related stacktrace entry recovery code and
unwind_state::kr_cur field only when CONFIG_KRETPROBES=y.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 arch/x86/include/asm/unwind.h |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/x86/include/asm/unwind.h b/arch/x86/include/asm/unwind.h
index fca2e783e3ce..2a1f8734416d 100644
--- a/arch/x86/include/asm/unwind.h
+++ b/arch/x86/include/asm/unwind.h
@@ -16,7 +16,9 @@ struct unwind_state {
 	unsigned long stack_mask;
 	struct task_struct *task;
 	int graph_idx;
+#ifdef CONFIG_KRETPROBES
 	struct llist_node *kr_cur;
+#endif
 	bool error;
 #if defined(CONFIG_UNWINDER_ORC)
 	bool signal, full_regs;
@@ -105,9 +107,13 @@ static inline
 unsigned long unwind_recover_kretprobe(struct unwind_state *state,
 				       unsigned long addr, unsigned long *addr_p)
 {
+#ifdef CONFIG_KRETPROBES
 	return is_kretprobe_trampoline(addr) ?
 		kretprobe_find_ret_addr(state->task, addr_p, &state->kr_cur) :
 		addr;
+#else
+	return addr;
+#endif
 }
 
 /* Recover the return address modified by kretprobe and ftrace_graph. */


  parent reply	other threads:[~2021-10-21  0:56 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-21  0:54 [PATCH v3 0/9] kprobes: Make KUnit and add stacktrace on kretprobe tests Masami Hiramatsu
2021-10-21  0:54 ` Masami Hiramatsu
2021-10-21  0:54 ` [PATCH v3 1/9] kprobes: convert tests to kunit Masami Hiramatsu
2021-10-21  0:54   ` Masami Hiramatsu
2021-10-21  0:54 ` [PATCH v3 2/9] kprobes: Add a test case for stacktrace from kretprobe handler Masami Hiramatsu
2021-10-21  0:54   ` Masami Hiramatsu
2021-10-22 16:15   ` Steven Rostedt
2021-10-22 16:15     ` Steven Rostedt
2021-10-22 18:23     ` Steven Rostedt
2021-10-22 18:23       ` Steven Rostedt
2021-10-25  2:34     ` Masami Hiramatsu
2021-10-25  2:34       ` Masami Hiramatsu
2021-10-21  0:54 ` Masami Hiramatsu [this message]
2021-10-21  0:54   ` [PATCH v3 3/9] x86/unwind: Compile kretprobe fixup code only if CONFIG_KRETPROBES=y Masami Hiramatsu
2021-10-21  0:54 ` [PATCH v3 4/9] arm64: kprobes: Record frame pointer with kretprobe instance Masami Hiramatsu
2021-10-21  0:54   ` Masami Hiramatsu
2021-10-21  0:55 ` [PATCH v3 5/9] arm64: kprobes: Make a frame pointer on __kretprobe_trampoline Masami Hiramatsu
2021-10-21  0:55   ` Masami Hiramatsu
2021-10-21  0:55 ` [PATCH v3 6/9] arm64: Recover kretprobe modified return address in stacktrace Masami Hiramatsu
2021-10-21  0:55   ` Masami Hiramatsu
2021-10-21 10:15   ` Will Deacon
2021-10-21 10:15     ` Will Deacon
2021-10-21 14:26     ` Masami Hiramatsu
2021-10-21 14:26       ` Masami Hiramatsu
2021-10-21 14:49       ` Steven Rostedt
2021-10-21 14:49         ` Steven Rostedt
2021-10-21 16:52         ` Will Deacon
2021-10-21 16:52           ` Will Deacon
2021-10-21 16:59           ` Steven Rostedt
2021-10-21 16:59             ` Steven Rostedt
2021-10-21 18:38             ` Steven Rostedt
2021-10-21 18:38               ` Steven Rostedt
2021-10-21  0:55 ` [PATCH v3 7/9] ARM: clang: Do not rely on lr register for stacktrace Masami Hiramatsu
2021-10-21  0:55   ` Masami Hiramatsu
2021-10-21  0:55 ` [PATCH v3 8/9] ARM: kprobes: Make a frame pointer on __kretprobe_trampoline Masami Hiramatsu
2021-10-21  0:55   ` Masami Hiramatsu
2021-12-03 20:37   ` Arnd Bergmann
2021-12-03 20:37     ` Arnd Bergmann
2021-12-04  8:45     ` Ard Biesheuvel
2021-12-04  8:45       ` Ard Biesheuvel
2021-12-04 12:08       ` Arnd Bergmann
2021-12-04 12:08         ` Arnd Bergmann
2021-12-08 12:26         ` Masami Hiramatsu
2021-12-08 12:26           ` Masami Hiramatsu
2021-10-21  0:55 ` [PATCH v3 9/9] ARM: Recover kretprobe modified return address in stacktrace Masami Hiramatsu
2021-10-21  0:55   ` Masami Hiramatsu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=163477768249.264901.5797532967197120056.stgit@devnote2 \
    --to=mhiramat@kernel.org \
    --cc=ananth@linux.ibm.com \
    --cc=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=mingo@kernel.org \
    --cc=nathan@kernel.org \
    --cc=naveen.n.rao@linux.vnet.ibm.com \
    --cc=ndesaulniers@google.com \
    --cc=rostedt@goodmis.org \
    --cc=svens@linux.ibm.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.