Laurent Vivier
2007-08-20T13:14:14Z

[-- Attachment #1: Type: text/plain, Size: 255 bytes --]

[PATCH 4/4] Modify KVM to update guest time accounting.

Signed-off-by: Laurent Vivier <Laurent.Vivier-6ktuUTfB/bM@public.gmane.org>
--
------------- Laurent.Vivier-6ktuUTfB/bM@public.gmane.org --------------
"Software is hard" - Donald Knuth

[-- Attachment #2: kvm_account_guest --]
[-- Type: text/plain, Size: 2296 bytes --]

Index: kvm/drivers/kvm/kvm.h
===================================================================
--- kvm.orig/drivers/kvm/kvm.h 2007-08-20 13:23:53.000000000 +0200
+++ kvm/drivers/kvm/kvm.h 2007-08-20 13:23:58.000000000 +0200
@@ -589,6 +589,17 @@ void kvm_mmu_unload(struct kvm_vcpu *vcp

int kvm_hypercall(struct kvm_vcpu *vcpu, struct kvm_run *run);

+static inline void kvm_guest_enter(void)
+{
+#ifdef CONFIG_GUEST_ACCOUNTING
+ current->flags |= PF_VCPU;
+#endif
+}
+
+static inline void kvm_guest_exit(void)
+{
+}
+
static inline int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva,
u32 error_code)
{
Index: kvm/drivers/kvm/svm.c
===================================================================
--- kvm.orig/drivers/kvm/svm.c 2007-08-20 13:23:53.000000000 +0200
+++ kvm/drivers/kvm/svm.c 2007-08-20 13:23:58.000000000 +0200
@@ -1404,6 +1404,7 @@ again:
clgi();

vcpu->guest_mode = 1;
+ kvm_guest_enter();
if (vcpu->requests)
if (test_and_clear_bit(KVM_TLB_FLUSH, &vcpu->requests))
svm_flush_tlb(vcpu);
@@ -1536,6 +1537,7 @@ again:
#endif
: "cc", "memory" );

+ kvm_guest_exit();
vcpu->guest_mode = 0;

if (vcpu->fpu_active) {
Index: kvm/drivers/kvm/vmx.c
===================================================================
--- kvm.orig/drivers/kvm/vmx.c 2007-08-20 13:23:53.000000000 +0200
+++ kvm/drivers/kvm/vmx.c 2007-08-20 13:23:58.000000000 +0200
@@ -2078,6 +2078,7 @@ again:
local_irq_disable();

vcpu->guest_mode = 1;
+ kvm_guest_enter();
if (vcpu->requests)
if (test_and_clear_bit(KVM_TLB_FLUSH, &vcpu->requests))
vmx_flush_tlb(vcpu);
@@ -2198,6 +2199,7 @@ again:
[cr2]"i"(offsetof(struct kvm_vcpu, cr2))
: "cc", "memory" );

+ kvm_guest_exit();
vcpu->guest_mode = 0;
local_irq_enable();

Index: kvm/drivers/kvm/Kconfig
===================================================================
--- kvm.orig/drivers/kvm/Kconfig 2007-08-20 13:36:58.000000000 +0200
+++ kvm/drivers/kvm/Kconfig 2007-08-20 13:37:36.000000000 +0200
@@ -13,6 +13,7 @@ config KVM
depends on X86 && EXPERIMENTAL
select PREEMPT_NOTIFIERS
select ANON_INODES
+ select GUEST_ACCOUNTING
---help---
Support hosting fully virtualized guest machines using hardware
virtualization extensions. You will need a fairly recent

[-- Attachment #3: Type: text/plain, Size: 315 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/

[-- Attachment #4: Type: text/plain, Size: 186 bytes --]