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

Commit e2bddc20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 hyperv updates from Ingo Molnar:
 "Misc updates related to page size abstractions within the HyperV code,
  in preparation for future features"

* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  drivers: hv: vmbus: Replace page definition with Hyper-V specific one
  x86/hyperv: Add functions to allocate/deallocate page for Hyper-V
  x86/hyperv: Create and use Hyper-V page definitions
parents 6f246714 83527ef7

arch/x86/hyperv/hv_init.c

+14 −0
Original line number Diff line number Diff line
@@ -37,6 +37,20 @@ EXPORT_SYMBOL_GPL(hyperv_pcpu_input_arg); 
u32 hv_max_vp_index;

EXPORT_SYMBOL_GPL(hv_max_vp_index);



void *hv_alloc_hyperv_page(void)

{

	BUILD_BUG_ON(PAGE_SIZE != HV_HYP_PAGE_SIZE);



	return (void *)__get_free_page(GFP_KERNEL);

}

EXPORT_SYMBOL_GPL(hv_alloc_hyperv_page);



void hv_free_hyperv_page(unsigned long addr)

{

	free_page(addr);

}

EXPORT_SYMBOL_GPL(hv_free_hyperv_page);



static int hv_cpu_init(unsigned int cpu)

{

	u64 msr_vp_index;

arch/x86/include/asm/hyperv-tlfs.h

+11 −1
Original line number Diff line number Diff line
@@ -12,6 +12,16 @@ 
#include <linux/types.h>

#include <asm/page.h>



/*

 * While not explicitly listed in the TLFS, Hyper-V always runs with a page size

 * of 4096. These definitions are used when communicating with Hyper-V using

 * guest physical pages and guest physical page addresses, since the guest page

 * size may not be 4096 on all architectures.

 */

#define HV_HYP_PAGE_SHIFT      12

#define HV_HYP_PAGE_SIZE       BIT(HV_HYP_PAGE_SHIFT)

#define HV_HYP_PAGE_MASK       (~(HV_HYP_PAGE_SIZE - 1))



/*

 * The below CPUID leaves are present if VersionAndFeatures.HypervisorPresent

 * is set by CPUID(HvCpuIdFunctionVersionAndFeatures).
@@ -847,7 +857,7 @@ union hv_gpa_page_range { 
 * count is equal with how many entries of union hv_gpa_page_range can

 * be populated into the input parameter page.

 */

#define HV_MAX_FLUSH_REP_COUNT ((PAGE_SIZE - 2 * sizeof(u64)) /	\

#define HV_MAX_FLUSH_REP_COUNT ((HV_HYP_PAGE_SIZE - 2 * sizeof(u64)) /	\

				sizeof(union hv_gpa_page_range))



struct hv_guest_mapping_flush_list {

arch/x86/include/asm/mshyperv.h

+4 −1
Original line number Diff line number Diff line
@@ -218,7 +218,8 @@ static inline struct hv_vp_assist_page *hv_get_vp_assist_page(unsigned int cpu) 


void __init hyperv_init(void);

void hyperv_setup_mmu_ops(void);



void *hv_alloc_hyperv_page(void);

void hv_free_hyperv_page(unsigned long addr);

void hyperv_reenlightenment_intr(struct pt_regs *regs);

void set_hv_tscchange_cb(void (*cb)(void));

void clear_hv_tscchange_cb(void);
@@ -241,6 +242,8 @@ static inline void hv_apic_init(void) {} 
#else /* CONFIG_HYPERV */

static inline void hyperv_init(void) {}

static inline void hyperv_setup_mmu_ops(void) {}

static inline void *hv_alloc_hyperv_page(void) { return NULL; }

static inline void hv_free_hyperv_page(unsigned long addr) {}

static inline void set_hv_tscchange_cb(void (*cb)(void)) {}

static inline void clear_hv_tscchange_cb(void) {}

static inline void hyperv_stop_tsc_emulation(void) {};

drivers/hv/hyperv_vmbus.h

+4 −4
Original line number Diff line number Diff line
@@ -190,11 +190,11 @@ int hv_ringbuffer_read(struct vmbus_channel *channel, 
		       u64 *requestid, bool raw);



/*

 * Maximum channels is determined by the size of the interrupt page

 * which is PAGE_SIZE. 1/2 of PAGE_SIZE is for send endpoint interrupt

 * and the other is receive endpoint interrupt

 * The Maximum number of channels (16348) is determined by the size of the

 * interrupt page, which is HV_HYP_PAGE_SIZE. 1/2 of HV_HYP_PAGE_SIZE is to

 * send endpoint interrupts, and the other is to receive endpoint interrupts.

 */

#define MAX_NUM_CHANNELS	((PAGE_SIZE >> 1) << 3)	/* 16348 channels */

#define MAX_NUM_CHANNELS	((HV_HYP_PAGE_SIZE >> 1) << 3)



/* The value here must be in multiple of 32 */

/* TODO: Need to make this configurable */