From: William Roche Date: Tue, 19 Feb 2019 14:11:12 +0000 (-0500) Subject: int3 handler better address space detection on interrupts X-Git-Tag: v4.1.12-124.31.3~91 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=695a33fa203b2954e4aa80498edb9893e786ae5d;p=users%2Fjedix%2Flinux-maple.git int3 handler better address space detection on interrupts In order to prepare the possibility to dynamically change an interrupt handler code with static_branch_enable/disable, as the interrupt can equally appear while in user space or kernel space, the int3 handler itself must better identify if the original interrupt is from kernel or userland. Signed-off-by: William Roche Co-developed-by: Alexandre Chartre Signed-off-by: Alexandre Chartre Reviewed-by: Darren Kenny Reviewed-by: Boris Ostrovsky Reviewed-by: Alejandro Jimenez (cherry picked from commit 594fc07cd96784004254680c9e1e4b757fb0a1f5) Orabug: 29660924 Signed-off-by: William Roche Reviewed-by: Darren Kenny Acked-by: Boris Ostrovsky Signed-off-by: Brian Maly Conflicts: arch/x86/entry/entry_64.S entry/entry_64.S vs kernel/entry_64.S in UEK4 Signed-off-by: Brian Maly --- diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 65c8270dd9120..4a84195af2e19 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1458,7 +1458,7 @@ apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \ #endif /* CONFIG_HYPERV */ idtentry debug do_debug has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK -idtentry int3 do_int3 has_error_code=0 +idtentry int3 do_int3 has_error_code=0 paranoid=1 idtentry stack_segment do_stack_segment has_error_code=1 #ifdef CONFIG_XEN idtentry xen_debug do_debug has_error_code=0