Messages in this thread Patch in this message | | | Date | Mon, 27 Nov 2017 10:49:56 +0100 | From | Ingo Molnar <> | Subject | Re: [PATCH] x86/orc: Don't bail on stack overflow |
| |
* Ingo Molnar <mingo@kernel.org> wrote:
> Will only push it out if it passes testing.
So far it required the small fix below for 32-bit.
Thanks,
Ingo
--- arch/x86/kernel/dumpstack.c | 7 +++++++ arch/x86/kernel/process_64.c | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index f7f3b5b3bc05..f214f7a6ccad 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -68,6 +68,13 @@ static void printk_stack_address(unsigned long address, int reliable, printk("%s %s%pB\n", log_lvl, reliable ? "" : "? ", (void *)address); } +void show_iret_regs(struct pt_regs *regs) +{ + printk(KERN_DEFAULT "RIP: %04x:%pS\n", (int)regs->cs, (void *)regs->ip); + printk(KERN_DEFAULT "RSP: %04x:%016lx EFLAGS: %08lx", (int)regs->ss, + regs->sp, regs->flags); +} + static void show_regs_safe(struct stack_info *info, struct pt_regs *regs) { if (on_stack(info, regs, sizeof(*regs))) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 2e0e2979e34d..631e229ab428 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -61,13 +61,6 @@ __visible DEFINE_PER_CPU_USER_MAPPED(unsigned long, rsp_scratch); -void show_iret_regs(struct pt_regs *regs) -{ - printk(KERN_DEFAULT "RIP: %04lx:%pS\n", regs->cs, (void *)regs->ip); - printk(KERN_DEFAULT "RSP: %04lx:%016lx EFLAGS: %08lx", regs->ss, - regs->sp, regs->flags); -} - /* Prints also some state that isn't saved in the pt_regs */ void __show_regs(struct pt_regs *regs, int all) {
| |