Commit 9729dcea authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Thomas Gleixner
Browse files

x86/vdso/vdso2c: Remove page handling 



The values are not used anymore.
Also the sanity checks performed by vdso2c can never trigger as they
only validate invariants already enforced by the linker script.

Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250204-vdso-store-rng-v3-16-13a4669dfc8c@linutronix.de
parent dafde296

arch/x86/entry/vdso/vdso-layout.lds.S

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ SECTIONS 
	pvclock_page = vclock_pages + VDSO_PAGE_PVCLOCK_OFFSET * PAGE_SIZE;

	hvclock_page = vclock_pages + VDSO_PAGE_HVCLOCK_OFFSET * PAGE_SIZE;



	/* For compatibility with vdso2c */

	vvar_page = vdso_u_data;

	vvar_start = vdso_u_data;



	. = SIZEOF_HEADERS;



	.hash		: { *(.hash) }			:text

arch/x86/entry/vdso/vdso2c.c

+0 −21
Original line number Diff line number Diff line
@@ -69,33 +69,12 @@ 


const char *outfilename;



/* Symbols that we need in vdso2c. */

enum {

	sym_vvar_start,

	sym_vvar_page,

	sym_pvclock_page,

	sym_hvclock_page,

	sym_timens_page,

};



const int special_pages[] = {

	sym_vvar_page,

	sym_pvclock_page,

	sym_hvclock_page,

	sym_timens_page,

};



struct vdso_sym {

	const char *name;

	bool export;

};



struct vdso_sym required_syms[] = {

	[sym_vvar_start] = {"vvar_start", true},

	[sym_vvar_page] = {"vvar_page", true},

	[sym_pvclock_page] = {"pvclock_page", true},

	[sym_hvclock_page] = {"hvclock_page", true},

	[sym_timens_page] = {"timens_page", true},

	{"VDSO32_NOTE_MASK", true},

	{"__kernel_vsyscall", true},

	{"__kernel_sigreturn", true},

arch/x86/entry/vdso/vdso2c.h

+0 −20
Original line number Diff line number Diff line
@@ -150,26 +150,6 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, 
		}

	}



	/* Validate mapping addresses. */

	for (i = 0; i < sizeof(special_pages) / sizeof(special_pages[0]); i++) {

		INT_BITS symval = syms[special_pages[i]];



		if (!symval)

			continue;  /* The mapping isn't used; ignore it. */



		if (symval % 4096)

			fail("%s must be a multiple of 4096\n",

			     required_syms[i].name);

		if (symval + 4096 < syms[sym_vvar_start])

			fail("%s underruns vvar_start\n",

			     required_syms[i].name);

		if (symval + 4096 > 0)

			fail("%s is on the wrong side of the vdso text\n",

			     required_syms[i].name);

	}

	if (syms[sym_vvar_start] % 4096)

		fail("vvar_begin must be a multiple of 4096\n");



	if (!image_name) {

		fwrite(stripped_addr, stripped_len, 1, outfile);

		return;

arch/x86/include/asm/vdso.h

+0 −6
Original line number Diff line number Diff line
@@ -18,12 +18,6 @@ struct vdso_image { 
	unsigned long extable_base, extable_len;

	const void *extable;



	long sym_vvar_start;  /* Negative offset to the vvar area */



	long sym_vvar_page;

	long sym_pvclock_page;

	long sym_hvclock_page;

	long sym_timens_page;

	long sym_VDSO32_NOTE_MASK;

	long sym___kernel_sigreturn;

	long sym___kernel_rt_sigreturn;