From: tip-bot for Masami Hiramatsu <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: davem@davemloft.net, hpa@zytor.com,
torvalds@linux-foundation.org, peterz@infradead.org,
linux-kernel@vger.kernel.org, naveen.n.rao@linux.vnet.ibm.com,
anil.s.keshavamurthy@intel.com, mingo@kernel.org,
mhiramat@kernel.org, tglx@linutronix.de
Subject: [tip:perf/core] kprobes: Don't call BUG_ON() if there is a kprobe in use on free list
Date: Tue, 11 Sep 2018 23:54:03 -0700 [thread overview]
Message-ID: <tip-cbdd96f5586151e48317d90a403941ec23f12660@git.kernel.org> (raw)
In-Reply-To: <153666126882.21306.10738207224288507996.stgit@devbox>
Commit-ID: cbdd96f5586151e48317d90a403941ec23f12660
Gitweb: https://git.kernel.org/tip/cbdd96f5586151e48317d90a403941ec23f12660
Author: Masami Hiramatsu <mhiramat@kernel.org>
AuthorDate: Tue, 11 Sep 2018 19:21:09 +0900
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 12 Sep 2018 08:01:16 +0200
kprobes: Don't call BUG_ON() if there is a kprobe in use on free list
Instead of calling BUG_ON(), if we find a kprobe in use on free kprobe
list, just remove it from the list and keep it on kprobe hash list
as same as other in-use kprobes.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: David S . Miller <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Naveen N . Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/153666126882.21306.10738207224288507996.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/kprobes.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 63c342e5e6c3..90e98e233647 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -546,8 +546,14 @@ static void do_free_cleaned_kprobes(void)
struct optimized_kprobe *op, *tmp;
list_for_each_entry_safe(op, tmp, &freeing_list, list) {
- BUG_ON(!kprobe_unused(&op->kp));
list_del_init(&op->list);
+ if (WARN_ON_ONCE(!kprobe_unused(&op->kp))) {
+ /*
+ * This must not happen, but if there is a kprobe
+ * still in use, keep it on kprobes hash list.
+ */
+ continue;
+ }
free_aggr_kprobe(&op->kp);
}
}
prev parent reply other threads:[~2018-09-12 6:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 10:18 [PATCH -tip v2 0/5] kprobes: Remove BUG_ON from kprobes Masami Hiramatsu
2018-09-11 10:19 ` [PATCH -tip v2 1/5] kprobes: Remove meaningless BUG_ON from disarming process Masami Hiramatsu
2018-09-12 6:51 ` [tip:perf/core] kprobes: Remove pointless BUG_ON() " tip-bot for Masami Hiramatsu
2018-09-11 10:19 ` [PATCH -tip v2 2/5] kprobes: Remove meaningless BUG_ON from add_new_kprobe Masami Hiramatsu
2018-09-12 6:52 ` [tip:perf/core] kprobes: Remove pointless BUG_ON() from add_new_kprobe() tip-bot for Masami Hiramatsu
2018-09-11 10:20 ` [PATCH -tip v2 3/5] kprobes: Remove meaningless BUG_ON from reuse_unused_kprobe Masami Hiramatsu
2018-09-12 6:52 ` [tip:perf/core] kprobes: Remove pointless BUG_ON() from reuse_unused_kprobe() tip-bot for Masami Hiramatsu
2018-09-11 10:20 ` [PATCH -tip v2 4/5] kprobes: Return error if fail to reuse kprobe instead of BUG_ON Masami Hiramatsu
2018-09-12 6:53 ` [tip:perf/core] kprobes: Return error if we fail to reuse kprobe instead of BUG_ON() tip-bot for Masami Hiramatsu
2018-09-11 10:21 ` [PATCH -tip v2 5/5] kprobes: Don't call BUG_ON if there is a kprobe in use on free list Masami Hiramatsu
2018-09-12 6:54 ` tip-bot for Masami Hiramatsu [this message]
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-cbdd96f5586151e48317d90a403941ec23f12660@git.kernel.org \
--to=tipbot@zytor.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).