Live migration stops working... (SEGFAULT)

Commit Message

Avi Kivity Aug. 18, 2009, 12:12 p.m. UTC

On 08/18/2009 11:11 AM, Stephane Bakhos wrote:
>
> I've tried the patch and it did not help, however I could only have it 
> on the receiver of the migration. Would it need to be installed on the 
> one sending the data ?
>
> The guest kernel and userland are 32bits, the host's are 64 bits.
>
> I do not see any message about a faulting init.

It needs to be on both.  However try this better patch (attached, needs 
to be on both hosts).

Comments

Stephane Bakhos Aug. 19, 2009, 5:54 a.m. UTC | #1

On Tue, 18 Aug 2009, Avi Kivity wrote:
> 
> On 08/18/2009 11:11 AM, Stephane Bakhos wrote:
>>
>>  I've tried the patch and it did not help, however I could only have it on
>>  the receiver of the migration. Would it need to be installed on the one
>>  sending the data ?
>>
>>  The guest kernel and userland are 32bits, the host's are 64 bits.
>>
>>  I do not see any message about a faulting init.
>
> It needs to be on both.  However try this better patch (attached, needs to be 
> on both hosts).

That solved it, thanks!

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/kvm/kernel/x86/svm.c b/kvm/kernel/x86/svm.c
index e158a2f..6df3cea 100644
--- a/kvm/kernel/x86/svm.c
+++ b/kvm/kernel/x86/svm.c
@@ -101,9 +101,6 @@  struct vcpu_svm {
 	unsigned long vmcb_pa;
 	struct svm_cpu_data *svm_data;
 	uint64_t asid_generation;
-	uint64_t sysenter_cs;
-	uint64_t sysenter_esp;
-	uint64_t sysenter_eip;
 
 	u64 next_rip;
 
@@ -2087,13 +2084,13 @@  static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data)
 		break;
 #endif
 	case MSR_IA32_SYSENTER_CS:
-		*data = svm->sysenter_cs;
+		*data = svm->vmcb->save.sysenter_cs;
 		break;
 	case MSR_IA32_SYSENTER_EIP:
-		*data = svm->sysenter_eip;
+		*data = svm->vmcb->save.sysenter_eip;
 		break;
 	case MSR_IA32_SYSENTER_ESP:
-		*data = svm->sysenter_esp;
+		*data = svm->vmcb->save.sysenter_esp;
 		break;
 	/* Nobody will change the following 5 values in the VMCB so
 	   we can safely return them on rdmsr. They will always be 0
@@ -2176,13 +2173,13 @@  static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)
 		break;
 #endif
 	case MSR_IA32_SYSENTER_CS:
-		svm->sysenter_cs = data;
+		svm->vmcb->save.sysenter_cs = data;
 		break;
 	case MSR_IA32_SYSENTER_EIP:
-		svm->sysenter_eip = data;
+		svm->vmcb->save.sysenter_eip = data;
 		break;
 	case MSR_IA32_SYSENTER_ESP:
-		svm->sysenter_esp = data;
+		svm->vmcb->save.sysenter_esp = data;
 		break;
 	case MSR_IA32_DEBUGCTLMSR:
 		if (!svm_has(SVM_FEATURE_LBRV)) {