From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751736AbdK0JuB (ORCPT ); Mon, 27 Nov 2017 04:50:01 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33203 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbdK0Jt7 (ORCPT ); Mon, 27 Nov 2017 04:49:59 -0500 X-Google-Smtp-Source: AGs4zMbH6C9ioX85A9gwI8k7YVOqtcAv7ol+oR8KJAKW+3mYU9S6ZNb3FlZz9OUfyjncYSvbcvgd7Q== Date: Mon, 27 Nov 2017 10:49:56 +0100 From: Ingo Molnar To: Josh Poimboeuf Cc: Andy Lutomirski , Thomas Gleixner , X86 ML , Borislav Petkov , "linux-kernel@vger.kernel.org" , Brian Gerst , Dave Hansen , Linus Torvalds Subject: Re: [PATCH] x86/orc: Don't bail on stack overflow Message-ID: <20171127094956.bjpzlq4p6rzgpane@gmail.com> References: <7b2c3ad96fb62afbc095bd7ba8a93022480153cb.1511630836.git.luto@kernel.org> <20171126024031.uxi4numpbjm5rlbr@treble> <20171127093842.xppvp53ozr2av4lg@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171127093842.xppvp53ozr2av4lg@gmail.com> User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Ingo Molnar 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) {