mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: YuanJunQing <yuanjunqing66@163.com>
To: tsbogend@alpha.franken.de
Cc: paulburton@kernel.org, chenhc@lemote.com,
	linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
	liulichao@loongson.cn, YuanJunQing <yuanjunqing66@163.com>
Subject: [PATCH] function:stacktrace/mips: Fix function:stacktrace for mips
Date: Thu, 28 May 2020 20:36:40 +0800	[thread overview]
Message-ID: <20200528123640.4285-1-yuanjunqing66@163.com> (raw)

ftrace_call as global symbol in ftrace_caller(), this
will cause function:stacktrace can not work well.
i.e. echo do_IRQ:stacktrace > set_ftrace_filte

Signed-off-by: YuanJunQing <yuanjunqing66@163.com>
---
 arch/mips/kernel/mcount.S | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S
index cff52b283e03..cd5545764e5f 100644
--- a/arch/mips/kernel/mcount.S
+++ b/arch/mips/kernel/mcount.S
@@ -87,8 +87,15 @@ EXPORT_SYMBOL(_mcount)
 	PTR_LA   t1, _etext
 	sltu     t3, t1, a0	/* t3 = (a0 > _etext) */
 	or       t1, t2, t3
+	PTR_LA	 t2, stlab-4 	/* t2: "function:stacktrace" return address */
+	move	 a1, AT		/* arg2: parent's return address */
 	beqz     t1, ftrace_call
-	 nop
+	 nop			/* "function:stacktrace" return address */
+stlab:
+	PTR_LA	t2, stlab-4
+	/* ftrace_call_end: ftrace_call return address */
+	beq	t2,ra, ftrace_call_end
+	nop
 #if defined(KBUILD_MCOUNT_RA_ADDRESS) && defined(CONFIG_32BIT)
 	PTR_SUBU a0, a0, 16	/* arg1: adjust to module's recorded callsite */
 #else
@@ -98,7 +105,9 @@ EXPORT_SYMBOL(_mcount)
 	.globl ftrace_call
 ftrace_call:
 	nop	/* a placeholder for the call to a real tracing function */
-	 move	a1, AT		/* arg2: parent's return address */
+	move	ra, t2		/* t2: "function:stacktrace" return address */
+
+ftrace_call_end:
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 	.globl ftrace_graph_call
-- 
2.17.1


             reply	other threads:[~2020-05-28 12:52 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-28 12:36 YuanJunQing [this message]
2020-05-29  9:29 ` yuanjunqing
2020-05-29  9:41   ` WANG Xuerui
2020-06-04  1:17     ` Maciej W. Rozycki
2020-06-04  3:25       ` yuanjunqing

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=20200528123640.4285-1-yuanjunqing66@163.com \
    --to=yuanjunqing66@163.com \
    --cc=chenhc@lemote.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=liulichao@loongson.cn \
    --cc=paulburton@kernel.org \
    --cc=tsbogend@alpha.franken.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®