From: Glauber Costa <glommer@redhat.com>
To: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Rik van Riel <riel@redhat.com>,
Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>,
Peter Zijlstra <peterz@infradead.org>,
Avi Kivity <avi@redhat.com>,
Anthony Liguori <aliguori@us.ibm.com>,
Eric B Munson <emunson@mgebm.net>
Subject: [PATCH v5 5/9] KVM-GST: Add a pv_ops stub for steal time
Date: Mon, 4 Jul 2011 11:32:24 -0400 [thread overview]
Message-ID: <1309793548-16714-6-git-send-email-glommer@redhat.com> (raw)
In-Reply-To: <1309793548-16714-1-git-send-email-glommer@redhat.com>
This patch adds a function pointer in one of the many paravirt_ops
structs, to allow guests to register a steal time function. Besides
a steal time function, we also declare two jump_labels. They will be
used to allow the steal time code to be easily bypassed when not
in use.
Signed-off-by: Glauber Costa <glommer@redhat.com>
CC: Rik van Riel <riel@redhat.com>
CC: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Avi Kivity <avi@redhat.com>
CC: Anthony Liguori <aliguori@us.ibm.com>
CC: Eric B Munson <emunson@mgebm.net>
---
arch/x86/include/asm/paravirt.h | 9 +++++++++
arch/x86/include/asm/paravirt_types.h | 1 +
arch/x86/kernel/paravirt.c | 9 +++++++++
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index ebbc4d8..a7d2db9 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -230,6 +230,15 @@ static inline unsigned long long paravirt_sched_clock(void)
return PVOP_CALL0(unsigned long long, pv_time_ops.sched_clock);
}
+struct jump_label_key;
+extern struct jump_label_key paravirt_steal_enabled;
+extern struct jump_label_key paravirt_steal_rq_enabled;
+
+static inline u64 paravirt_steal_clock(int cpu)
+{
+ return PVOP_CALL1(u64, pv_time_ops.steal_clock, cpu);
+}
+
static inline unsigned long long paravirt_read_pmc(int counter)
{
return PVOP_CALL1(u64, pv_cpu_ops.read_pmc, counter);
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index 8288509..2c76521 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -89,6 +89,7 @@ struct pv_lazy_ops {
struct pv_time_ops {
unsigned long long (*sched_clock)(void);
+ unsigned long long (*steal_clock)(int cpu);
unsigned long (*get_tsc_khz)(void);
};
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index 869e1ae..613a793 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -202,6 +202,14 @@ static void native_flush_tlb_single(unsigned long addr)
__native_flush_tlb_single(addr);
}
+struct jump_label_key paravirt_steal_enabled;
+struct jump_label_key paravirt_steal_rq_enabled;
+
+static u64 native_steal_clock(int cpu)
+{
+ return 0;
+}
+
/* These are in entry.S */
extern void native_iret(void);
extern void native_irq_enable_sysexit(void);
@@ -307,6 +315,7 @@ struct pv_init_ops pv_init_ops = {
struct pv_time_ops pv_time_ops = {
.sched_clock = native_sched_clock,
+ .steal_clock = native_steal_clock,
};
struct pv_irq_ops pv_irq_ops = {
--
1.7.3.4
next prev parent reply other threads:[~2011-07-04 15:32 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-04 15:32 [PATCH v5 0/9] Steal time for KVM Glauber Costa
2011-07-04 15:32 ` [PATCH v5 1/9] introduce kvm_read_guest_cached Glauber Costa
2011-07-05 19:35 ` Eric B Munson
2011-07-06 3:45 ` Rik van Riel
2011-07-04 15:32 ` [PATCH v5 2/9] KVM-HDR Add constant to represent KVM MSRs enabled bit Glauber Costa
2011-07-05 19:36 ` Eric B Munson
2011-07-06 3:45 ` Rik van Riel
2011-07-04 15:32 ` [PATCH v5 3/9] KVM-HDR: KVM Steal time implementation Glauber Costa
2011-07-05 19:36 ` Eric B Munson
2011-07-06 3:46 ` Rik van Riel
2011-07-04 15:32 ` [PATCH v5 4/9] KVM-HV: " Glauber Costa
2011-07-05 19:36 ` Eric B Munson
2011-07-06 16:08 ` Rik van Riel
2011-07-07 10:51 ` Marcelo Tosatti
2011-07-07 17:07 ` Glauber Costa
2011-07-11 12:58 ` Avi Kivity
2011-07-11 14:05 ` Glauber Costa
2011-07-11 13:10 ` Avi Kivity
2011-07-11 13:11 ` Avi Kivity
2011-07-11 13:19 ` Glauber Costa
2011-07-04 15:32 ` Glauber Costa [this message]
2011-07-05 19:36 ` [PATCH v5 5/9] KVM-GST: Add a pv_ops stub for steal time Eric B Munson
2011-07-06 16:12 ` Rik van Riel
2011-07-04 15:32 ` [PATCH v5 6/9] add jump labels for ia64 paravirt Glauber Costa
2011-07-05 19:36 ` Eric B Munson
2011-07-06 16:35 ` Rik van Riel
2011-07-11 13:09 ` Avi Kivity
2011-07-11 13:24 ` Glauber Costa
2011-07-11 14:15 ` Isaku Yamahata
2011-07-13 18:01 ` Luck, Tony
2011-07-04 15:32 ` [PATCH v5 7/9] KVM-GST: KVM Steal time accounting Glauber Costa
2011-07-05 9:11 ` Peter Zijlstra
2011-07-05 19:37 ` Eric B Munson
2011-07-06 16:37 ` Rik van Riel
2011-07-04 15:32 ` [PATCH v5 8/9] KVM-GST: adjust scheduler cpu power Glauber Costa
2011-07-05 9:12 ` Peter Zijlstra
2011-07-05 19:37 ` Eric B Munson
2011-07-06 17:40 ` Rik van Riel
2011-07-04 15:32 ` [PATCH v5 9/9] KVM-GST: KVM Steal time registration Glauber Costa
2011-07-05 19:37 ` Eric B Munson
2011-07-06 17:42 ` Rik van Riel
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=1309793548-16714-6-git-send-email-glommer@redhat.com \
--to=glommer@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=avi@redhat.com \
--cc=emunson@mgebm.net \
--cc=jeremy.fitzhardinge@citrix.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=riel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).