From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03484C48BE5 for ; Mon, 21 Jun 2021 16:59:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E41D860C3F for ; Mon, 21 Jun 2021 16:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232930AbhFURBM (ORCPT ); Mon, 21 Jun 2021 13:01:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232398AbhFURAy (ORCPT ); Mon, 21 Jun 2021 13:00:54 -0400 Received: from mail-qt1-x84a.google.com (mail-qt1-x84a.google.com [IPv6:2607:f8b0:4864:20::84a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33D7BC0A2F83 for ; Mon, 21 Jun 2021 09:31:32 -0700 (PDT) Received: by mail-qt1-x84a.google.com with SMTP id h10-20020ac87d4a0000b029024eccb9d079so4364662qtb.1 for ; Mon, 21 Jun 2021 09:31:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Fh4N55vsJGr/owgyo59+w03kBoNEzSNeOYDe9RDAnqA=; b=NztFXzrOAUEp0IO07vkl0QNPtHvTIOd1gMWUm52bht+wYI2WLBSRkIp2KSCTakma8o wmNUNMlRrsbvpQ5W4lWjUcI3DdF9pqnqDhcHuhiGIJy5fUrkoilLAClHvL1xWIAVUibj b9HYvax/cp82xsqKmWoKWdSuKCMZvwGg7cK/7iBXpqOLe0M7dhZfHgW7Wwcsm9B12xJc cups2bHdRZEHQt0hf70ASS/7Bso0YwYvp/Rt0pIlX+dqWml775joSlylHx9YrcFQKvR4 T1wx7oDA1W/nLUIA0yVM1Nb6tW8+Lsls4wadWBjKIN+0whiWv95b7Y4eX1Cpixg+t9G9 0ceA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Fh4N55vsJGr/owgyo59+w03kBoNEzSNeOYDe9RDAnqA=; b=uidf9B5B0WjnpD+TU+joSTCEu7rSQ3nenCQVnli9mVeJRBK+283k0sRC8+CKS5gHbG 5XIkMLPtlpS3OEZ8xJekjEyTPziamG3PE/zoXLmx84wpmDDubdj41fiJH2+FYoi7lZz7 ZWZOgM8DW66ipZxoPirOO3aAAYSWg8xxqB1X/lhD+oKy/i3Ctbvz2uae4KDbyTAy+o0p /hhaAVayEpkIZetTqoyRlbzO0Yc/oDNQFa81nuvnTARyRfp5ukuUZIXma402DQnKp/Dp 9SXXFMsdlHGfAkqI24L3g1W+OfwOy5jkK9L/XGbEB4RbuUmIeIZiGNyULvEL8crRZ0uK G40A== X-Gm-Message-State: AOAM5303uusQunqMP6Z5ypwoTH12EA5JMXTYn60O9p5ra3clC1wd/Jq2 evnzqDIj9svcZDAQYrGSqqaGVV2W4/I= X-Google-Smtp-Source: ABdhPJwcjMvWwvufDanli233viItQbtnVC+lc7c2oSyhEvGEQmCtvu5Kb17yJPP8nCCneLfzy2mtVaMFBV0= X-Received: from pgonda1.kir.corp.google.com ([2620:0:1008:11:2742:338c:f077:6d85]) (user=pgonda job=sendgmr) by 2002:a25:d694:: with SMTP id n142mr33012654ybg.349.1624293091163; Mon, 21 Jun 2021 09:31:31 -0700 (PDT) Date: Mon, 21 Jun 2021 09:31:16 -0700 In-Reply-To: <20210621163118.1040170-1-pgonda@google.com> Message-Id: <20210621163118.1040170-2-pgonda@google.com> Mime-Version: 1.0 References: <20210621163118.1040170-1-pgonda@google.com> X-Mailer: git-send-email 2.32.0.288.g62a8d224e6-goog Subject: [PATCH 1/3] KVM, SEV: Refactor out function for unregistering encrypted regions From: Peter Gonda To: kvm@vger.kernel.org Cc: Peter Gonda , Paolo Bonzini , Sean Christopherson , David Rientjes , "Dr . David Alan Gilbert" , Brijesh Singh , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Factor out helper function for freeing the encrypted region list. Signed-off-by: Peter Gonda Cc: Paolo Bonzini Cc: Sean Christopherson Cc: David Rientjes Cc: Dr. David Alan Gilbert Cc: Brijesh Singh Cc: Vitaly Kuznetsov Cc: Wanpeng Li Cc: Jim Mattson Cc: Joerg Roedel Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: "H. Peter Anvin" Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- 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