lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 809/879] csky: patch_text: Fixup last cpu should be master
    Date
    From: Guo Ren <guoren@linux.alibaba.com>

    commit 8c4d16471e2babe9bdfe41d6ef724526629696cb upstream.

    These patch_text implementations are using stop_machine_cpuslocked
    infrastructure with atomic cpu_count. The original idea: When the
    master CPU patch_text, the others should wait for it. But current
    implementation is using the first CPU as master, which couldn't
    guarantee the remaining CPUs are waiting. This patch changes the
    last CPU as the master to solve the potential risk.

    Fixes: 33e53ae1ce41 ("csky: Add kprobes supported")
    Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
    Signed-off-by: Guo Ren <guoren@kernel.org>
    Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/csky/kernel/probes/kprobes.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/csky/kernel/probes/kprobes.c
    +++ b/arch/csky/kernel/probes/kprobes.c
    @@ -30,7 +30,7 @@ static int __kprobes patch_text_cb(void
    struct csky_insn_patch *param = priv;
    unsigned int addr = (unsigned int)param->addr;

    - if (atomic_inc_return(&param->cpu_count) == 1) {
    + if (atomic_inc_return(&param->cpu_count) == num_online_cpus()) {
    *(u16 *) addr = cpu_to_le16(param->opcode);
    dcache_wb_range(addr, addr + 2);
    atomic_inc(&param->cpu_count);

    \
     
     \ /
      Last update: 2022-06-08 03:40    [W:4.060 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site