]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
powerpc/kprobes: Have optimized_callback() use preempt_enable()
authorNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Thu, 20 Oct 2022 17:28:58 +0000 (22:58 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 24 Nov 2022 12:31:49 +0000 (23:31 +1100)
Similar to x86 commit 2e62024c265aa6 ("kprobes/x86: Use preempt_enable()
in optimized_callback()"), change powerpc optprobes to use
preempt_enable() rather than preempt_enable_no_resched() since powerpc
also removed irq disabling for optprobes in commit f72180cc93a2c6
("powerpc/kprobes: Do not disable interrupts for optprobes and
kprobes_on_ftrace").

Reported-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/1885bab182626c33d9bf6421f430abf924c521a5.1666262278.git.naveen.n.rao@linux.vnet.ibm.com
arch/powerpc/kernel/optprobes.c

index 3b1c2236cbee57fc373e9abf76c97f441d9ac95b..004fae2044a3e0f9388c37693fc65b60f994d8bd 100644 (file)
@@ -112,7 +112,7 @@ static void optimized_callback(struct optimized_kprobe *op,
                __this_cpu_write(current_kprobe, NULL);
        }
 
-       preempt_enable_no_resched();
+       preempt_enable();
 }
 NOKPROBE_SYMBOL(optimized_callback);