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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9E5AC433FE for ; Wed, 15 Dec 2021 01:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235651AbhLOBQH (ORCPT ); Tue, 14 Dec 2021 20:16:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235336AbhLOBQC (ORCPT ); Tue, 14 Dec 2021 20:16:02 -0500 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 696F4C06173E for ; Tue, 14 Dec 2021 17:16:02 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id y6-20020a17090322c600b001428ab3f888so5843997plg.8 for ; Tue, 14 Dec 2021 17:16:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=Uv0feWR75U73TRbVFGvh3+7/mTjQfN9Y46WvkBDuVLQ=; b=QehVuUu9KayedcuKIC4Lp2doHPjEurYGVJza6/uvO8tYaUqEbw0niEhXiABMHPi91I ZrmKxb5xBqYT5fI2cEDn+f+mriVYwGfO6/y6OQDM/YzGNfVcDDPnFatD9wxUV1R2tY1v ZrXpOSIj2Hy22NCsofqsOyGTYtpCUPt8YO+u1OJIfjTLViJhnIva+USGhwWZSi4DCtS2 BFEBk/Df2qRD5UXoqvhVeY7YqnFmULK4EfLuIcax9sCTRbFDmr2v6hhfjXMdevw8VBqu jVMD604O0YlJKVsWgPxOVAeewkajlFETV4FhxgPtV8at+Fw1ivDgSV7INhxehAOzdGDd QU9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=Uv0feWR75U73TRbVFGvh3+7/mTjQfN9Y46WvkBDuVLQ=; b=ZlsPASqogQ8sDYYZfIJYkHu8yDZ9LApZi8fzt2O9AD4xLLeJELnHnW+8RWD6J4UUPK 1RZw4t819PsHbQh1skDZ4/17hdmhO2pq5G9r9AlGmsN8GO9d8wtASE4Wj2FDxFtgPoxZ AYIdDHrt5NZfr/IV/tUT3rkU7KLVqKNBtxR+OgVLvBV4XHKlWr5tV7h8Re4jcUlAcMpg Dvaqp379JWaQaBPQ4g9O28ltGZo4HQ+jrkv3iQAbmavpcYHsux6fKtDutChotUFE0Cx+ OW15I2ViF06gV4g4jRwRliU6XIAfyg1jRLfw8LtPtPR3zbfCeVHxuaxcj/pPAEkz6pXj /YMQ== X-Gm-Message-State: AOAM532GKhbj76qookKuea2P7SbuzeKXmT2s1zAPIz+wrReugN/TrsJ9 aIFZIRvZtCYrnP9eeAF5ww3IvM969NQ= X-Google-Smtp-Source: ABdhPJzsnLCpDRStMnfUu8b2V7PFVsdYlw6+8uUbgBvG0pZ98cU6fkcv5Y5zFfED3sMMQbxrCHTUfRkLOFQ= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a17:90b:789:: with SMTP id l9mr526684pjz.78.1639530961812; Tue, 14 Dec 2021 17:16:01 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 15 Dec 2021 01:15:54 +0000 In-Reply-To: <20211215011557.399940-1-seanjc@google.com> Message-Id: <20211215011557.399940-2-seanjc@google.com> Mime-Version: 1.0 References: <20211215011557.399940-1-seanjc@google.com> X-Mailer: git-send-email 2.34.1.173.g76aa8bc2d0-goog Subject: [PATCH 1/4] KVM: x86/mmu: Use common TDP MMU zap helper for MMU notifier unmap hook From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Gardon Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the common TDP MMU zap helper when handling an MMU notifier unmap event, the two flows are semantically identical. Consolidate the code in preparation for a future bug fix, as both kvm_tdp_mmu_unmap_gfn_range() and __kvm_tdp_mmu_zap_gfn_range() are guilty of not zapping SPTEs in invalid roots. No functional change intended. Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/tdp_mmu.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index 7b1bc816b7c3..d320b56d5cd7 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -1032,13 +1032,8 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) bool kvm_tdp_mmu_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range, bool flush) { - struct kvm_mmu_page *root; - - for_each_tdp_mmu_root_yield_safe(kvm, root, range->slot->as_id, false) - flush = zap_gfn_range(kvm, root, range->start, range->end, - range->may_block, flush, false); - - return flush; + return __kvm_tdp_mmu_zap_gfn_range(kvm, range->slot->as_id, range->start, + range->end, range->may_block, flush); } typedef bool (*tdp_handler_t)(struct kvm *kvm, struct tdp_iter *iter, -- 2.34.1.173.g76aa8bc2d0-goog