From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
x86@kernel.org, Andy Lutomirski <luto@kernel.org>,
Josh Poimboeuf <jpoimboe@redhat.com>
Subject: Re: [patch V2 03/29] x86/irq/64: Remove a hardcoded irq_stack_union access
Date: Fri, 5 Apr 2019 09:37:27 -0700 [thread overview]
Message-ID: <20190405163727.GB19359@linux.intel.com> (raw)
In-Reply-To: <20190405150928.684985548@linutronix.de>
On Fri, Apr 05, 2019 at 05:07:01PM +0200, Thomas Gleixner wrote:
> From: Andy Lutomirski <luto@kernel.org>
>
> stack_overflow_check() is using both irq_stack_ptr and irq_stack_union to
> find the IRQ stack. That's going to break when vmapped irq stacks are
> introduced.
>
> Change it to just use irq_stack_ptr.
>
> Signed-off-by: Andy Lutomirski <luto@kernel.org>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
>
> ---
> arch/x86/kernel/irq_64.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> --- a/arch/x86/kernel/irq_64.c
> +++ b/arch/x86/kernel/irq_64.c
> @@ -55,9 +55,8 @@ static inline void stack_overflow_check(
> regs->sp <= curbase + THREAD_SIZE)
> return;
>
> - irq_stack_top = (u64)this_cpu_ptr(irq_stack_union.irq_stack) +
> - STACK_TOP_MARGIN;
> irq_stack_bottom = (u64)__this_cpu_read(irq_stack_ptr);
> + irq_stack_top = irq_stack_bottom - IRQ_STACK_SIZE + STACK_TOP_MARGIN;
Not introduced in this patch, but the names for top and bottom are flipped,
both for irq_stack and estack. STACK_TOP_MARGIN should also be
STACK_BOTTOM_MARGIN. The actual checks are functionally correct, but holy
hell does it make reading the code confusing, and the WARN prints backwards
information.
E.g.:
swapper/10 has overflown the kernel stack
cur:ffffc900000bc000,sp:ffff888277b03f78
irq stk top-bottom:ffff888277b00080-ffff888277b04000
exception stk top-bottom:fffffe00001b4080-fffffe00001b9000
Printing out top-bottom for "cur" would also probably be helpful.
Let me know if you'd like me to send a patch, or if you'll fold a change
into this series.
For this patch,
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
> if (regs->sp >= irq_stack_top && regs->sp <= irq_stack_bottom)
> return;
>
>
>
next prev parent reply other threads:[~2019-04-05 16:37 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 15:06 [patch V2 00/29] x86: Add guard pages to exception and interrupt stacks Thomas Gleixner
2019-04-05 15:06 ` [patch V2 01/29] x86/irq/64: Limit IST stack overflow check to #DB stack Thomas Gleixner
2019-04-05 15:07 ` [patch V2 02/29] x86/dumpstack: Fix off-by-one errors in stack identification Thomas Gleixner
2019-04-05 15:44 ` Sean Christopherson
2019-04-05 15:07 ` [patch V2 03/29] x86/irq/64: Remove a hardcoded irq_stack_union access Thomas Gleixner
2019-04-05 16:37 ` Sean Christopherson [this message]
2019-04-05 16:38 ` Sean Christopherson
2019-04-05 17:18 ` Josh Poimboeuf
2019-04-05 17:47 ` Thomas Gleixner
2019-04-05 15:07 ` [patch V2 04/29] x86/irq/64: Sanitize the top/bottom confusion Thomas Gleixner
2019-04-05 16:54 ` Sean Christopherson
2019-04-05 15:07 ` [patch V2 05/29] x86/idt: Remove unused macro SISTG Thomas Gleixner
2019-04-05 15:07 ` [patch V2 06/29] x86/exceptions: Remove unused stack defines on 32bit Thomas Gleixner
2019-04-05 15:07 ` [patch V2 07/29] x86/exceptions: Make IST index zero based Thomas Gleixner
2019-04-05 18:59 ` Sean Christopherson
2019-04-05 15:07 ` [patch V2 08/29] x86/cpu_entry_area: Cleanup setup functions Thomas Gleixner
2019-04-05 19:25 ` Sean Christopherson
2019-04-05 15:07 ` [patch V2 09/29] x86/exceptions: Add structs for exception stacks Thomas Gleixner
2019-04-05 20:48 ` Sean Christopherson
2019-04-05 20:50 ` Sean Christopherson
2019-04-05 21:00 ` Thomas Gleixner
2019-04-05 15:07 ` [patch V2 10/29] x86/cpu_entry_area: Prepare for IST guard pages Thomas Gleixner
2019-04-05 15:07 ` [patch V2 11/29] x86/cpu_entry_area: Provide exception stack accessor Thomas Gleixner
2019-04-05 15:07 ` [patch V2 12/29] x86/traps: Use cpu_entry_area instead of orig_ist Thomas Gleixner
2019-04-05 15:07 ` [patch V2 13/29] x86/irq/64: Use cpu entry area " Thomas Gleixner
2019-04-05 15:07 ` [patch V2 14/29] x86/dumpstack/64: Use cpu_entry_area " Thomas Gleixner
2019-04-05 15:07 ` [patch V2 15/29] x86/cpu: Prepare TSS.IST setup for guard pages Thomas Gleixner
2019-04-05 15:07 ` [patch V2 16/29] x86/cpu: Remove orig_ist array Thomas Gleixner
2019-04-05 15:07 ` [patch V2 17/29] x86/exceptions: Disconnect IST index and stack order Thomas Gleixner
2019-04-05 21:57 ` Josh Poimboeuf
2019-04-05 22:00 ` Thomas Gleixner
2019-04-05 15:07 ` [patch V2 18/29] x86/exceptions: Enable IST guard pages Thomas Gleixner
2019-04-05 15:07 ` [patch V2 19/29] x86/exceptions: Split debug IST stack Thomas Gleixner
2019-04-05 20:55 ` Sean Christopherson
2019-04-05 21:01 ` Thomas Gleixner
2019-04-05 15:07 ` [patch V2 20/29] x86/dumpstack/64: Speedup in_exception_stack() Thomas Gleixner
2019-04-05 21:55 ` Josh Poimboeuf
2019-04-05 21:56 ` Thomas Gleixner
2019-04-05 15:07 ` [patch V2 21/29] x86/irq/32: Define IRQ_STACK_SIZE Thomas Gleixner
2019-04-05 15:07 ` [patch V2 22/29] x86/irq/32: Make irq stack a character array Thomas Gleixner
2019-04-05 15:07 ` [patch V2 23/29] x86/irq/32: Rename hard/softirq_stack to hard/softirq_stack_ptr Thomas Gleixner
2019-04-05 15:07 ` [patch V2 24/29] x86/irq/64: Rename irq_stack_ptr to hardirq_stack_ptr Thomas Gleixner
2019-04-05 15:07 ` [patch V2 25/29] x86/irq/32: Invoke irq_ctx_init() from init_IRQ() Thomas Gleixner
2019-04-05 15:27 ` Juergen Gross
2019-04-05 15:07 ` [patch V2 26/29] x86/irq/32: Handle irq stack allocation failure proper Thomas Gleixner
2019-04-05 15:07 ` [patch V2 27/29] x86/irq/64: Split the IRQ stack into its own pages Thomas Gleixner
2019-04-05 15:07 ` [patch V2 28/29] x86/irq/64: Remap the IRQ stack with guard pages Thomas Gleixner
2019-04-07 4:56 ` Andy Lutomirski
2019-04-07 6:08 ` Thomas Gleixner
2019-04-07 9:28 ` Andy Lutomirski
2019-04-07 9:34 ` Thomas Gleixner
2019-04-07 14:03 ` Andy Lutomirski
2019-04-07 22:44 ` Thomas Gleixner
2019-04-08 2:23 ` Andy Lutomirski
2019-04-08 6:46 ` Thomas Gleixner
2019-04-08 16:18 ` Andy Lutomirski
2019-04-08 16:36 ` Josh Poimboeuf
2019-04-08 16:44 ` Thomas Gleixner
2019-04-08 18:19 ` Thomas Gleixner
2019-04-05 15:07 ` [patch V2 29/29] x86/irq/64: Remove stack overflow debug code Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190405163727.GB19359@linux.intel.com \
--to=sean.j.christopherson@intel.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox