lkml.org 
[lkml]   [2022]   [Dec]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/urgent] x86/kprobes: Fix optprobe optimization check with CONFIG_RETHUNK
    The following commit has been merged into the x86/urgent branch of tip:

    Commit-ID: 63dc6325ff41ee9e570bde705ac34a39c5dbeb44
    Gitweb: https://git.kernel.org/tip/63dc6325ff41ee9e570bde705ac34a39c5dbeb44
    Author: Masami Hiramatsu (Google) <mhiramat@kernel.org>
    AuthorDate: Mon, 19 Dec 2022 23:35:19 +09:00
    Committer: Peter Zijlstra <peterz@infradead.org>
    CommitterDate: Tue, 27 Dec 2022 12:51:58 +01:00

    x86/kprobes: Fix optprobe optimization check with CONFIG_RETHUNK

    Since the CONFIG_RETHUNK and CONFIG_SLS will use INT3 for stopping
    speculative execution after function return, kprobe jump optimization
    always fails on the functions with such INT3 inside the function body.
    (It already checks the INT3 padding between functions, but not inside
    the function)

    To avoid this issue, as same as kprobes, check whether the INT3 comes
    from kgdb or not, and if so, stop decoding and make it fail. The other
    INT3 will come from CONFIG_RETHUNK/CONFIG_SLS and those can be
    treated as a one-byte instruction.

    Fixes: e463a09af2f0 ("x86: Add straight-line-speculation mitigation")
    Suggested-by: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/167146051929.1374301.7419382929328081706.stgit@devnote3
    ---
    arch/x86/kernel/kprobes/opt.c | 28 ++++++++--------------------
    1 file changed, 8 insertions(+), 20 deletions(-)

    diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
    index e6b8c53..e57e07b 100644
    --- a/arch/x86/kernel/kprobes/opt.c
    +++ b/arch/x86/kernel/kprobes/opt.c
    @@ -15,6 +15,7 @@
    #include <linux/extable.h>
    #include <linux/kdebug.h>
    #include <linux/kallsyms.h>
    +#include <linux/kgdb.h>
    #include <linux/ftrace.h>
    #include <linux/objtool.h>
    #include <linux/pgtable.h>
    @@ -279,19 +280,6 @@ static int insn_is_indirect_jump(struct insn *insn)
    return ret;
    }

    -static bool is_padding_int3(unsigned long addr, unsigned long eaddr)
    -{
    - unsigned char ops;
    -
    - for (; addr < eaddr; addr++) {
    - if (get_kernel_nofault(ops, (void *)addr) < 0 ||
    - ops != INT3_INSN_OPCODE)
    - return false;
    - }
    -
    - return true;
    -}
    -
    /* Decode whole function to ensure any instructions don't jump into target */
    static int can_optimize(unsigned long paddr)
    {
    @@ -334,15 +322,15 @@ static int can_optimize(unsigned long paddr)
    ret = insn_decode_kernel(&insn, (void *)recovered_insn);
    if (ret < 0)
    return 0;
    -
    +#ifdef CONFIG_KGDB
    /*
    - * In the case of detecting unknown breakpoint, this could be
    - * a padding INT3 between functions. Let's check that all the
    - * rest of the bytes are also INT3.
    + * If there is a dynamically installed kgdb sw breakpoint,
    + * this function should not be probed.
    */
    - if (insn.opcode.bytes[0] == INT3_INSN_OPCODE)
    - return is_padding_int3(addr, paddr - offset + size) ? 1 : 0;
    -
    + if (insn.opcode.bytes[0] == INT3_INSN_OPCODE &&
    + kgdb_has_hit_break(addr))
    + return 0;
    +#endif
    /* Recover address */
    insn.kaddr = (void *)addr;
    insn.next_byte = (void *)(addr + insn.length);
    \
     
     \ /
      Last update: 2023-03-26 23:21    [W:7.771 / U:1.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site