public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86: Hyper-V: register clocksource only if its advertised
@ 2013-01-25 13:37 Olaf Hering
  2013-01-25 16:10 ` Greg KH
  2013-01-25 16:43 ` KY Srinivasan
  0 siblings, 2 replies; 18+ messages in thread
From: Olaf Hering @ 2013-01-25 13:37 UTC (permalink / raw)
  To: linux-kernel; +Cc: Olaf Hering, stable, KY Srinivasan, Greg KH

Enable hyperv_clocksource only if its advertised as a feature.
XenServer 6 returns the signature which is checked in
ms_hyperv_platform(), but it does not offer all features. Currently the
clocksource is enabled unconditionally in ms_hyperv_init_platform(), and
the result is a hanging guest.

Hyper-V spec Bit 1 indicates the availability of Partition Reference
Counter.  Register the clocksource only if this bit is set.

The guest in question prints this in dmesg:
 [    0.000000] Hypervisor detected: Microsoft HyperV
 [    0.000000] HyperV: features 0x70, hints 0x0

This bug can be reproduced easily be setting 'viridian=1' in a HVM domU
.cfg file. A workaround without this patch is to boot the HVM guest with
'clocksource=jiffies'.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: stable@kernel.org
Cc: KY Srinivasan <kys@microsoft.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
---
 arch/x86/kernel/cpu/mshyperv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index 0a630dd..646d192 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -68,7 +68,8 @@ static void __init ms_hyperv_init_platform(void)
 	printk(KERN_INFO "HyperV: features 0x%x, hints 0x%x\n",
 	       ms_hyperv.features, ms_hyperv.hints);
 
-	clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
+	if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)
+		clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
 }
 
 const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
-- 
1.8.1.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2013-01-29 16:14 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-25 13:37 [PATCH] x86: Hyper-V: register clocksource only if its advertised Olaf Hering
2013-01-25 16:10 ` Greg KH
2013-01-25 16:43 ` KY Srinivasan
2013-01-25 16:54   ` Olaf Hering
2013-01-25 17:04     ` KY Srinivasan
2013-01-25 17:19       ` Olaf Hering
2013-01-25 17:39         ` KY Srinivasan
2013-01-25 20:00           ` Olaf Hering
2013-01-25 20:03             ` KY Srinivasan
2013-01-26 16:57             ` KY Srinivasan
2013-01-26 18:21               ` Olaf Hering
2013-01-28 17:44           ` Stefano Stabellini
2013-01-29  8:35             ` Jan Beulich
2013-01-29  9:26               ` Olaf Hering
2013-01-29 14:32                 ` KY Srinivasan
2013-01-29 15:30                   ` Stefano Stabellini
2013-01-29 15:58                     ` KY Srinivasan
2013-01-29 16:14                       ` Stefano Stabellini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox