Commit b95a8a27 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/vdso: Use generic VDSO clock mode storage 



Switch to the generic VDSO clock mode storage.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com> (VDSO parts)
Acked-by: Juergen Gross <jgross@suse.com> (Xen parts)
Acked-by: Paolo Bonzini <pbonzini@redhat.com> (KVM parts)
Link: https://lkml.kernel.org/r/20200207124403.152039903@linutronix.de
parent 5d51bee7

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ config X86 
	select ACPI_LEGACY_TABLES_LOOKUP	if ACPI

	select ACPI_SYSTEM_POWER_STATES_SUPPORT	if ACPI

	select ARCH_32BIT_OFF_T			if X86_32

	select ARCH_CLOCKSOURCE_DATA

	select ARCH_CLOCKSOURCE_INIT

	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI

	select ARCH_HAS_DEBUG_VIRTUAL
@@ -126,6 +125,7 @@ config X86 
	select GENERIC_STRNLEN_USER

	select GENERIC_TIME_VSYSCALL

	select GENERIC_GETTIMEOFDAY

	select GENERIC_VDSO_CLOCK_MODE

	select GENERIC_VDSO_TIME_NS

	select GUP_GET_PTE_LOW_HIGH		if X86_PAE

	select HARDLOCKUP_CHECK_TIMESTAMP	if X86_64

arch/x86/entry/vdso/vma.c

+3 −3
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm, 
	} else if (sym_offset == image->sym_pvclock_page) {

		struct pvclock_vsyscall_time_info *pvti =

			pvclock_get_pvti_cpu0_va();

		if (pvti && vclock_was_used(VCLOCK_PVCLOCK)) {

		if (pvti && vclock_was_used(VDSO_CLOCKMODE_PVCLOCK)) {

			return vmf_insert_pfn_prot(vma, vmf->address,

					__pa(pvti) >> PAGE_SHIFT,

					pgprot_decrypted(vma->vm_page_prot));
@@ -229,7 +229,7 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm, 
	} else if (sym_offset == image->sym_hvclock_page) {

		struct ms_hyperv_tsc_page *tsc_pg = hv_get_tsc_page();



		if (tsc_pg && vclock_was_used(VCLOCK_HVCLOCK))

		if (tsc_pg && vclock_was_used(VDSO_CLOCKMODE_HVCLOCK))

			return vmf_insert_pfn(vma, vmf->address,

					virt_to_phys(tsc_pg) >> PAGE_SHIFT);

	} else if (sym_offset == image->sym_timens_page) {
@@ -447,7 +447,7 @@ __setup("vdso=", vdso_setup); 


static int __init init_vdso(void)

{

	BUILD_BUG_ON(VCLOCK_MAX >= 32);

	BUILD_BUG_ON(VDSO_CLOCKMODE_MAX >= 32);



	init_vdso_image(&vdso_image_64);

arch/x86/include/asm/clocksource.h

+4 −9
Original line number Diff line number Diff line
@@ -4,15 +4,10 @@ 
#ifndef _ASM_X86_CLOCKSOURCE_H

#define _ASM_X86_CLOCKSOURCE_H



#define VCLOCK_NONE	0	/* No vDSO clock available.		*/

#define VCLOCK_TSC	1	/* vDSO should use vread_tsc.		*/

#define VCLOCK_PVCLOCK	2	/* vDSO should use vread_pvclock.	*/

#define VCLOCK_HVCLOCK	3	/* vDSO should use vread_hvclock.	*/

#define VCLOCK_MAX	3



struct arch_clocksource_data {

	int vclock_mode;

};

#define VDSO_ARCH_CLOCKMODES	\

	VDSO_CLOCKMODE_TSC,	\

	VDSO_CLOCKMODE_PVCLOCK,	\

	VDSO_CLOCKMODE_HVCLOCK



extern unsigned int vclocks_used;

arch/x86/include/asm/mshyperv.h

+2 −2
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ typedef int (*hyperv_fill_flush_list_func)( 
#define hv_set_reference_tsc(val) \

	wrmsrl(HV_X64_MSR_REFERENCE_TSC, val)

#define hv_set_clocksource_vdso(val) \

	((val).archdata.vclock_mode = VCLOCK_HVCLOCK)

	((val).vdso_clock_mode = VDSO_CLOCKMODE_HVCLOCK)

#define hv_enable_vdso_clocksource() \

	vclocks_set_used(VCLOCK_HVCLOCK);

	vclocks_set_used(VDSO_CLOCKMODE_HVCLOCK);

#define hv_get_raw_timer() rdtsc_ordered()



void hyperv_callback_vector(void);

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

+3 −3
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static u64 vread_hvclock(void) 


static inline u64 __arch_get_hw_counter(s32 clock_mode)

{

	if (likely(clock_mode == VCLOCK_TSC))

	if (likely(clock_mode == VDSO_CLOCKMODE_TSC))

		return (u64)rdtsc_ordered();

	/*

	 * For any memory-mapped vclock type, we need to make sure that gcc
@@ -252,13 +252,13 @@ static inline u64 __arch_get_hw_counter(s32 clock_mode) 
	 * question isn't enabled, which will segfault.  Hence the barriers.

	 */

#ifdef CONFIG_PARAVIRT_CLOCK

	if (clock_mode == VCLOCK_PVCLOCK) {

	if (clock_mode == VDSO_CLOCKMODE_PVCLOCK) {

		barrier();

		return vread_pvclock();

	}

#endif

#ifdef CONFIG_HYPERV_TIMER

	if (clock_mode == VCLOCK_HVCLOCK) {

	if (clock_mode == VDSO_CLOCKMODE_HVCLOCK) {

		barrier();

		return vread_hvclock();

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE