From: "Hou Wenlong" <houwenlong.hwl@antgroup.com>
To: Juergen Gross <jgross@suse.com>
Cc: linux-kernel@vger.kernel.org,
"Thomas Garnier" <thgarnie@chromium.org>,
"Lai Jiangshan" <jiangshan.ljs@antgroup.com>,
"Kees Cook" <keescook@chromium.org>,
"Brian Gerst" <brgerst@gmail.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Borislav Petkov" <bp@alien8.de>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
"Andy Lutomirski" <luto@kernel.org>,
"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
"Darren Hart" <dvhart@infradead.org>,
"Andy Shevchenko" <andy@infradead.org>,
"Nathan Chancellor" <nathan@kernel.org>,
"Nick Desaulniers" <ndesaulniers@google.com>,
"Tom Rix" <trix@redhat.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Mike Rapoport (IBM)" <rppt@kernel.org>,
"Ashok Raj" <ashok.raj@intel.com>,
"Rick Edgecombe" <rick.p.edgecombe@intel.com>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Guo Ren" <guoren@kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Jason A. Donenfeld" <Jason@zx2c4.com>,
"Pawan Gupta" <pawan.kumar.gupta@linux.intel.com>,
"Kim Phillips" <kim.phillips@amd.com>,
"David Woodhouse" <dwmw@amazon.co.uk>,
"Josh Poimboeuf" <jpoimboe@kernel.org>,
xen-devel@lists.xenproject.org,
platform-driver-x86@vger.kernel.org, llvm@lists.linux.dev
Subject: Re: [PATCH RFC 16/43] x86-64: Use per-cpu stack canary if supported by compiler
Date: Fri, 05 May 2023 11:09:56 +0800 [thread overview]
Message-ID: <20230505030956.GA103506@k08j02272.eu95sqa> (raw)
In-Reply-To: <edd4b974-08de-0769-0dba-f945ed06f222@suse.com>
On Thu, May 04, 2023 at 12:31:59PM +0200, Juergen Gross wrote:
> On 28.04.23 11:50, Hou Wenlong wrote:
> >From: Brian Gerst <brgerst@gmail.com>
> >
> >From: Brian Gerst <brgerst@gmail.com>
> >
> >If the compiler supports it, use a standard per-cpu variable for the
> >stack protector instead of the old fixed location. Keep the fixed
> >location code for compatibility with older compilers.
> >
> >[Hou Wenlong: Disable it on Clang, adapt new code change and adapt
> >missing GS set up path in pvh_start_xen()]
> >
> >Signed-off-by: Brian Gerst <brgerst@gmail.com>
> >Co-developed-by: Hou Wenlong <houwenlong.hwl@antgroup.com>
> >Signed-off-by: Hou Wenlong <houwenlong.hwl@antgroup.com>
> >Cc: Thomas Garnier <thgarnie@chromium.org>
> >Cc: Lai Jiangshan <jiangshan.ljs@antgroup.com>
> >Cc: Kees Cook <keescook@chromium.org>
> >---
> > arch/x86/Kconfig | 12 ++++++++++++
> > arch/x86/Makefile | 21 ++++++++++++++-------
> > arch/x86/entry/entry_64.S | 6 +++++-
> > arch/x86/include/asm/processor.h | 17 ++++++++++++-----
> > arch/x86/include/asm/stackprotector.h | 16 +++++++---------
> > arch/x86/kernel/asm-offsets_64.c | 2 +-
> > arch/x86/kernel/cpu/common.c | 15 +++++++--------
> > arch/x86/kernel/head_64.S | 16 ++++++++++------
> > arch/x86/kernel/vmlinux.lds.S | 4 +++-
> > arch/x86/platform/pvh/head.S | 8 ++++++++
> > arch/x86/xen/xen-head.S | 14 +++++++++-----
> > 11 files changed, 88 insertions(+), 43 deletions(-)
> >
>
> ...
>
> >diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
> >index 643d02900fbb..09eaf59e8066 100644
> >--- a/arch/x86/xen/xen-head.S
> >+++ b/arch/x86/xen/xen-head.S
> >@@ -51,15 +51,19 @@ SYM_CODE_START(startup_xen)
> > leaq (__end_init_task - PTREGS_SIZE)(%rip), %rsp
> >- /* Set up %gs.
> >- *
> >- * The base of %gs always points to fixed_percpu_data. If the
> >- * stack protector canary is enabled, it is located at %gs:40.
> >+ /*
> >+ * Set up GS base.
> > * Note that, on SMP, the boot cpu uses init data section until
> > * the per cpu areas are set up.
> > */
> > movl $MSR_GS_BASE,%ecx
> >- movq $INIT_PER_CPU_VAR(fixed_percpu_data),%rax
> >+#if defined(CONFIG_STACKPROTECTOR_FIXED)
> >+ leaq INIT_PER_CPU_VAR(fixed_percpu_data)(%rip), %rdx
> >+#elif defined(CONFIG_SMP)
> >+ movabs $__per_cpu_load, %rdx
>
> Shouldn't above 2 targets be %rax?
>
Ah yes, my mistake. I didn't test it on XEN guest, sorry,
I'll test XEN guest before the next submission.
Thanks.
> >+#else
> >+ xorl %eax, %eax
> >+#endif
> > cdq
> > wrmsr
>
>
> Juergen
> pub 2048R/28BF132F 2014-06-02 Juergen Gross <jg@pfupf.net>
> uid Juergen Gross <jgross@suse.com>
> uid Juergen Gross <jgross@novell.com>
> uid Juergen Gross <jgross@suse.de>
> sub 2048R/16375B53 2014-06-02
next prev parent reply other threads:[~2023-05-05 3:10 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-28 9:50 [PATCH RFC 00/43] x86/pie: Make kernel image's virtual address flexible Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 01/43] x86/crypto: Adapt assembly for PIE support Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 02/43] x86: Add macro to get symbol address " Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 03/43] x86: relocate_kernel - Adapt assembly " Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 04/43] x86/entry/64: " Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 05/43] x86: pm-trace: " Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 06/43] x86/CPU: " Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 07/43] x86/acpi: " Hou Wenlong
2023-04-28 11:32 ` Rafael J. Wysocki
2023-04-28 9:50 ` [PATCH RFC 08/43] x86/boot/64: " Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 09/43] x86/power/64: " Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 10/43] x86/alternatives: " Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 11/43] x86/irq: " Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 12/43] x86,rethook: " Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 13/43] x86/paravirt: Use relative reference for original instruction Hou Wenlong
2023-06-01 9:29 ` Juergen Gross
2023-06-05 6:40 ` Nadav Amit
2023-06-06 11:35 ` Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 14/43] x86/Kconfig: Introduce new Kconfig for PIE kernel building Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 15/43] x86/PVH: Use fixed_percpu_data to set up GS base Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 16/43] x86-64: Use per-cpu stack canary if supported by compiler Hou Wenlong
2023-05-01 17:27 ` Nick Desaulniers
2023-05-05 6:14 ` Hou Wenlong
2023-05-05 18:02 ` Nick Desaulniers
2023-05-05 19:06 ` Fangrui Song
2023-05-08 8:06 ` Hou Wenlong
2023-05-04 10:31 ` Juergen Gross
2023-05-05 3:09 ` Hou Wenlong [this message]
2023-04-28 9:50 ` [PATCH RFC 17/43] x86/pie: Enable stack protector only if per-cpu stack canary is supported Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 18/43] x86/percpu: Use PC-relative addressing for percpu variable references Hou Wenlong
2023-04-28 9:50 ` [PATCH RFC 19/43] x86/tools: Explicitly include autoconf.h for hostprogs Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 20/43] x86/percpu: Adapt percpu references relocation for PIE support Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 21/43] x86/ftrace: Adapt assembly " Hou Wenlong
2023-04-28 13:37 ` Steven Rostedt
2023-04-29 3:43 ` Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 22/43] x86/ftrace: Adapt ftrace nop patching " Hou Wenlong
2023-04-28 13:44 ` Steven Rostedt
2023-04-29 3:38 ` Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 23/43] x86/pie: Force hidden visibility for all symbol references Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 24/43] x86/boot/compressed: Adapt sed command to generate voffset.h when PIE is enabled Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 25/43] x86/mm: Make the x86 GOT read-only Hou Wenlong
2023-04-30 14:23 ` Ard Biesheuvel
2023-05-08 11:40 ` Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 26/43] x86/pie: Add .data.rel.* sections into link script Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 27/43] x86/relocs: Handle PIE relocations Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 28/43] KVM: x86: Adapt assembly for PIE support Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 29/43] x86/PVH: Adapt PVH booting " Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 30/43] x86/bpf: Adapt BPF_CALL JIT codegen " Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 31/43] x86/modules: Adapt module loading " Hou Wenlong
2023-04-28 19:29 ` Ard Biesheuvel
2023-05-08 8:32 ` Hou Wenlong
2023-05-08 9:16 ` Ard Biesheuvel
2023-05-08 11:40 ` Hou Wenlong
2023-05-08 17:47 ` Ard Biesheuvel
2023-05-09 9:42 ` Hou Wenlong
2023-05-09 9:52 ` Ard Biesheuvel
2023-05-09 12:35 ` Hou Wenlong
2023-05-10 7:09 ` Hou Wenlong
2023-05-10 8:15 ` Ard Biesheuvel
2023-04-28 9:51 ` [PATCH RFC 32/43] x86/boot/64: Use data relocation to get absloute address when PIE is enabled Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 33/43] objtool: Add validation for x86 PIE support Hou Wenlong
2023-04-28 10:28 ` Christophe Leroy
2023-04-28 11:43 ` Peter Zijlstra
2023-04-29 4:04 ` Hou Wenlong
2023-04-29 3:52 ` Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 34/43] objtool: Adapt indirect call of __fentry__() for " Hou Wenlong
2023-04-28 15:18 ` Peter Zijlstra
2023-04-28 9:51 ` [PATCH RFC 35/43] x86/pie: Build the kernel as PIE Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 36/43] x86/vsyscall: Don't use set_fixmap() to map vsyscall page Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 37/43] x86/xen: Pin up to VSYSCALL_ADDR when vsyscall page is out of fixmap area Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 38/43] x86/fixmap: Move vsyscall page " Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 39/43] x86/fixmap: Unify FIXADDR_TOP Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 40/43] x86/boot: Fill kernel image puds dynamically Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 41/43] x86/mm: Sort address_markers array when X86 PIE is enabled Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 42/43] x86/pie: Allow kernel image to be relocated in top 512G Hou Wenlong
2023-04-28 9:51 ` [PATCH RFC 43/43] x86/boot: Extend relocate range for PIE kernel image Hou Wenlong
2023-04-28 15:22 ` [PATCH RFC 00/43] x86/pie: Make kernel image's virtual address flexible Peter Zijlstra
2023-05-06 7:19 ` Hou Wenlong
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=20230505030956.GA103506@k08j02272.eu95sqa \
--to=houwenlong.hwl@antgroup.com \
--cc=Jason@zx2c4.com \
--cc=andy@infradead.org \
--cc=ashok.raj@intel.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=dvhart@infradead.org \
--cc=dwmw@amazon.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=guoren@kernel.org \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=jiangshan.ljs@antgroup.com \
--cc=jpoimboe@kernel.org \
--cc=keescook@chromium.org \
--cc=kim.phillips@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=peterz@infradead.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rick.p.edgecombe@intel.com \
--cc=rppt@kernel.org \
--cc=tglx@linutronix.de \
--cc=thgarnie@chromium.org \
--cc=trix@redhat.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.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
all inboxes | Powered by JetHome®