Return-Path: Received: from mx2.suse.de ([195.135.220.15]:32971 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751949AbeBAMQF (ORCPT ); Thu, 1 Feb 2018 07:16:05 -0500 From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Cc: boris.ostrovsky@oracle.com, Juergen Gross , stable@vger.kernel.org Subject: [PATCH] x86/xen: init %gs very early to avoid page faults with stack protector Date: Thu, 1 Feb 2018 13:16:01 +0100 Message-Id: <20180201121601.1268-1-jgross@suse.com> Sender: stable-owner@vger.kernel.org List-ID: When running as Xen pv guest %gs is initialized some time after C code is started. Depending on stack protector usage this might be too late, resulting in page faults. So setup %gs and MSR_GS_BASE in assembly code already. Cc: stable@vger.kernel.org Signed-off-by: Juergen Gross --- arch/x86/xen/xen-head.S | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 497cc55a0c16..b47d87076efb 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -9,7 +9,9 @@ #include #include +#include #include +#include #include #include @@ -35,6 +37,18 @@ ENTRY(startup_xen) mov %_ASM_SI, xen_start_info mov $init_thread_union+THREAD_SIZE, %_ASM_SP + /* Set up %gs. + * + * The base of %gs always points to the bottom of the irqstack + * union. If the stack protector canary is enabled, it is + * located at %gs:40. Note that, on SMP, the boot cpu uses + * init data section till per cpu areas are set up. + */ + movl $MSR_GS_BASE,%ecx + movq $INIT_PER_CPU_VAR(irq_stack_union),%rax + cdq + wrmsr + jmp xen_start_kernel END(startup_xen) __FINIT -- 2.13.6