Subject: [merged] kprobes-ensure-blacklist-data-is-aligned.patch removed from -mm tree
To: vgupta@xxxxxxxxxxxx,masami.hiramatsu.pt@xxxxxxxxxxx,mingo@xxxxxxx,mingo@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 08 May 2014 13:27:51 -0700
The patch titled
Subject: kprobes: ensure blacklist data is aligned
has been removed from the -mm tree. Its filename was
kprobes-ensure-blacklist-data-is-aligned.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Vineet Gupta <vgupta@xxxxxxxxxxxx>
Subject: kprobes: ensure blacklist data is aligned
ARC Linux (not supporting native unaligned access) was failing to boot
because __start_kprobe_blacklist was not aligned.
This was because per generated vmlinux.lds it was emitted right next to
.rodata with strings etc hence could be randomly unaligned.
Fix that by ensuring a word alignment. While 4 would suffice for 32bit
arches and problem at hand, it is probably better to put 8.
| Path: (null) CPU: 0 PID: 1 Comm: swapper Not tainted
| 3.15.0-rc3-next-20140430 #2
| task: 8f044000 ti: 8f01e000 task.ti: 8f01e000
|
| [ECR ]: 0x00230400 => Misaligned r/w from 0x800fb0d3
| [EFA ]: 0x800fb0d3
| [BLINK ]: do_one_initcall+0x86/0x1bc
| [ERET ]: init_kprobes+0x52/0x120
Fixes
commit 376e242429bf8539ef39a080ac113c8799840b13
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
AuthorDate: Thu Apr 17 17:17:05 2014 +0900
Commit: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Thu Apr 24 10:02:56 2014 +0200
kprobes: Introduce NOKPROBE_SYMBOL() macro to maintain kprobes blacklist
Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/vmlinux.lds.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN include/asm-generic/vmlinux.lds.h~kprobes-ensure-blacklist-data-is-aligned include/asm-generic/vmlinux.lds.h
--- a/include/asm-generic/vmlinux.lds.h~kprobes-ensure-blacklist-data-is-aligned
+++ a/include/asm-generic/vmlinux.lds.h
@@ -110,7 +110,8 @@
#endif
#ifdef CONFIG_KPROBES
-#define KPROBE_BLACKLIST() VMLINUX_SYMBOL(__start_kprobe_blacklist) = .; \
+#define KPROBE_BLACKLIST() . = ALIGN(8); \
+ VMLINUX_SYMBOL(__start_kprobe_blacklist) = .; \
*(_kprobe_blacklist) \
VMLINUX_SYMBOL(__stop_kprobe_blacklist) = .;
#else
_
Patches currently in -mm which might be from vgupta@xxxxxxxxxxxx are
arc-call-find_vma-with-the-mmap_sem-held.patch
arc-call-find_vma-with-the-mmap_sem-held-fix.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
