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

clocksource/drivers/hyper-v: Include asm/hyperv-tlfs.h not asm/mshyperv.h 



clocksource/hyperv_timer.h is included into the VDSO build. It includes
asm/mshyperv.h which in turn includes the world and some more. This worked
so far by chance, but any subtle change in the include chain results in a
build breakage because VDSO builds are building user space libraries.

Include asm/hyperv-tlfs.h instead which contains everything what the VDSO
build needs except the hv_get_raw_timer() define. Move this define into a
separate header file, which contains the prerequisites (msr.h) and is
included by clocksource/hyperv_timer.h.

Fixup drivers/hv/vmbus_drv.c which relies on the indirect include of
asm/mshyperv.h.

With that the VDSO build only pulls in the minimum requirements.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarMichael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/87fsemtut0.ffs@tglx
parent 094226ad

arch/x86/include/asm/hyperv_timer.h

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

#ifndef _ASM_X86_HYPERV_TIMER_H

#define _ASM_X86_HYPERV_TIMER_H



#include <asm/msr.h>



#define hv_get_raw_timer() rdtsc_ordered()



#endif

arch/x86/include/asm/mshyperv.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ typedef int (*hyperv_fill_flush_list_func)( 
		struct hv_guest_mapping_flush_list *flush,

		void *data);



#define hv_get_raw_timer() rdtsc_ordered()



void hyperv_vector_handler(struct pt_regs *regs);



#if IS_ENABLED(CONFIG_HYPERV)

drivers/hv/vmbus_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/dma-map-ops.h>

#include <linux/pci.h>

#include <clocksource/hyperv_timer.h>

#include <asm/mshyperv.h>

#include "hyperv_vmbus.h"



struct vmbus_dynid {

include/clocksource/hyperv_timer.h

+3 −1
Original line number Diff line number Diff line
@@ -15,13 +15,15 @@ 


#include <linux/clocksource.h>

#include <linux/math64.h>

#include <asm/mshyperv.h>

#include <asm/hyperv-tlfs.h>



#define HV_MAX_MAX_DELTA_TICKS 0xffffffff

#define HV_MIN_DELTA_TICKS 1



#ifdef CONFIG_HYPERV_TIMER



#include <asm/hyperv_timer.h>



/* Routines called by the VMbus driver */

extern int hv_stimer_alloc(bool have_percpu_irqs);

extern int hv_stimer_cleanup(unsigned int cpu);