patch for review: kvm: implement guest rebooting

Index: kernel/kvm_main.c
===================================================================
@@ -1764,6 +1764,23 @@
 	return r;
 }
 
+static int kvm_dev_ioctl_reset_vcpu(struct kvm *kvm, struct kvm_reset_vcpu *slot)
+{
+	struct kvm_vcpu *vcpu;
+
+	if (!valid_vcpu(slot->vcpu))
+		return -EINVAL;
+	vcpu = vcpu_load(kvm, slot->vcpu);
+	if (!vcpu)
+		return -ENOENT;
+
+	kvm_arch_ops->reset_vcpu(vcpu);
+
+	vcpu_put(vcpu);
+
+	return 0;
+}
+
 static long kvm_dev_ioctl(struct file *filp,
 			  unsigned int ioctl, unsigned long arg)
 {

@@ -1780,6 +1797,13 @@
 			goto out;
 		break;
 	}
+	case KVM_RESET_VCPU: {
+		struct kvm_reset_vcpu kvm_reset_vcpu;
+		if (copy_from_user(&kvm_reset_vcpu, (void *)arg, sizeof kvm_reset_vcpu))
+			goto out;
+		r = kvm_dev_ioctl_reset_vcpu(kvm, &kvm_reset_vcpu);
+		break;
+	}
 	case KVM_RUN: {
 		struct kvm_run kvm_run;
 

Index: kernel/include/linux/kvm.h
===================================================================
@@ -11,7 +11,7 @@
 #include <asm/types.h>
 #include <linux/ioctl.h>
 
-#define KVM_API_VERSION 2
+#define KVM_API_VERSION 3
 
 /*
  * Architectural interrupt line count, and the size of the bitmap needed

@@ -46,6 +46,7 @@
 	KVM_EXIT_HLT              = 5,
 	KVM_EXIT_MMIO             = 6,
 	KVM_EXIT_IRQ_WINDOW_OPEN  = 7,
+	KVM_EXIT_SHUTDOWN         = 8,
 };
 
 /* for KVM_RUN */

@@ -218,6 +219,12 @@
 	};
 };
 
+/* for KVM_RESET_VCPU */
+struct kvm_reset_vcpu {
+	/* in */
+	__u32 vcpu;
+};
+
 #define KVMIO 0xAE
 
 #define KVM_GET_API_VERSION       _IO(KVMIO, 1)

@@ -235,5 +242,6 @@
 #define KVM_GET_MSRS              _IOWR(KVMIO, 13, struct kvm_msrs)
 #define KVM_SET_MSRS              _IOWR(KVMIO, 14, struct kvm_msrs)
 #define KVM_GET_MSR_INDEX_LIST    _IOWR(KVMIO, 15, struct kvm_msr_list)
+#define KVM_RESET_VCPU            _IO(KVMIO, 16)
 
 #endif

Index: kernel/kvm.h
===================================================================
@@ -379,6 +379,7 @@
 	int (*run)(struct kvm_vcpu *vcpu, struct kvm_run *run);
 	int (*vcpu_setup)(struct kvm_vcpu *vcpu);
 	void (*skip_emulated_instruction)(struct kvm_vcpu *vcpu);
+	void (*reset_vcpu)(struct kvm_vcpu *vcpu);
 };
 
 extern struct kvm_stat kvm_stat;

Index: kernel/svm.c
===================================================================
@@ -508,7 +508,8 @@
 				(1ULL << INTERCEPT_VMSAVE) |
 				(1ULL << INTERCEPT_STGI) |
 				(1ULL << INTERCEPT_CLGI) |
-				(1ULL << INTERCEPT_SKINIT);
+				(1ULL << INTERCEPT_SKINIT) |
+				(1ULL << INTERCEPT_SHUTDOWN);
 
 	control->iopm_base_pa = iopm_base;
 	control->msrpm_base_pa = msrpm_base;

@@ -582,6 +583,21 @@
 	return r;
 }
 
+static void svm_reset_vcpu(struct kvm_vcpu *vcpu)
+{
+	printk("....svm_reset_vcpu\n");
+	memset(vcpu->svm->vmcb, 0, PAGE_SIZE);
+	//vcpu->svm->vmcb_pa = page_to_pfn(page) << PAGE_SHIFT;
+	vcpu->svm->cr0 = 0x00000010;
+	vcpu->svm->asid_generation = 0;
+	memset(vcpu->svm->db_regs, 0, sizeof(vcpu->svm->db_regs));
+	init_vmcb(vcpu->svm->vmcb);
+
+	fx_init(vcpu);
+
+	init_vmcb(vcpu->svm->vmcb);
+}
+
 static void svm_free_vcpu(struct kvm_vcpu *vcpu)
 {
 	if (!vcpu->svm)

@@ -1216,6 +1232,14 @@
 	return 1;
 }
 
+static int shutdown_interception(struct kvm_vcpu *vcpu, struct kvm_run  *kvm_run)
+{
+	/* Note: After an intercepted shutdown, the state saved in the VMCB is undefined.  */
+	printk("....shutdown_interception\n");
+	kvm_run->exit_reason = KVM_EXIT_SHUTDOWN;
+	return 0;
+}
+
 static int (*svm_exit_handlers[])(struct kvm_vcpu *vcpu,
 				      struct kvm_run *kvm_run) = {
 	[SVM_EXIT_READ_CR0]           		= emulate_on_interception,

@@ -1256,6 +1280,7 @@
 	[SVM_EXIT_STGI]				= invalid_op_interception,
 	[SVM_EXIT_CLGI]				= invalid_op_interception,
 	[SVM_EXIT_SKINIT]			= invalid_op_interception,
+	[SVM_EXIT_SHUTDOWN]                     = shutdown_interception,
 };
 
 

@@ -1690,6 +1715,8 @@
 	.run = svm_vcpu_run,
 	.skip_emulated_instruction = skip_emulated_instruction,
 	.vcpu_setup = svm_vcpu_setup,
+
+	.reset_vcpu = svm_reset_vcpu,
 };
 
 static int __init svm_init(void)

Index: qemu/cpu-exec.c
===================================================================
@@ -456,8 +456,20 @@
 
 #ifdef USE_KVM
             if (kvm_allowed) {
-                kvm_cpu_exec(env);
-                longjmp(env->jmp_env, 1);
+	        int ret;
+                ret = kvm_cpu_exec(env);
+		if (ret == 1) {
+		    longjmp(env->jmp_env, 1);
+		} /* else if (ret == 2) {
+		     unused code
+		} */ else {
+		    if (env->interrupt_request != 0) {
+		        /* hardware interrupt will be executed just after */
+		    } else {
+		        /* otherwise, we restart */
+		        longjmp(env->jmp_env, 1);
+		    }
+		}
             }
 #endif
             T0 = 0; /* force lookup of first TB */

Index: qemu/target-i386/helper2.c
===================================================================
@@ -151,7 +151,7 @@
 void cpu_reset(CPUX86State *env)
 {
     int i;
-
+    printf("....cpu_reset (env)\n");
     memset(env, 0, offsetof(CPUX86State, breakpoints));
 
     tlb_flush(env, 1);

Index: qemu/qemu-kvm.c
===================================================================
@@ -413,9 +413,7 @@
     if (!saved_env[0])
 	saved_env[0] = env;
 
-    kvm_run(kvm_context, 0);
-
-    return 0;
+    return kvm_run(kvm_context, 0);
 }
 
 

@@ -578,6 +576,23 @@
 
     return 1;
 }
+
+static int kvm_guest_reboot(void *opaque, int vcpu)
+{
+	/* Note: After an intercepted shutdown, the state saved in the VMCB is undefined.  */
+	CPUState **envs = opaque, *env;
+	env = envs[0];
+
+	printf ("----kvm_guest_reboot\n");
+
+	qemu_system_reset_request();
+	//env->exception_index = EXCP_INTERRUPT;
+	//cpu_loop_exit ();
+
+	///* Not reached.  */
+
+	return 3;
+}
  
 static struct kvm_callbacks qemu_kvm_ops = {
     .cpuid = kvm_cpuid,

@@ -600,6 +615,7 @@
     .io_window = kvm_io_window,
     .try_push_interrupts = try_push_interrupts,
     .post_kvm_run = post_kvm_run,
+    .shutdown = kvm_guest_reboot,
 };
 
 int kvm_qemu_init()

Index: qemu/vl.c
===================================================================
@@ -93,7 +93,7 @@
 #include "qemu-kvm.h"
 #endif
 
-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
+#define DEFAULT_NETWORK_SCRIPT "/etc/kvm/kvm-ifup"
 
 //#define DEBUG_UNUSED_IOPORT
 //#define DEBUG_IOPORT

65 lines not on this page · raw message

Index: user/kvmctl.h
===================================================================
@@ -62,6 +62,8 @@
     int (*io_window)(void *opaque);
     int (*try_push_interrupts)(void *opaque);
     void (*post_kvm_run)(void *opaque, struct kvm_run *kvm_run);
+	/// Guest is being rebooted
+    int (*shutdown)(void *opaque, int vcpu);
 };
 
 /*!

@@ -248,4 +250,6 @@
 			  unsigned long len);
 void kvm_get_dirty_pages(kvm_context_t, int slot, void *buf);
 
+int kvm_reset_vcpu(kvm_context_t kvm, int vcpu);
+
 #endif