Skip to contentSkip to conversation

KVM: SVM: Fix SEV-ES intrahost migration

PATCH Applied Sean Christopherson 3 participants 8 messages Aug 25, 2023

Subsystems (3)
lore
Share & tools
lore

Sean Christopherson

author maintainer
#0 lore raw

cover KVM: SVM: Fix SEV-ES intrahost migration

Fix two fatal bugs in SEV-ES intrahost migration, found by running sev_migrate_tests (:shocked-pikachu:).

IIRC, for some reason our platforms haven't played nice with SEV-ES on upstream kernels for a while, i.e. the test hasn't been run as part of my usual testing.

Sean Christopherson (2):
KVM: SVM: Get source vCPUs from source VM for SEV-ES intrahost
migration
KVM: SVM: Skip VMSA init in sev_es_init_vmcb() if pointer is NULL

 arch/x86/kvm/svm/sev.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

base-commit: fff2e47e6c3b8050ca26656693caa857e3a8b740

Signature · 1 line
2.42.0.rc2.253.gd59a3bf2b4-goog
author maintainer
#1 lore raw

PATCH 1/2 KVM: SVM: Get source vCPUs from source VM for SEV-ES intrahost migration

Fix a goof where KVM tries to grab source vCPUs from the destination VM when doing intrahost migration. Grabbing the wrong vCPU not only hoses the guest, it also crashes the host due to the VMSA pointer being left NULL.

  BUG: unable to handle page fault for address: ffffe38687000000
  #PF: supervisor read access in kernel mode
  #PF: error_code(0x0000) - not-present page
  PGD 0 P4D 0
  Oops: 0000 [#1] SMP NOPTI
  CPU: 39 PID: 17143 Comm: sev_migrate_tes Tainted: GO       6.5.0-smp--fff2e47e6c3b-next #151
  Hardware name: Google, Inc. Arcadia_IT_80/Arcadia_IT_80, BIOS 34.28.0 07/10/2023
  RIP: 0010:__free_pages+0x15/0xd0
  RSP: 0018:ffff923fcf6e3c78 EFLAGS: 00010246
  RAX: 0000000000000000 RBX: ffffe38687000000 RCX: 0000000000000100
  RDX: 0000000000000100 RSI: 0000000000000000 RDI: ffffe38687000000
  RBP: ffff923fcf6e3c88 R08: ffff923fcafb0000 R09: 0000000000000000
  R10: 0000000000000000 R11: ffffffff83619b90 R12: ffff923fa9540000
  R13: 0000000000080007 R14: ffff923f6d35d000 R15: 0000000000000000
  FS:  0000000000000000(0000) GS:ffff929d0d7c0000(0000) knlGS:0000000000000000
  CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
  CR2: ffffe38687000000 CR3: 0000005224c34005 CR4: 0000000000770ee0
  PKRU: 55555554
  Call Trace:
   <TASK>
   sev_free_vcpu+0xcb/0x110 [kvm_amd]
   svm_vcpu_free+0x75/0xf0 [kvm_amd]
   kvm_arch_vcpu_destroy+0x36/0x140 [kvm]
   kvm_destroy_vcpus+0x67/0x100 [kvm]
   kvm_arch_destroy_vm+0x161/0x1d0 [kvm]
   kvm_put_kvm+0x276/0x560 [kvm]
   kvm_vm_release+0x25/0x30 [kvm]
   __fput+0x106/0x280
   ____fput+0x12/0x20
   task_work_run+0x86/0xb0
   do_exit+0x2e3/0x9c0
   do_group_exit+0xb1/0xc0
   __x64_sys_exit_group+0x1b/0x20
   do_syscall_64+0x41/0x90
   entry_SYSCALL_64_after_hwframe+0x63/0xcd
   </TASK>
  CR2: ffffe38687000000
Fixes 6defa24d3b12 ("KVM: SEV: Init target VMCBs in sev_migrate_from")
Cc Peter Gonda <[email protected]>
---
 arch/x86/kvm/svm/sev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +1 -1
index 2cd15783dfb9..acc700bcb299 100644
@@ -1739,7 +1739,7 @@ static void sev_migrate_from(struct kvm *dst_kvm, struct kvm *src_kvm)
 		 * Note, the source is not required to have the same number of
 		 * vCPUs as the destination when migrating a vanilla SEV VM.
 		 */
-		src_vcpu = kvm_get_vcpu(dst_kvm, i);
+		src_vcpu = kvm_get_vcpu(src_kvm, i);
 		src_svm = to_svm(src_vcpu);
 
 		/*
Signature · 1 line
2.42.0.rc2.253.gd59a3bf2b4-goog
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] KVM: SVM: Get source vCPUs from source VM for SEV-ES intrahost migration

Quoted 56 lines · Sean Christopherson

Fix a goof where KVM tries to grab source vCPUs from the destination VM when doing intrahost migration. Grabbing the wrong vCPU not only hoses the guest, it also crashes the host due to the VMSA pointer being left NULL.

   BUG: unable to handle page fault for address: ffffe38687000000
   #PF: supervisor read access in kernel mode
   #PF: error_code(0x0000) - not-present page
   PGD 0 P4D 0
   Oops: 0000 [#1] SMP NOPTI
   CPU: 39 PID: 17143 Comm: sev_migrate_tes Tainted: GO       6.5.0-smp--fff2e47e6c3b-next #151
   Hardware name: Google, Inc. Arcadia_IT_80/Arcadia_IT_80, BIOS 34.28.0 07/10/2023
   RIP: 0010:__free_pages+0x15/0xd0
   RSP: 0018:ffff923fcf6e3c78 EFLAGS: 00010246
   RAX: 0000000000000000 RBX: ffffe38687000000 RCX: 0000000000000100
   RDX: 0000000000000100 RSI: 0000000000000000 RDI: ffffe38687000000
   RBP: ffff923fcf6e3c88 R08: ffff923fcafb0000 R09: 0000000000000000
   R10: 0000000000000000 R11: ffffffff83619b90 R12: ffff923fa9540000
   R13: 0000000000080007 R14: ffff923f6d35d000 R15: 0000000000000000
   FS:  0000000000000000(0000) GS:ffff929d0d7c0000(0000) knlGS:0000000000000000
   CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
   CR2: ffffe38687000000 CR3: 0000005224c34005 CR4: 0000000000770ee0
   PKRU: 55555554
   Call Trace:
    <TASK>
    sev_free_vcpu+0xcb/0x110 [kvm_amd]
    svm_vcpu_free+0x75/0xf0 [kvm_amd]
    kvm_arch_vcpu_destroy+0x36/0x140 [kvm]
    kvm_destroy_vcpus+0x67/0x100 [kvm]
    kvm_arch_destroy_vm+0x161/0x1d0 [kvm]
    kvm_put_kvm+0x276/0x560 [kvm]
    kvm_vm_release+0x25/0x30 [kvm]
    __fput+0x106/0x280
    ____fput+0x12/0x20
    task_work_run+0x86/0xb0
    do_exit+0x2e3/0x9c0
    do_group_exit+0xb1/0xc0
    __x64_sys_exit_group+0x1b/0x20
    do_syscall_64+0x41/0x90
    entry_SYSCALL_64_after_hwframe+0x63/0xcd
    </TASK>
   CR2: ffffe38687000000
Fixes 6defa24d3b12 ("KVM: SEV: Init target VMCBs in sev_migrate_from")
Cc Peter Gonda <[email protected]>
---
  arch/x86/kvm/svm/sev.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +0 -0
index 2cd15783dfb9..acc700bcb299 100644

arch/x86/kvm/svm/sev.c static void sev_migrate_from(struct kvm *dst_kvm, struct kvm *src_kvm) · line 1745

Quoted 8 lines
arch/x86/kvm/svm/sev.c +1 -1
@@ -1739,7 +1739,7 @@ static void sev_migrate_from(struct kvm *dst_kvm, struct kvm *src_kvm)
  		 * Note, the source is not required to have the same number of
  		 * vCPUs as the destination when migrating a vanilla SEV VM.
  		 */
-		src_vcpu = kvm_get_vcpu(dst_kvm, i);
+		src_vcpu = kvm_get_vcpu(src_kvm, i);
  		src_svm = to_svm(src_vcpu);
 
  		/*
Reviewed-by
#3 lore raw

Re: [PATCH 1/2] KVM: SVM: Get source vCPUs from source VM for SEV-ES intrahost migration

Quoted 65 lines · Pankaj
Quoted 63 lines · Sean Christopherson

Fix a goof where KVM tries to grab source vCPUs from the destination VM when doing intrahost migration. Grabbing the wrong vCPU not only hoses the guest, it also crashes the host due to the VMSA pointer being left NULL.

   BUG: unable to handle page fault for address: ffffe38687000000
   #PF: supervisor read access in kernel mode
   #PF: error_code(0x0000) - not-present page
   PGD 0 P4D 0
   Oops: 0000 [#1] SMP NOPTI
   CPU: 39 PID: 17143 Comm: sev_migrate_tes Tainted: GO       6.5.0-smp--fff2e47e6c3b-next #151
   Hardware name: Google, Inc. Arcadia_IT_80/Arcadia_IT_80, BIOS 34.28.0 07/10/2023
   RIP: 0010:__free_pages+0x15/0xd0
   RSP: 0018:ffff923fcf6e3c78 EFLAGS: 00010246
   RAX: 0000000000000000 RBX: ffffe38687000000 RCX: 0000000000000100
   RDX: 0000000000000100 RSI: 0000000000000000 RDI: ffffe38687000000
   RBP: ffff923fcf6e3c88 R08: ffff923fcafb0000 R09: 0000000000000000
   R10: 0000000000000000 R11: ffffffff83619b90 R12: ffff923fa9540000
   R13: 0000000000080007 R14: ffff923f6d35d000 R15: 0000000000000000
   FS:  0000000000000000(0000) GS:ffff929d0d7c0000(0000) knlGS:0000000000000000
   CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
   CR2: ffffe38687000000 CR3: 0000005224c34005 CR4: 0000000000770ee0
   PKRU: 55555554
   Call Trace:
    <TASK>
    sev_free_vcpu+0xcb/0x110 [kvm_amd]
    svm_vcpu_free+0x75/0xf0 [kvm_amd]
    kvm_arch_vcpu_destroy+0x36/0x140 [kvm]
    kvm_destroy_vcpus+0x67/0x100 [kvm]
    kvm_arch_destroy_vm+0x161/0x1d0 [kvm]
    kvm_put_kvm+0x276/0x560 [kvm]
    kvm_vm_release+0x25/0x30 [kvm]
    __fput+0x106/0x280
    ____fput+0x12/0x20
    task_work_run+0x86/0xb0
    do_exit+0x2e3/0x9c0
    do_group_exit+0xb1/0xc0
    __x64_sys_exit_group+0x1b/0x20
    do_syscall_64+0x41/0x90
    entry_SYSCALL_64_after_hwframe+0x63/0xcd
    </TASK>
   CR2: ffffe38687000000
Fixes 6defa24d3b12 ("KVM: SEV: Init target VMCBs in sev_migrate_from")
Cc Peter Gonda <[email protected]>
---
  arch/x86/kvm/svm/sev.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +1 -1
index 2cd15783dfb9..acc700bcb299 100644
@@ -1739,7 +1739,7 @@ static void sev_migrate_from(struct kvm *dst_kvm, struct kvm *src_kvm)
               * Note, the source is not required to have the same number of
               * vCPUs as the destination when migrating a vanilla SEV VM.
               */
-             src_vcpu = kvm_get_vcpu(dst_kvm, i);
+             src_vcpu = kvm_get_vcpu(src_kvm, i);
              src_svm = to_svm(src_vcpu);
 
Quoted 3 lines

arch/x86/kvm/svm/sev.c static void sev_migrate_from(struct kvm *dst_kvm, struct kvm *src_kvm) · line 1745

Quoted 1 line
arch/x86/kvm/svm/sev.c +0 -0
              /*

Thanks Sean.

Quoted 1 line
author maintainer
#4 lore raw

PATCH 2/2 KVM: SVM: Skip VMSA init in sev_es_init_vmcb() if pointer is NULL

In reply to Sean Christopherson

Skip initializing the VMSA physical address in the VMCB if the VMSA is NULL, which occurs during intrahost migration as KVM initializes the VMCB before copying over state from the source to the destination (including the VMSA and its physical address).

In normal builds, __pa() is just math, so the bug isn't fatal, but with CONFIG_DEBUG_VIRTUAL=y, the validity of the virtual address is verified and passing in NULL will make the kernel unhappy.

Fixes 6defa24d3b12 ("KVM: SEV: Init target VMCBs in sev_migrate_from")
Cc Peter Gonda <[email protected]>
---
 arch/x86/kvm/svm/sev.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/sev.c +5 -2
index acc700bcb299..5585a3556179 100644
@@ -2975,9 +2975,12 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm)
 	/*
 	 * An SEV-ES guest requires a VMSA area that is a separate from the
 	 * VMCB page. Do not include the encryption mask on the VMSA physical
-	 * address since hardware will access it using the guest key.
+	 * address since hardware will access it using the guest key.  Note,
+	 * the VMSA will be NULL if this vCPU is the destination for intrahost
+	 * migration, and will be copied later.
 	 */
-	svm->vmcb->control.vmsa_pa = __pa(svm->sev_es.vmsa);
+	if (svm->sev_es.vmsa)
+		svm->vmcb->control.vmsa_pa = __pa(svm->sev_es.vmsa);
 
 	/* Can't intercept CR register access, HV can't modify CR registers */
 	svm_clr_intercept(svm, INTERCEPT_CR0_READ);
Signature · 1 line
2.42.0.rc2.253.gd59a3bf2b4-goog
Reviewed-by on v1 2/2
#5 lore raw

Re: [PATCH 2/2] KVM: SVM: Skip VMSA init in sev_es_init_vmcb() if pointer is NULL

Quoted 26 lines · Sean Christopherson

Skip initializing the VMSA physical address in the VMCB if the VMSA is NULL, which occurs during intrahost migration as KVM initializes the VMCB before copying over state from the source to the destination (including the VMSA and its physical address).

In normal builds, __pa() is just math, so the bug isn't fatal, but with CONFIG_DEBUG_VIRTUAL=y, the validity of the virtual address is verified and passing in NULL will make the kernel unhappy.

Fixes 6defa24d3b12 ("KVM: SEV: Init target VMCBs in sev_migrate_from")
Cc Peter Gonda <[email protected]>
---
  arch/x86/kvm/svm/sev.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/sev.c +0 -1
index acc700bcb299..5585a3556179 100644
@@ -2975,9 +2975,12 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm)
  	/*
  	 * An SEV-ES guest requires a VMSA area that is a separate from the
  	 * VMCB page. Do not include the encryption mask on the VMSA physical
-	 * address since hardware will access it using the guest key.

arch/x86/kvm/svm/sev.c static void sev_es_init_vmcb(struct vcpu_svm *svm) · line 2986

Quoted 10 lines
arch/x86/kvm/svm/sev.c +5 -1
+	 * address since hardware will access it using the guest key.  Note,
+	 * the VMSA will be NULL if this vCPU is the destination for intrahost
+	 * migration, and will be copied later.
  	 */
-	svm->vmcb->control.vmsa_pa = __pa(svm->sev_es.vmsa);
+	if (svm->sev_es.vmsa)
+		svm->vmcb->control.vmsa_pa = __pa(svm->sev_es.vmsa);
 
  	/* Can't intercept CR register access, HV can't modify CR registers */
  	svm_clr_intercept(svm, INTERCEPT_CR0_READ);
Reviewed-by
#6 lore raw

Re: [PATCH 2/2] KVM: SVM: Skip VMSA init in sev_es_init_vmcb() if pointer is NULL

Quoted 36 lines · Pankaj
Quoted 34 lines · Sean Christopherson

Skip initializing the VMSA physical address in the VMCB if the VMSA is NULL, which occurs during intrahost migration as KVM initializes the VMCB before copying over state from the source to the destination (including the VMSA and its physical address).

In normal builds, __pa() is just math, so the bug isn't fatal, but with CONFIG_DEBUG_VIRTUAL=y, the validity of the virtual address is verified and passing in NULL will make the kernel unhappy.

Fixes 6defa24d3b12 ("KVM: SEV: Init target VMCBs in sev_migrate_from")
Cc Peter Gonda <[email protected]>
---
  arch/x86/kvm/svm/sev.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/sev.c +5 -2
index acc700bcb299..5585a3556179 100644
@@ -2975,9 +2975,12 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm)
      /*
       * An SEV-ES guest requires a VMSA area that is a separate from the
       * VMCB page. Do not include the encryption mask on the VMSA physical
-      * address since hardware will access it using the guest key.
+      * address since hardware will access it using the guest key.  Note,
+      * the VMSA will be NULL if this vCPU is the destination for intrahost
+      * migration, and will be copied later.
       */
-     svm->vmcb->control.vmsa_pa = __pa(svm->sev_es.vmsa);
+     if (svm->sev_es.vmsa)
+             svm->vmcb->control.vmsa_pa = __pa(svm->sev_es.vmsa);
 
Quoted 4 lines

arch/x86/kvm/svm/sev.c static void sev_es_init_vmcb(struct vcpu_svm *svm) · line 2986

Quoted 2 lines
arch/x86/kvm/svm/sev.c +0 -0
      /* Can't intercept CR register access, HV can't modify CR registers */
      svm_clr_intercept(svm, INTERCEPT_CR0_READ);
author maintainer Applied
#7 lore raw
In reply to Sean Christopherson
Quoted 8 lines · Sean Christopherson

Fix two fatal bugs in SEV-ES intrahost migration, found by running sev_migrate_tests (:shocked-pikachu:).

IIRC, for some reason our platforms haven't played nice with SEV-ES on upstream kernels for a while, i.e. the test hasn't been run as part of my usual testing.

[...]

Applied to kvm-x86 svm, thanks for the quick reviews!

[1/2] KVM: SVM: Get source vCPUs from source VM for SEV-ES intrahost migration

      https://github.com/kvm-x86/linux/commit/f1187ef24eb8
[2/2] KVM: SVM: Skip VMSA init in sev_es_init_vmcb() if pointer is NULL
      https://github.com/kvm-x86/linux/commit/1952e74da96f

--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes