On Mon, Jun 21, 2021 at 9:59 AM Peter Gonda <pgonda@xxxxxxxxxx> wrote:
>
> Factor out helper function for freeing the encrypted region list.
>
> Signed-off-by: Peter Gonda <pgonda@xxxxxxxxxx>
> Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> Cc: Sean Christopherson <seanjc@xxxxxxxxxx>
> Cc: David Rientjes <rientjes@xxxxxxxxxx>
> Cc: Dr. David Alan Gilbert <dgilbert@xxxxxxxxxx>
> Cc: Brijesh Singh <brijesh.singh@xxxxxxx>
> Cc: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
> Cc: Wanpeng Li <wanpengli@xxxxxxxxxxx>
> Cc: Jim Mattson <jmattson@xxxxxxxxxx>
> Cc: Joerg Roedel <joro@xxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: Borislav Petkov <bp@xxxxxxxxx>
> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
> Cc: kvm@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
>
> ---
> 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 46e339c84998..5af46ff6ec48 100644
> --- a/arch/x86/kvm/svm/sev.c
> +++ b/arch/x86/kvm/svm/sev.c
> @@ -1767,11 +1767,25 @@ int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd)
> return ret;
> }
>
> +static void __unregister_region_list_locked(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;
> @@ -1795,13 +1809,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_region_list_locked(kvm, &sev->regions_list);
>
> mutex_unlock(&kvm->lock);
>
> --
> 2.32.0.288.g62a8d224e6-goog
Reviewed-by: Marc Orr <marcorr@xxxxxxxxxx>
