Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1548705

[PATCH 08/18] Drivers: hv: vmbus: Move the check for hypercall page setup

Show all headers | View raw

From: K. Y. Srinivasan <kys@microsoft.com>

As part of the effort to separate out architecture specific code, move the
check for detecting if the hypercall page is setup.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
 arch/x86/hyperv/hv_init.c       |   15 +++++++++++++++
 arch/x86/include/asm/mshyperv.h |    1 +
 drivers/hv/hv.c                 |    7 +------
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index 299cafb..8c14488 100644
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -234,3 +234,18 @@ void hyperv_report_panic(struct pt_regs *regs)
 	wrmsrl(HV_X64_MSR_CRASH_CTL, HV_CRASH_CTL_CRASH_NOTIFY);
 }
 EXPORT_SYMBOL_GPL(hyperv_report_panic);
+
+bool hv_is_hypercall_page_setup(void)
+{
+	union hv_x64_msr_hypercall_contents hypercall_msr;
+
+	/* Check if the hypercall page is setup */
+	hypercall_msr.as_uint64 = 0;
+	rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
+
+	if (!hypercall_msr.enable)
+		return false;
+
+	return true;
+}
+EXPORT_SYMBOL_GPL(hv_is_hypercall_page_setup);
diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index 64e682d..c843ef6 100644
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -115,5 +115,6 @@ static inline  __u64 generate_guest_id(__u64 d_info1, __u64 kernel_version,
 #if IS_ENABLED(CONFIG_HYPERV)
 void hyperv_init(void);
 void hyperv_report_panic(struct pt_regs *regs);
+bool hv_is_hypercall_page_setup(void);
 #endif
 #endif
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 55b85c3..9021398 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -49,7 +49,6 @@ struct hv_context hv_context = {
  */
 int hv_init(void)
 {
-	union hv_x64_msr_hypercall_contents hypercall_msr;
 
 	memset(hv_context.synic_event_page, 0, sizeof(void *) * NR_CPUS);
 	memset(hv_context.synic_message_page, 0,
@@ -65,11 +64,7 @@ int hv_init(void)
 	memset(hv_context.clk_evt, 0,
 	       sizeof(void *) * NR_CPUS);
 
-	/* See if the hypercall page is already set */
-	hypercall_msr.as_uint64 = 0;
-	rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
-
-	if (!hypercall_msr.enable)
+	if (!hv_is_hypercall_page_setup())
 		return -ENOTSUPP;
 
 	return 0;
-- 
1.7.4.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/18] Drivers: hv: vmbus: Restructure architecture specific code  kys@exchange.microsoft.com - 2016-12-30 20:40 +0100
  [PATCH 08/18] Drivers: hv: vmbus: Move the check for hypercall page setup kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
  [PATCH 05/18] Drivers: hv: vmbus: Consolidate all Hyper-V specific clocksource code kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
  [PATCH 03/18] Drivers: hv vmbus: Move Hypercall page setup out of common code kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
  [PATCH 02/18] Drivers: hv: vmbus: Move the definition of generate_guest_id() kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
  [PATCH 01/18] Drivers: hv: vmbus: Move the definition of hv_x64_msr_hypercall_contents kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 15/18] Drivers: hv: vmbus: Define APIs to manipulate the synthetic interrupt controller kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 04/18] Drivers: hv: vmbus: Move Hypercall invocation code out of common code kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 09/18] Drivers: hv: vmbus: Move the code to signal end of message kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 18/18] Drivers: hv: vmbus: Cleanup hyperv_vmbus.h kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 14/18] Drivers: hv: vmbus: Define APIs to manipulate the event page kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 06/18] Drivers: hv: vmbus: Move the extracting of Hypervisor version information kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 10/18] Drivers: hv: vmbus: Restructure the clockevents code kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 17/18] Drivers: hv: vmbus: Define an APIs to manage interrupt state kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 11/18] Drivers: hv: util: Use hv_get_current_tick() to get current tick kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 12/18] Drivers: hv: vmbus: Get rid of an unsused variable kys@exchange.microsoft.com - 2016-12-30 21:00 +0100
    [PATCH 13/18] Drivers: hv: vmbus: Define APIs to manipulate the message page kys@exchange.microsoft.com - 2016-12-30 21:00 +0100
    [PATCH 07/18] Drivers: hv: vmbus: Move the crash notification function kys@exchange.microsoft.com - 2016-12-30 21:00 +0100

csiph-web