Commit 3ef32d90 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Thomas Gleixner
Browse files

x86/vdso: Fix latent bug in vclock_pages calculation 



The vclock pages are *after* the non-vclock pages. Currently there are both
two vclock and two non-vclock pages so the existing logic works by
accident.  As soon as the number of pages changes it will break however.
This will be the case with the introduction of the generic vDSO data
storage.

Use a macro to keep the calculation understandable and in sync between
the linker script and mapping code.

Fixes: e93d2521 ("x86/vdso: Split virtual clock pages into dedicated mapping")
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-1-13a4669dfc8c@linutronix.de
parent a64dcfb4

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ SECTIONS 


	timens_page  = vvar_start + PAGE_SIZE;



	vclock_pages = vvar_start + VDSO_NR_VCLOCK_PAGES * PAGE_SIZE;

	vclock_pages = VDSO_VCLOCK_PAGES_START(vvar_start);

	pvclock_page = vclock_pages + VDSO_PAGE_PVCLOCK_OFFSET * PAGE_SIZE;

	hvclock_page = vclock_pages + VDSO_PAGE_HVCLOCK_OFFSET * PAGE_SIZE;

arch/x86/entry/vdso/vma.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr) 
	}



	vma = _install_special_mapping(mm,

				       addr + (__VVAR_PAGES - VDSO_NR_VCLOCK_PAGES) * PAGE_SIZE,

				       VDSO_VCLOCK_PAGES_START(addr),

				       VDSO_NR_VCLOCK_PAGES * PAGE_SIZE,

				       VM_READ|VM_MAYREAD|VM_IO|VM_DONTDUMP|

				       VM_PFNMAP,

arch/x86/include/asm/vdso/vsyscall.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#define __VVAR_PAGES	4



#define VDSO_NR_VCLOCK_PAGES	2

#define VDSO_VCLOCK_PAGES_START(_b)	((_b) + (__VVAR_PAGES - VDSO_NR_VCLOCK_PAGES) * PAGE_SIZE)

#define VDSO_PAGE_PVCLOCK_OFFSET	0

#define VDSO_PAGE_HVCLOCK_OFFSET	1