[patch 10/14] x86/irq/64: Use cpu entry area instead of orig_ist
From: Thomas Gleixner
Date: Sun Mar 31 2019 - 18:11:05 EST
The orig_ist[] array is a shadow copy of the IST array in the TSS. The
reason why it exists is that older kernels used two TSS variants with
different pointers into the debug stack. orig_ist[] contains the real
starting points.
There is no point anymore to do so because the same information can be
retrieved using the base address of the cpu entry area mapping and the
offsets of the various exception stacks.
No functional change. Preparation for removing orig_ist.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
arch/x86/kernel/irq_64.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
@@ -18,6 +18,8 @@
#include <linux/uaccess.h>
#include <linux/smp.h>
#include <linux/sched/task_stack.h>
+
+#include <asm/cpu_entry_area.h>
#include <asm/io_apic.h>
#include <asm/apic.h>
@@ -42,11 +44,12 @@ int sysctl_panic_on_stackoverflow;
static inline void stack_overflow_check(struct pt_regs *regs)
{
#ifdef CONFIG_DEBUG_STACKOVERFLOW
+
#define STACK_TOP_MARGIN 128
- struct orig_ist *oist;
- u64 irq_stack_top, irq_stack_bottom;
- u64 estack_top, estack_bottom;
+
+ u64 irq_stack_top, irq_stack_bottom, estack_top, estack_bottom;
u64 curbase = (u64)task_stack_page(current);
+ struct cea_exception_stacks *estacks;
if (user_mode(regs))
return;
@@ -61,9 +64,10 @@ static inline void stack_overflow_check(
if (regs->sp >= irq_stack_top && regs->sp <= irq_stack_bottom)
return;
- oist = this_cpu_ptr(&orig_ist);
- estack_bottom = (u64)oist->ist[DEBUG_STACK];
- estack_top = estack_bottom - DEBUG_STKSZ + STACK_TOP_MARGIN;
+ estacks = __this_cpu_read(cea_exception_stacks);
+ estack_top = (u64)estacks->DB_stack;
+ estack_bottom = estack_top + sizeof(estacks->DB_stack);
+ estack_top += STACK_TOP_MARGIN;
if (regs->sp >= estack_top && regs->sp <= estack_bottom)
return;