Commit 3f0b0903 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_vdso_for_v6.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 vdso updates from Borislav Petkov:

 - Add getcpu support for the 32-bit version of the vDSO

 - Some smaller fixes

* tag 'x86_vdso_for_v6.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Fix -Wmissing-prototypes warnings
  x86/vdso: Fake 32bit VDSO build on 64bit compile for vgetcpu
  selftests: Emit a warning if getcpu() is missing on 32bit
  x86/vdso: Provide getcpu for x86-32.
  x86/cpu: Provide the full setup for getcpu() on x86-32
  x86/vdso: Move VDSO image init to vdso2c generated code
parents efebca0b dac0da42

arch/x86/entry/vdso/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ VDSO32-$(CONFIG_IA32_EMULATION) := y 
# files to link into the vdso

vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o

vobjs32-y := vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o

vobjs32-y += vdso32/vclock_gettime.o

vobjs32-y += vdso32/vclock_gettime.o vdso32/vgetcpu.o

vobjs-$(CONFIG_X86_SGX)	+= vsgx.o



# files to link into kernel
@@ -104,6 +104,7 @@ $(vobjs): KBUILD_AFLAGS += -DBUILD_VDSO 
CFLAGS_REMOVE_vclock_gettime.o = -pg

CFLAGS_REMOVE_vdso32/vclock_gettime.o = -pg

CFLAGS_REMOVE_vgetcpu.o = -pg

CFLAGS_REMOVE_vdso32/vgetcpu.o = -pg

CFLAGS_REMOVE_vsgx.o = -pg



#

arch/x86/entry/vdso/vdso2c.h

+6 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, 


	fprintf(outfile, "/* AUTOMATICALLY GENERATED -- DO NOT EDIT */\n\n");

	fprintf(outfile, "#include <linux/linkage.h>\n");

	fprintf(outfile, "#include <linux/init.h>\n");

	fprintf(outfile, "#include <asm/page_types.h>\n");

	fprintf(outfile, "#include <asm/vdso.h>\n");

	fprintf(outfile, "\n");
@@ -218,5 +219,10 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, 
			fprintf(outfile, "\t.sym_%s = %" PRIi64 ",\n",

				required_syms[i].name, (int64_t)syms[i]);

	}

	fprintf(outfile, "};\n\n");

	fprintf(outfile, "static __init int init_%s(void) {\n", image_name);

	fprintf(outfile, "\treturn init_vdso_image(&%s);\n", image_name);

	fprintf(outfile, "};\n");

	fprintf(outfile, "subsys_initcall(init_%s);\n", image_name);



}

arch/x86/entry/vdso/vdso32-setup.c

+0 −9
Original line number Diff line number Diff line
@@ -51,17 +51,8 @@ __setup("vdso32=", vdso32_setup); 
__setup_param("vdso=", vdso_setup, vdso32_setup, 0);

#endif



int __init sysenter_setup(void)

{

	init_vdso_image(&vdso_image_32);



	return 0;

}



#ifdef CONFIG_X86_64



subsys_initcall(sysenter_setup);



#ifdef CONFIG_SYSCTL

/* Register vsyscall32 into the ABI table */

#include <linux/sysctl.h>

arch/x86/entry/vdso/vdso32/fake_32bit_build.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifdef CONFIG_X86_64



/*

 * in case of a 32 bit VDSO for a 64 bit kernel fake a 32 bit kernel

 * configuration

 */

#undef CONFIG_64BIT

#undef CONFIG_X86_64

#undef CONFIG_COMPAT

#undef CONFIG_PGTABLE_LEVELS

#undef CONFIG_ILLEGAL_POINTER_VALUE

#undef CONFIG_SPARSEMEM_VMEMMAP

#undef CONFIG_NR_CPUS

#undef CONFIG_PARAVIRT_XXL



#define CONFIG_X86_32 1

#define CONFIG_PGTABLE_LEVELS 2

#define CONFIG_PAGE_OFFSET 0

#define CONFIG_ILLEGAL_POINTER_VALUE 0

#define CONFIG_NR_CPUS 1



#define BUILD_VDSO32_64



#endif

arch/x86/entry/vdso/vdso32/vclock_gettime.c

+1 −26
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#define BUILD_VDSO32



#ifdef CONFIG_X86_64



/*

 * in case of a 32 bit VDSO for a 64 bit kernel fake a 32 bit kernel

 * configuration

 */

#undef CONFIG_64BIT

#undef CONFIG_X86_64

#undef CONFIG_COMPAT

#undef CONFIG_PGTABLE_LEVELS

#undef CONFIG_ILLEGAL_POINTER_VALUE

#undef CONFIG_SPARSEMEM_VMEMMAP

#undef CONFIG_NR_CPUS

#undef CONFIG_PARAVIRT_XXL



#define CONFIG_X86_32 1

#define CONFIG_PGTABLE_LEVELS 2

#define CONFIG_PAGE_OFFSET 0

#define CONFIG_ILLEGAL_POINTER_VALUE 0

#define CONFIG_NR_CPUS 1



#define BUILD_VDSO32_64



#endif



#include "fake_32bit_build.h"

#include "../vclock_gettime.c"