admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

um: Always set up AT_HWCAP and AT_PLATFORM

Browse Source 
Historically the code to set up AT_HWCAP and AT_PLATFORM was only built
for 32bit x86 as it was intermingled with the vDSO passthrough code.

Now that vDSO passthrough has been removed, always pass through AT_HWCAP
and AT_PLATFORM.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20251028-uml-remove-32bit-pseudo-vdso-v1-10-e930063eff5f@weissschuh.net
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Thomas Weißschuh
2025-10-28 10:15:45 +01:00
committed by Johannes Berg
parent 117e796fc5
commit 293f71435d
5 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/um/os-Linux/Makefile
View File

@@ -6,7 +6,7 @@
# Don't instrument UML-specific code
KCOV_INSTRUMENT := n
obj-y = execvp.o file.o helper.o irq.o main.o mem.o process.o \
obj-y = elf_aux.o execvp.o file.o helper.o irq.o main.o mem.o process.o \
registers.o sigio.o signal.o start_up.o time.o tty.o \
umid.o user_syms.o util.o skas/
@@ -14,8 +14,6 @@ CFLAGS_signal.o += -Wframe-larger-than=4096
CFLAGS_main.o += -Wno-frame-larger-than
obj-$(CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA) += elf_aux.o
obj-$(CONFIG_SMP) += smp.o
USER_OBJS := $(user-objs-y) elf_aux.o execvp.o file.o helper.o irq.o \

7
arch/um/os-Linux/elf_aux.c
View File

@@ -14,12 +14,17 @@
#include <elf_user.h>
#include <mem_user.h>
#include "internal.h"
#include <linux/swab.h>
#if __BITS_PER_LONG == 64
typedef Elf64_auxv_t elf_auxv_t;
#else
typedef Elf32_auxv_t elf_auxv_t;
#endif
/* These are initialized very early in boot and never changed */
char * elf_aux_platform;
extern long elf_aux_hwcap;
long elf_aux_hwcap;
__init void scan_elf_aux( char **envp)
{

4
arch/um/os-Linux/main.c
View File

@@ -21,8 +21,6 @@
#define STACKSIZE (8 * 1024 * 1024)
long elf_aux_hwcap;
static void __init set_stklim(void)
{
struct rlimit lim;
@@ -149,9 +147,7 @@ int __init main(int argc, char **argv, char **envp)
install_fatal_handler(SIGINT);
install_fatal_handler(SIGTERM);
#ifdef CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA
scan_elf_aux(envp);
#endif
change_sig(SIGPIPE, 0);
ret = linux_main(argc, argv, envp);

3
arch/x86/um/Kconfig
View File

@@ -34,8 +34,5 @@ config X86_64
config ARCH_HAS_SC_SIGNALS
def_bool !64BIT
config ARCH_REUSE_HOST_VSYSCALL_AREA
def_bool !64BIT
config GENERIC_HWEIGHT
def_bool y

7
arch/x86/um/asm/elf.h
View File

@@ -68,9 +68,7 @@
pr_reg[16] = PT_REGS_SS(regs); \
} while (0);
extern char * elf_aux_platform;
#define ELF_PLATFORM_FALLBACK "i586"
#define ELF_PLATFORM (elf_aux_platform ?: ELF_PLATFORM_FALLBACK)
#else
@@ -151,7 +149,7 @@ extern char * elf_aux_platform;
(pr_reg)[25] = 0; \
(pr_reg)[26] = 0;
#define ELF_PLATFORM "x86_64"
#define ELF_PLATFORM_FALLBACK "x86_64"
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
struct linux_binprm;
@@ -180,6 +178,9 @@ struct task_struct;
extern long elf_aux_hwcap;
#define ELF_HWCAP (elf_aux_hwcap)
extern char *elf_aux_platform;
#define ELF_PLATFORM (elf_aux_platform ?: ELF_PLATFORM_FALLBACK)
#define SET_PERSONALITY(ex) do {} while(0)
#endif