Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f40c3300 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by H. Peter Anvin
Browse files

x86, vdso: Move the vvar and hpet mappings next to the 64-bit vDSO 



This makes the 64-bit and x32 vdsos use the same mechanism as the
32-bit vdso.  Most of the churn is deleting all the old fixmap code.

Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/8af87023f57f6bb96ec8d17fce3f88018195b49b.1399317206.git.luto@amacapital.net


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 18d0a6fd

arch/x86/include/asm/fixmap.h

+4 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/threads.h>

#include <asm/kmap_types.h>

#else

#include <asm/vsyscall.h>

#include <uapi/asm/vsyscall.h>

#endif



/*
@@ -41,7 +41,8 @@ 
extern unsigned long __FIXADDR_TOP;

#define FIXADDR_TOP	((unsigned long)__FIXADDR_TOP)

#else

#define FIXADDR_TOP	(VSYSCALL_END-PAGE_SIZE)

#define FIXADDR_TOP	(round_up(VSYSCALL_ADDR + PAGE_SIZE, 1<<PMD_SHIFT) - \

			 PAGE_SIZE)

#endif
@@ -68,11 +69,7 @@ enum fixed_addresses { 
#ifdef CONFIG_X86_32

	FIX_HOLE,

#else

	VSYSCALL_LAST_PAGE,

	VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE

			    + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,

	VVAR_PAGE,

	VSYSCALL_HPET,

	VSYSCALL_PAGE = (FIXADDR_TOP - VSYSCALL_ADDR) >> PAGE_SHIFT,

#ifdef CONFIG_PARAVIRT_CLOCK

	PVCLOCK_FIXMAP_BEGIN,

	PVCLOCK_FIXMAP_END = PVCLOCK_FIXMAP_BEGIN+PVCLOCK_VSYSCALL_NR_PAGES-1,

arch/x86/include/asm/vvar.h

+1 −19
Original line number Diff line number Diff line
@@ -29,31 +29,13 @@ 


#else



#ifdef BUILD_VDSO32

extern char __vvar_page;



#define DECLARE_VVAR(offset, type, name)				\

	extern type vvar_ ## name __attribute__((visibility("hidden")));



#define VVAR(name) (vvar_ ## name)



#else



extern char __vvar_page;



/* Base address of vvars.  This is not ABI. */

#ifdef CONFIG_X86_64

#define VVAR_ADDRESS (-10*1024*1024 - 4096)

#else

#define VVAR_ADDRESS (&__vvar_page)

#endif



#define DECLARE_VVAR(offset, type, name)				\

	static type const * const vvaraddr_ ## name =			\

		(void *)(VVAR_ADDRESS + (offset));



#define VVAR(name) (*vvaraddr_ ## name)

#endif



#define DEFINE_VVAR(type, name)						\

	type name							\

	__attribute__((section(".vvar_" #name), aligned(16))) __visible

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

+1 −6
Original line number Diff line number Diff line
@@ -7,11 +7,6 @@ enum vsyscall_num { 
	__NR_vgetcpu,

};



#define VSYSCALL_START (-10UL << 20)

#define VSYSCALL_SIZE 1024

#define VSYSCALL_END (-2UL << 20)

#define VSYSCALL_MAPPED_PAGES 1

#define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr))



#define VSYSCALL_ADDR (-10UL << 20)



#endif /* _UAPI_ASM_X86_VSYSCALL_H */

arch/x86/kernel/cpu/common.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <asm/processor.h>

#include <asm/debugreg.h>

#include <asm/sections.h>

#include <asm/vsyscall.h>

#include <linux/topology.h>

#include <linux/cpumask.h>

#include <asm/pgtable.h>

arch/x86/kernel/hpet.c

+0 −3
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ static inline void hpet_writel(unsigned int d, unsigned int a) 
static inline void hpet_set_mapping(void)

{

	hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);

#ifdef CONFIG_X86_64

	__set_fixmap(VSYSCALL_HPET, hpet_address, PAGE_KERNEL_VVAR_NOCACHE);

#endif

}



static inline void hpet_clear_mapping(void)