[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251026221208.1938173-1-hpa@zytor.com>
Date: Sun, 26 Oct 2025 15:12:00 -0700
From: "H. Peter Anvin" <hpa@...or.com>
To: "H. Peter Anvin" <hpa@...or.com>, "Jason A. Donenfeld" <Jason@...c4.com>,
"Peter Zijlstra (Intel)" <peterz@...radead.org>,
"Theodore Ts'o" <tytso@....edu>,
Thomas Weißschuh <thomas.weissschuh@...utronix.de>,
Xin Li <xin@...or.com>, Andrew Cooper <andrew.cooper3@...rix.com>,
Andy Lutomirski <luto@...nel.org>, Ard Biesheuvel <ardb@...nel.org>,
Borislav Petkov <bp@...en8.de>, Brian Gerst <brgerst@...il.com>,
Dave Hansen <dave.hansen@...ux.intel.com>,
Ingo Molnar <mingo@...hat.com>, James Morse <james.morse@....com>,
Jarkko Sakkinen <jarkko@...nel.org>,
Josh Poimboeuf <jpoimboe@...nel.org>, Kees Cook <kees@...nel.org>,
Nam Cao <namcao@...utronix.de>, Oleg Nesterov <oleg@...hat.com>,
Perry Yuan <perry.yuan@....com>, Thomas Gleixner <tglx@...utronix.de>,
Thomas Huth <thuth@...hat.com>, Uros Bizjak <ubizjak@...il.com>,
linux-kernel@...r.kernel.org, linux-mm@...ck.org,
linux-sgx@...r.kernel.org, x86@...nel.org
Subject: [PATCH 0/6] x86/entry/vdso: cleanups for vdso build and 32-bit vdso
From: "H. Peter Anvin" (Intel) <hpa@...or.com>
This patchset cleans up the vdso build by building the 32- and 64-bit
vdsos in separate directories, moving the vdso2c tool to
arch/x86/tools, and by merging common code and especially Makefile
rules between the 32- and 64-bit vdsos to the greatest extent
possible.
Be more strict about sanitizing and standardizing the vdso build options.
If the vdso is build with CET endbr support, add an endbr32
instruction to system_call.S.
x86/entry/vdso: rename vdso_image_* to vdso*_image
x86/entry/vdso: refactor the vdso build
x86/entry/vdso32: remove int80_landing_pad
x86/entry/vdso32: remove SYSCALL_ENTER_KERNEL macro in sigreturn.S
x86/entry/vdso32: remove open-coded DWARF in sigreturn.S
x86/entry/vdso32: add endbr32 to system_call.S
Overall, the patchset removes 90 lines of code. Although it touches a
lot of files, the vast majority is just code movement and/or
deduplication.
-hpa
---
arch/x86/Makefile | 2 +-
arch/x86/entry/syscall_32.c | 2 +-
arch/x86/entry/vdso/.gitignore | 11 +-
arch/x86/entry/vdso/Makefile | 162 +--------------------
arch/x86/entry/vdso/common/Makefile.include | 83 +++++++++++
arch/x86/entry/vdso/{vdso-note.S => common/note.S} | 5 +-
arch/x86/entry/vdso/{ => common}/vclock_gettime.c | 0
arch/x86/entry/vdso/{ => common}/vdso-layout.lds.S | 0
arch/x86/entry/vdso/{ => common}/vgetcpu.c | 0
arch/x86/entry/vdso/vdso32/Makefile | 24 +++
arch/x86/entry/vdso/vdso32/note.S | 19 +--
arch/x86/entry/vdso/vdso32/sigreturn.S | 152 +++++--------------
arch/x86/entry/vdso/vdso32/system_call.S | 10 +-
arch/x86/entry/vdso/vdso32/vclock_gettime.c | 5 +-
arch/x86/entry/vdso/vdso32/vdso32.lds.S | 2 +-
arch/x86/entry/vdso/vdso32/vgetcpu.c | 4 +-
arch/x86/entry/vdso/vdso64/Makefile | 45 ++++++
arch/x86/entry/vdso/vdso64/note.S | 1 +
arch/x86/entry/vdso/vdso64/vclock_gettime.c | 1 +
.../entry/vdso/{vdso.lds.S => vdso64/vdso64.lds.S} | 2 +-
arch/x86/entry/vdso/{ => vdso64}/vdsox32.lds.S | 2 +-
arch/x86/entry/vdso/vdso64/vgetcpu.c | 1 +
.../entry/vdso/{ => vdso64}/vgetrandom-chacha.S | 0
arch/x86/entry/vdso/{ => vdso64}/vgetrandom.c | 2 +-
arch/x86/entry/vdso/{ => vdso64}/vsgx.S | 0
arch/x86/entry/vdso/vma.c | 24 ++-
arch/x86/include/asm/dwarf2.h | 1 +
arch/x86/include/asm/elf.h | 2 +-
arch/x86/include/asm/vdso.h | 6 +-
arch/x86/kernel/asm-offsets.c | 6 +
arch/x86/kernel/process_64.c | 6 +-
arch/x86/kernel/signal_32.c | 4 +-
arch/x86/tools/Makefile | 15 +-
arch/x86/{entry/vdso => tools}/vdso2c.c | 1 -
arch/x86/{entry/vdso => tools}/vdso2c.h | 0
35 files changed, 255 insertions(+), 345 deletions(-)
Powered by blists - more mailing lists