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.2 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, URIBL_BLOCKED,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 1D826C4338F for ; Mon, 26 Jul 2021 19:50:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F2B2E60F91 for ; Mon, 26 Jul 2021 19:50:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232474AbhGZTJ7 (ORCPT ); Mon, 26 Jul 2021 15:09:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231921AbhGZTJz (ORCPT ); Mon, 26 Jul 2021 15:09:55 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A49C8C061757 for ; Mon, 26 Jul 2021 12:50:23 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id i15-20020a05620a150fb02903b960837cbfso4625434qkk.10 for ; Mon, 26 Jul 2021 12:50:23 -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=knMJJ87eko5EeIiU5PeBUCHHjZaqbhQNRmla83IZQH4=; b=n4znNVinxqDctXyi2lU7C8it/qXicNjkwibziXmmXL+JvD1gAUed5izs3EC8p9gfBE D5tKBIKg5s1GMbZS/ENJxs4fWvlEvwp91u4pBfxIkLoWUdjktAtJHnfp7OuKXWcAVfYv ZWTFuBTx/KYBkudumOB6JCgxqVIJaqy7hfbzsjZpoO9Du0s9CwLY9aAAPFquxvfWRCvq 1yD4rVO9j9nebyggTtqEbPs/cq8S6zEGIQR2v4/3LKfjSCY5mnP7mzbRDkgQneRkrpdw kGCcrdC52fnJSARpl7O66o41BOIIhznrjMxITCCNcWpIgSqXSXqI223qITwi+QMVtQsg bCYQ== 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=knMJJ87eko5EeIiU5PeBUCHHjZaqbhQNRmla83IZQH4=; b=V5sch7RdpKtmV8iM3kFMgbbn8SpZd8wxFca5w42egF7qI6yxqPxjP1258h2eE3diBb aw7i9u3Vn4km172kS2TzaQU4i6idj0bbpkJLJZ0osJSANjlAT+J+jB2vHOuZ2yoJOLkp EOFN26NtA9KnVOOS9DKxPBV0kYvX+zH85GfWBWXy31hWsYWd6/VEEJ16FggIZqc1mTZT ebnlxsKEXZ9j356XYDXAoygrXO3SIcnZm+KzcD9962/JgMxCenJHMWaN4zYZgLP0uQnq /Gp/kl5RITFSX0qkW2QI3y9AXS0kVoCDnX3Rjp//fQ2moNY0+C1vuKU3dVDubf6q30dc KjAg== X-Gm-Message-State: AOAM533k/jKXC/7UXvxexG+bhBty/glrwpvOFG6X+N+R7Kk65hhRox7O Ftcn67LDTo71xq67xA8mZGSDQlP7Bxs= X-Google-Smtp-Source: ABdhPJzLoA47/pLUshXDPOXJFfi6sZ3KV4LD+sfEu6W/hksSIqTNhS9h5igguBuE1wOQWxmwz3ZWhCrn2cA= X-Received: from pgonda1.kir.corp.google.com ([2620:15c:29:204:f4a:330f:115:e2d4]) (user=pgonda job=sendgmr) by 2002:a05:6214:262f:: with SMTP id gv15mr19281552qvb.36.1627329022739; Mon, 26 Jul 2021 12:50:22 -0700 (PDT) Date: Mon, 26 Jul 2021 12:50:13 -0700 In-Reply-To: <20210726195015.2106033-1-pgonda@google.com> Message-Id: <20210726195015.2106033-2-pgonda@google.com> Mime-Version: 1.0 References: <20210726195015.2106033-1-pgonda@google.com> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog Subject: [PATCH 1/3 V3] KVM, SEV: Refactor out function for unregistering encrypted regions From: Peter Gonda To: kvm@vger.kernel.org Cc: Peter Gonda , Brijesh Singh , Marc Orr , Paolo Bonzini , Sean Christopherson , David Rientjes , "Dr . David Alan Gilbert" , 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 Reviewed-by: Brijesh Singh Reviewed-by: Marc Orr 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 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) +{ + 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.432.gabb21c7263-goog