Hi Andrew, Could you please queue this patch onto your -mm tree? Masami has given an Acked-by already.
Thank you! On 2015/2/10 9:34, Wang Nan wrote: > Currently, x86 kprobes is unable to boost 2 bytes nop like: > > nopl 0x0(%rax,%rax,1) > > which is 0x0f 0x1f 0x44 0x00 0x00. > > Such nops have exactly 5 bytes to hold a relative jmp instruction. > Boosting them should be obviously safe. > > This patch enable boosting such nops by simply updating > twobyte_is_boostable[] array. > > Signed-off-by: Wang Nan <[email protected]> > Acked-by: Masami Hiramatsu <[email protected]> > --- > arch/x86/kernel/kprobes/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c > index 98f654d..6a1146e 100644 > --- a/arch/x86/kernel/kprobes/core.c > +++ b/arch/x86/kernel/kprobes/core.c > @@ -84,7 +84,7 @@ static volatile u32 twobyte_is_boostable[256 / 32] = { > /* 0 1 2 3 4 5 6 7 8 9 a b c d e f */ > /* ---------------------------------------------- */ > W(0x00, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0) | /* 00 */ > - W(0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) , /* 10 */ > + W(0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1) , /* 10 */ > W(0x20, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) | /* 20 */ > W(0x30, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) , /* 30 */ > W(0x40, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1) | /* 40 */ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
