Prefer "KVM: SVM:" or "KVM: SEV:" in the shortlog, i.e. colon instead of comma after KVM. On Mon, Jul 26, 2021, Peter Gonda wrote: > Factor out helper function for freeing the encrypted region list. > > Signed-off-by: Peter Gonda <pgonda@xxxxxxxxxx> > Reviewed-by: Brijesh Singh <brijesh.singh@xxxxxxx> > Reviewed-by: Marc Orr <marcorr@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 b59c464bcdfa..6cb61d36fd5e 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) Indentation is wonky. There's an extra tab and an extra space. > +{ > + 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); Is there any reason for taking kvm->lock in this path? The VM is being destroyed, there should be no other references, i.e. this is the only task that can be doing anything with @kvm. The lock is harmless, it just always gives me pause to see the cond_resched() while holding kvm->lock. > -- > 2.32.0.432.gabb21c7263-goog >