kprobes-fix-kill-kprobe-which-has-been-marked-as-gone.patch removed from -mm tree
The patch titled
Subject: kprobes: fix kill kprobe which has been marked as gone
has been removed from the -mm tree. Its filename was
kprobes-fix-kill-kprobe-which-has-been-marked-as-gone.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Muchun Song <[email protected]>
Subject: kprobes: fix kill kprobe which has been marked as gone
If a kprobe is marked as gone, we should not kill it again. Otherwise, we can disarm the kprobe more than once. In that case, the statistics of kprobe_ftrace_enabled can unbalance which can lead to that kprobe do not work.
---
kernel/kprobes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/kprobes.c renamed from kernel/kprobes.c~kprobes-fix-kill-kprobe-which-has-been-marked-as-gone +8 -1
@@ -2140,6 +2140,9 @@ static void kill_kprobe(struct kprobe *plockdep_assert_held (&kprobe_mutex); +if (WARN_ON_ONCE (kprobe_gone (p))) +return ; + p->flags |=KPROBE_FLAG_GONE ;if (kprobe_aggrprobe (p)) {/*
@@ -2419,7 +2422,10 @@ static int kprobes_module_callback(strucmutex_lock (&kprobe_mutex);for (i =0 ; i <KPROBE_TABLE_SIZE ; i++) { head = &kprobe_table[i]; -hlist_for_each_entry (p, head, hlist) +hlist_for_each_entry (p, head, hlist) { +if (kprobe_gone (p)) +continue ; +if (within_module_init ((unsigned long )p->addr, mod) || (checkcore &&within_module_core ((unsigned long )p->addr, mod))) {
@@ -2436,6 +2442,7 @@ static int kprobes_module_callback(struc*/ kill_kprobe (p); } + } }if (val ==MODULE_STATE_GOING )remove_module_kprobe_blacklist (mod);
_
Patches currently in -mm which might be from [email protected] are
mm-memcontrol-fix-missing-suffix-of-workingset_restore.patch mm-memcontrol-add-the-missing-numa_stat-interface-for-cgroup-v2.patch