Factor out helper function for freeing the encrypted region list.
Signed-off-by: Peter Gonda <[email protected]>
Reviewed-by: Brijesh Singh <[email protected]>
Reviewed-by: Marc Orr <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Sean Christopherson <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: Dr. David Alan Gilbert <[email protected]>
Cc: Brijesh Singh <[email protected]>
Cc: Vitaly Kuznetsov <[email protected]>
Cc: Wanpeng Li <[email protected]>
Cc: Jim Mattson <[email protected]>
Cc: Joerg Roedel <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
arch/x86/kvm/svm/sev.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 8d36f0c73071..78fea9c4048d 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -1775,11 +1775,25 @@ int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd)
return ret;
}
+static void unregister_enc_regions(struct kvm *kvm,
+ struct list_head *mem_regions)
+{
+ struct enc_region *pos, *q;
+
+ lockdep_assert_held(&kvm->lock);
+
+ if (list_empty(mem_regions))
+ return;
+
+ list_for_each_entry_safe(pos, q, mem_regions, list) {
+ __unregister_enc_region_locked(kvm, pos);
+ cond_resched();
+ }
+}
+
void sev_vm_destroy(struct kvm *kvm)
{
struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
- struct list_head *head = &sev->regions_list;
- struct list_head *pos, *q;
if (!sev_guest(kvm))
return;
@@ -1803,13 +1817,7 @@ void sev_vm_destroy(struct kvm *kvm)
* if userspace was terminated before unregistering the memory regions
* then lets unpin all the registered memory.
*/
- if (!list_empty(head)) {
- list_for_each_safe(pos, q, head) {
- __unregister_enc_region_locked(kvm,
- list_entry(pos, struct enc_region, list));
- cond_resched();
- }
- }
+ unregister_enc_regions(kvm, &sev->regions_list);
mutex_unlock(&kvm->lock);
--
2.32.0.93.g670b81a890-goog