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

Commit 7415aea6 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Ingo Molnar
Browse files

hyper-v: Globalize vp_index 



To support implementing remote TLB flushing on Hyper-V with a hypercall
we need to make vp_index available outside of vmbus module. Rename and
globalize.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Jork Loeser <Jork.Loeser@microsoft.com>
Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Simon Xiao <sixiao@microsoft.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: devel@linuxdriverproject.org
Link: http://lkml.kernel.org/r/20170802160921.21791-7-vkuznets@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 806c8927

arch/x86/hyperv/hv_init.c

+33 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <linux/mm.h>

#include <linux/clockchips.h>

#include <linux/hyperv.h>

#include <linux/slab.h>

#include <linux/cpuhotplug.h>



#ifdef CONFIG_HYPERV_TSCPAGE
@@ -80,6 +82,20 @@ EXPORT_SYMBOL_GPL(hv_hypercall_pg); 
struct clocksource *hyperv_cs;

EXPORT_SYMBOL_GPL(hyperv_cs);



u32 *hv_vp_index;

EXPORT_SYMBOL_GPL(hv_vp_index);



static int hv_cpu_init(unsigned int cpu)

{

	u64 msr_vp_index;



	hv_get_vp_index(msr_vp_index);



	hv_vp_index[smp_processor_id()] = msr_vp_index;



	return 0;

}



/*

 * This function is to be invoked early in the boot sequence after the

 * hypervisor has been detected.
@@ -95,6 +111,16 @@ void hyperv_init(void) 
	if (x86_hyper != &x86_hyper_ms_hyperv)

		return;



	/* Allocate percpu VP index */

	hv_vp_index = kmalloc_array(num_possible_cpus(), sizeof(*hv_vp_index),

				    GFP_KERNEL);

	if (!hv_vp_index)

		return;



	if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/hyperv_init:online",

			      hv_cpu_init, NULL) < 0)

		goto free_vp_index;



	/*

	 * Setup the hypercall page and enable hypercalls.

	 * 1. Register the guest ID
@@ -106,7 +132,7 @@ void hyperv_init(void) 
	hv_hypercall_pg  = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);

	if (hv_hypercall_pg == NULL) {

		wrmsrl(HV_X64_MSR_GUEST_OS_ID, 0);

		return;

		goto free_vp_index;

	}



	rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
@@ -149,6 +175,12 @@ void hyperv_init(void) 
	hyperv_cs = &hyperv_cs_msr;

	if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)

		clocksource_register_hz(&hyperv_cs_msr, NSEC_PER_SEC/100);



	return;



free_vp_index:

	kfree(hv_vp_index);

	hv_vp_index = NULL;

}



/*

arch/x86/include/asm/mshyperv.h

+24 −0
Original line number Diff line number Diff line
@@ -282,6 +282,30 @@ static inline u64 hv_do_rep_hypercall(u16 code, u16 rep_count, u16 varhead_size, 
	return status;

}



/*

 * Hypervisor's notion of virtual processor ID is different from

 * Linux' notion of CPU ID. This information can only be retrieved

 * in the context of the calling CPU. Setup a map for easy access

 * to this information.

 */

extern u32 *hv_vp_index;



/**

 * hv_cpu_number_to_vp_number() - Map CPU to VP.

 * @cpu_number: CPU number in Linux terms

 *

 * This function returns the mapping between the Linux processor

 * number and the hypervisor's virtual processor number, useful

 * in making hypercalls and such that talk about specific

 * processors.

 *

 * Return: Virtual processor number in Hyper-V terms

 */

static inline int hv_cpu_number_to_vp_number(int cpu_number)

{

	return hv_vp_index[cpu_number];

}



void hyperv_init(void);

void hyperv_report_panic(struct pt_regs *regs);

bool hv_is_hypercall_page_setup(void);

drivers/hv/channel_mgmt.c

+3 −4
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static void init_vp_index(struct vmbus_channel *channel, u16 dev_type) 
		 */

		channel->numa_node = 0;

		channel->target_cpu = 0;

		channel->target_vp = hv_context.vp_index[0];

		channel->target_vp = hv_cpu_number_to_vp_number(0);

		return;

	}
@@ -683,7 +683,7 @@ static void init_vp_index(struct vmbus_channel *channel, u16 dev_type) 
	}



	channel->target_cpu = cur_cpu;

	channel->target_vp = hv_context.vp_index[cur_cpu];

	channel->target_vp = hv_cpu_number_to_vp_number(cur_cpu);

}



static void vmbus_wait_for_unload(void)
@@ -1219,8 +1219,7 @@ struct vmbus_channel *vmbus_get_outgoing_channel(struct vmbus_channel *primary) 
		return outgoing_channel;

	}



	cur_cpu = hv_context.vp_index[get_cpu()];

	put_cpu();

	cur_cpu = hv_cpu_number_to_vp_number(smp_processor_id());

	list_for_each_safe(cur, tmp, &primary->sc_list) {

		cur_channel = list_entry(cur, struct vmbus_channel, sc_list);

		if (cur_channel->state != CHANNEL_OPENED_STATE)

drivers/hv/connection.c

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo, 
	 * the CPU attempting to connect may not be CPU 0.

	 */

	if (version >= VERSION_WIN8_1) {

		msg->target_vcpu = hv_context.vp_index[smp_processor_id()];

		msg->target_vcpu =

			hv_cpu_number_to_vp_number(smp_processor_id());

		vmbus_connection.connect_cpu = smp_processor_id();

	} else {

		msg->target_vcpu = 0;

drivers/hv/hv.c

+0 −9
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ int hv_synic_init(unsigned int cpu) 
	union hv_synic_siefp siefp;

	union hv_synic_sint shared_sint;

	union hv_synic_scontrol sctrl;

	u64 vp_index;



	/* Setup the Synic's message page */

	hv_get_simp(simp.as_uint64);
@@ -275,14 +274,6 @@ int hv_synic_init(unsigned int cpu) 


	hv_context.synic_initialized = true;



	/*

	 * Setup the mapping between Hyper-V's notion

	 * of cpuid and Linux' notion of cpuid.

	 * This array will be indexed using Linux cpuid.

	 */

	hv_get_vp_index(vp_index);

	hv_context.vp_index[cpu] = (u32)vp_index;



	/*

	 * Register the per-cpu clockevent source.

	 */