From: "K. Y. Srinivasan" <kys@microsoft.com>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com,
vkuznets@redhat.com, jasowang@redhat.com
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Subject: [PATCH 22/28] Drivers: hv: vmbus: Implement a clocksource based on the TSC page
Date: Sat, 1 Aug 2015 16:08:26 -0700 [thread overview]
Message-ID: <1438470512-30205-22-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1438470512-30205-1-git-send-email-kys@microsoft.com>
The current Hyper-V clock source is based on the per-partition reference counter
and this counter is being accessed via s synthetic MSR - HV_X64_MSR_TIME_REF_COUNT.
Hyper-V has a more efficient way of computing the per-partition reference
counter value that does not involve reading a synthetic MSR. We implement
a time source based on this mechanism.
Tested-by: Vivek Yadav <vyadav@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
arch/x86/include/uapi/asm/hyperv.h | 2 +
drivers/hv/hv.c | 83 ++++++++++++++++++++++++++++++++++++
drivers/hv/hyperv_vmbus.h | 9 ++++
3 files changed, 94 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h
index 8fba544..89f15e3 100644
--- a/arch/x86/include/uapi/asm/hyperv.h
+++ b/arch/x86/include/uapi/asm/hyperv.h
@@ -27,6 +27,8 @@
#define HV_X64_MSR_VP_RUNTIME_AVAILABLE (1 << 0)
/* Partition Reference Counter (HV_X64_MSR_TIME_REF_COUNT) available*/
#define HV_X64_MSR_TIME_REF_COUNT_AVAILABLE (1 << 1)
+/* Partition reference TSC MSR is available */
+#define HV_X64_MSR_REFERENCE_TSC_AVAILABLE (1 << 9)
/* A partition's reference time stamp counter (TSC) page */
#define HV_X64_MSR_REFERENCE_TSC 0x40000021
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index c641faf..6341be8 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -133,6 +133,56 @@ static u64 do_hypercall(u64 control, void *input, void *output)
#endif /* !x86_64 */
}
+#ifdef CONFIG_X86_64
+static cycle_t read_hv_clock_tsc(struct clocksource *arg)
+{
+ cycle_t current_tick;
+ struct ms_hyperv_tsc_page *tsc_pg = hv_context.tsc_page;
+
+ if (tsc_pg->tsc_sequence != -1) {
+ /*
+ * Use the tsc page to compute the value.
+ */
+
+ while (1) {
+ cycle_t tmp;
+ u32 sequence = tsc_pg->tsc_sequence;
+ u64 cur_tsc;
+ u64 scale = tsc_pg->tsc_scale;
+ s64 offset = tsc_pg->tsc_offset;
+
+ rdtscll(cur_tsc);
+ /* current_tick = ((cur_tsc *scale) >> 64) + offset */
+ asm("mulq %3"
+ : "=d" (current_tick), "=a" (tmp)
+ : "a" (cur_tsc), "r" (scale));
+
+ current_tick += offset;
+ if (tsc_pg->tsc_sequence == sequence)
+ return current_tick;
+
+ if (tsc_pg->tsc_sequence != -1)
+ continue;
+ /*
+ * Fallback using MSR method.
+ */
+ break;
+ }
+ }
+ rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
+ return current_tick;
+}
+
+static struct clocksource hyperv_cs_tsc = {
+ .name = "hyperv_clocksource_tsc_page",
+ .rating = 425,
+ .read = read_hv_clock_tsc,
+ .mask = CLOCKSOURCE_MASK(64),
+ .flags = CLOCK_SOURCE_IS_CONTINUOUS,
+};
+#endif
+
+
/*
* hv_init - Main initialization routine.
*
@@ -142,7 +192,9 @@ int hv_init(void)
{
int max_leaf;
union hv_x64_msr_hypercall_contents hypercall_msr;
+ union hv_x64_msr_hypercall_contents tsc_msr;
void *virtaddr = NULL;
+ void *va_tsc = NULL;
memset(hv_context.synic_event_page, 0, sizeof(void *) * NR_CPUS);
memset(hv_context.synic_message_page, 0,
@@ -186,6 +238,22 @@ int hv_init(void)
hv_context.hypercall_page = virtaddr;
+#ifdef CONFIG_X86_64
+ if (ms_hyperv.features & HV_X64_MSR_REFERENCE_TSC_AVAILABLE) {
+ va_tsc = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL);
+ if (!va_tsc)
+ goto cleanup;
+ hv_context.tsc_page = va_tsc;
+
+ rdmsrl(HV_X64_MSR_REFERENCE_TSC, tsc_msr.as_uint64);
+
+ tsc_msr.enable = 1;
+ tsc_msr.guest_physical_address = vmalloc_to_pfn(va_tsc);
+
+ wrmsrl(HV_X64_MSR_REFERENCE_TSC, tsc_msr.as_uint64);
+ clocksource_register_hz(&hyperv_cs_tsc, NSEC_PER_SEC/100);
+ }
+#endif
return 0;
cleanup:
@@ -219,6 +287,21 @@ void hv_cleanup(void)
vfree(hv_context.hypercall_page);
hv_context.hypercall_page = NULL;
}
+
+#ifdef CONFIG_X86_64
+ /*
+ * Cleanup the TSC page based CS.
+ */
+ if (ms_hyperv.features & HV_X64_MSR_REFERENCE_TSC_AVAILABLE) {
+ clocksource_change_rating(&hyperv_cs_tsc, 10);
+ clocksource_unregister(&hyperv_cs_tsc);
+
+ hypercall_msr.as_uint64 = 0;
+ wrmsrl(HV_X64_MSR_REFERENCE_TSC, hypercall_msr.as_uint64);
+ vfree(hv_context.tsc_page);
+ hv_context.tsc_page = NULL;
+ }
+#endif
}
/*
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index 6f25825..3d70e36 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -517,6 +517,7 @@ struct hv_context {
u64 guestid;
void *hypercall_page;
+ void *tsc_page;
bool synic_initialized;
@@ -560,6 +561,14 @@ struct hv_context {
extern struct hv_context hv_context;
+struct ms_hyperv_tsc_page {
+ volatile u32 tsc_sequence;
+ u32 reserved1;
+ volatile u64 tsc_scale;
+ volatile s64 tsc_offset;
+ u64 reserved2[509];
+};
+
struct hv_ring_buffer_debug_info {
u32 current_interrupt_mask;
u32 current_read_index;
--
1.7.4.1
next prev parent reply other threads:[~2015-08-01 21:47 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-01 23:08 [PATCH 00/28] Drivers: hv: vmbus K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 01/28] Drivers: hv: vmbus: remove hv_synic_free_cpu() call from hv_synic_cleanup() K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 02/28] kexec: define kexec_in_progress in !CONFIG_KEXEC case K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 03/28] Drivers: hv: vmbus: add special kexec handler K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 04/28] Drivers: hv: don't do hypercalls when hypercall_page is NULL K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 05/28] Drivers: hv: vmbus: add special crash handler K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 06/28] Drivers: hv: vmbus: prefer 'die' notification chain to 'panic' K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 07/28] Drivers: hv: kvp: check kzalloc return value K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 08/28] Drivers: hv: fcopy: dynamically allocate smsg_out in fcopy_send_data() K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 09/28] Drivers: hv: balloon: Enable dynamic memory protocol negotiation with Windows 10 hosts K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 10/28] Drivers: hv: vmbus: Permit sending of packets without payload K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 11/28] drivers:hv: Modify hv_vmbus to search for all MMIO ranges available K. Y. Srinivasan
2015-08-05 5:29 ` Greg KH
2015-08-05 5:59 ` KY Srinivasan
2015-08-01 23:08 ` [PATCH 12/28] drivers:hv: Move MMIO range picking from hyper_fb to hv_vmbus K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 13/28] hv: util: checking the wrong variable K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 14/28] Drivers: hv: vmbus: fix typo in hv_port_info struct K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 15/28] Drivers: hv: vmbus: don't send CHANNELMSG_UNLOAD on pre-Win2012R2 hosts K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 16/28] mshyperv: fix recognition of Hyper-V guest crash MSR's K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 17/28] Drivers: hv: vmbus: Consider ND NIC in binding channels to CPUs K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 18/28] Drivers: hv: vmbus: Improve the CPU affiliation for channels K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 19/28] Drivers: hv: vmbus: Further improve CPU affiliation logic K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 20/28] Drivers: hv_vmbus: Fix signal to host condition K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 21/28] drivers/hv: Migrate to new 'set-state' interface K. Y. Srinivasan
2015-08-01 23:08 ` K. Y. Srinivasan [this message]
2015-08-01 23:08 ` [PATCH 23/28] Drivers: hv: vmbus: add a sysfs attr to show the binding of channel/VP K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 24/28] tools: hv: add a python script lsvmbus to list VMBus devices K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 25/28] Drivers: hv: vmbus: document the VMBus sysfs files K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 26/28] cpu-hotplug: convert cpu_hotplug_disabled to a counter K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 27/28] cpu-hotplug: export cpu_hotplug_enable/cpu_hotplug_disable K. Y. Srinivasan
2015-08-01 23:08 ` [PATCH 28/28] Drivers: hv: vmbus: use cpu_hotplug_enable/disable K. Y. Srinivasan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438470512-30205-22-git-send-email-kys@microsoft.com \
--to=kys@microsoft.com \
--cc=apw@canonical.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=olaf@aepfle.de \
--cc=vkuznets@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.