ARM: 8769/1: kprobes: Fix to use get_kprobe_ctlblk after irq-disabed

Since get_kprobe_ctlblk() uses smp_processor_id() to access
per-cpu variable, it hits smp_processor_id sanity check as below.

[ 7.006928] BUG: using smp_processor_id() in preemptible [00000000] code: swapper/0/1
[ 7.007859] caller is debug_smp_processor_id+0x20/0x24
[ 7.008438] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.16.0-rc1-00192-g4eb17253e4b5 #1
[ 7.008890] Hardware name: Generic DT based system
[ 7.009917] [<c0313f0c>] (unwind_backtrace) from [<c030e6d8>] (show_stack+0x20/0x24)
[ 7.010473] [<c030e6d8>] (show_stack) from [<c0c64694>] (dump_stack+0x84/0x98)
[ 7.010990] [<c0c64694>] (dump_stack) from [<c071ca5c>] (check_preemption_disabled+0x138/0x13c)
[ 7.011592] [<c071ca5c>] (check_preemption_disabled) from [<c071ca80>] (debug_smp_processor_id+0x20/0x24)
[ 7.012214] [<c071ca80>] (debug_smp_processor_id) from [<c03335e0>] (optimized_callback+0x2c/0xe4)
[ 7.013077] [<c03335e0>] (optimized_callback) from [<bf0021b0>] (0xbf0021b0)

To fix this issue, call get_kprobe_ctlblk() right after
irq-disabled since that disables preemption.

Fixes: 0dc016dbd820 ("ARM: kprobes: enable OPTPROBES for ARM 32")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

authored by Masami Hiramatsu and committed by Russell King 69af7e23 6cea14f5

+2 -1
+2 -1
arch/arm/probes/kprobes/opt-arm.c
··· 165 165 { 166 166 unsigned long flags; 167 167 struct kprobe *p = &op->kp; 168 - struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); 168 + struct kprobe_ctlblk *kcb; 169 169 170 170 /* Save skipped registers */ 171 171 regs->ARM_pc = (unsigned long)op->kp.addr; 172 172 regs->ARM_ORIG_r0 = ~0UL; 173 173 174 174 local_irq_save(flags); 175 + kcb = get_kprobe_ctlblk(); 175 176 176 177 if (kprobe_running()) { 177 178 kprobes_inc_nmissed_count(&op->kp);