From: tip-bot for Masami Hiramatsu <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, linux@armlinux.org.uk, wangnan0@huawei.com,
arnd@arndb.de, linux-kernel@vger.kernel.org,
sfr@canb.auug.org.au, mingo@kernel.org, broonie@kernel.org,
torvalds@linux-foundation.org, hpa@zytor.com, tixy@linaro.org,
mhiramat@kernel.org, peterz@infradead.org
Subject: [tip:perf/kprobes] arm/kprobes: Fix kretprobe test to check correct counter
Date: Tue, 7 Nov 2017 03:15:14 -0800 [thread overview]
Message-ID: <tip-4650209b166789182657c8eb0612cecd5b54d591@git.kernel.org> (raw)
In-Reply-To: <150976985182.2012.15495311380682779381.stgit@devbox>
Commit-ID: 4650209b166789182657c8eb0612cecd5b54d591
Gitweb: https://git.kernel.org/tip/4650209b166789182657c8eb0612cecd5b54d591
Author: Masami Hiramatsu <mhiramat@kernel.org>
AuthorDate: Sat, 4 Nov 2017 13:30:52 +0900
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 7 Nov 2017 11:25:14 +0100
arm/kprobes: Fix kretprobe test to check correct counter
test_kretprobe() uses jprobe_func_called at the
last test, but it must check kretprobe_handler_called.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jon Medhurst <tixy@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/150976985182.2012.15495311380682779381.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/arm/probes/kprobes/test-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/probes/kprobes/test-core.c b/arch/arm/probes/kprobes/test-core.c
index 1c98a87..9c3ceba 100644
--- a/arch/arm/probes/kprobes/test-core.c
+++ b/arch/arm/probes/kprobes/test-core.c
@@ -451,7 +451,7 @@ static int test_kretprobe(long (*func)(long, long))
}
if (!call_test_func(func, false))
return -EINVAL;
- if (jprobe_func_called == test_func_instance) {
+ if (kretprobe_handler_called == test_func_instance) {
pr_err("FAIL: kretprobe called after unregistering\n");
return -EINVAL;
}
next prev parent reply other threads:[~2017-11-07 11:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-04 4:30 [PATCH -next 0/2] arm: kprobes: Remove jprobe test case Masami Hiramatsu
2017-11-04 4:30 ` [PATCH -next 1/2] arm: kprobes: Fix kretprobe test to check correct counter Masami Hiramatsu
2017-11-07 11:15 ` tip-bot for Masami Hiramatsu [this message]
2017-11-04 4:31 ` [PATCH -next 2/2] arm: kprobes: Remove jprobe test case Masami Hiramatsu
2017-11-07 11:15 ` [tip:perf/kprobes] arm/kprobes: " tip-bot for 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=tip-4650209b166789182657c8eb0612cecd5b54d591@git.kernel.org \
--to=tipbot@zytor.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=tixy@linaro.org \
--cc=torvalds@linux-foundation.org \
--cc=wangnan0@huawei.com \
/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
Powered by JetHome