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 0C38CC4332F for ; Wed, 12 Oct 2022 18:17:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229797AbiJLSR4 (ORCPT ); Wed, 12 Oct 2022 14:17:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229527AbiJLSRh (ORCPT ); Wed, 12 Oct 2022 14:17:37 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C89898C81 for ; Wed, 12 Oct 2022 11:17:24 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id a33-20020a630b61000000b00429d91cc649so9578833pgl.8 for ; Wed, 12 Oct 2022 11:17:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=6LjPpC5WMK+HN+fw4FsDT2cJnXsT7lM8aCSyAvCtEgA=; b=NuW25Nv3biN2IHS4poTdCD4rAjew+qpVd76+lQVBDIym1H9FoBeMG+X5ODgl4H7p+j ZpINWlCzUXGsBCo+2p0WR5bMJ301Ad+BvriGTTYQfCAA8N5N2XXgElBzbFpja/WmjtbD r1U8sdlPTHKYjp8AvuMc1BWKuAZP28hM/xHbow2I2ehjSa41fxbYvgHZ8ZEzsL9i/0ME ygk4gfSIsEx7D8ZGXcxyuXrxbMtiuDj2aklQMMfTSeLfRo56aPgXRP+spNxfF50lNsqQ HTvy9TUINVREz4MVmhk7Qka+Qs1NjZoIMI5z2xXnuFzD0+FsaKIJA1oySTG7+XOptZNb URPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6LjPpC5WMK+HN+fw4FsDT2cJnXsT7lM8aCSyAvCtEgA=; b=xRNgsZ6IKceQl+7rL06s1Ae28tib8Z6n097yTIk1t7OnW5cNNe9xx3kwSxGNPQXclf Fw2U3TainuJn3Cffq5StK5PJZy6R8yRHb2XavTST1Is+jeXRg9QyPSfRqOR98RLPFAQ+ h8Il96gVpy0xz+P2E5vkBVCYIxFGl8BYAb+3sylz4xqSVkp0i0e+1UJu7obCTP1rF8LZ 5JKnpRVTgvooBXzKZUNcySDnomSt9U6c0ALxv1qvMEWp+Sfz2EdVcXUpaydzE0T3J/k9 ugGvQx+P2Fs/mUcM9pRkQiQxLNZG0qvyzPn3sFLOsqQg7BkBGx7AJjyNqS162YOb5OkN cw+A== X-Gm-Message-State: ACrzQf0PP8aDNmGz2npcJJxgxzZ6uBUsweHUD0ENNk8PZuYYFZl3EnJI 6g0eVyBV+5v2PBnvs7Rb0hH/GkZ1kRU= X-Google-Smtp-Source: AMsMyM7htAu+wDIbq1XRbKYSbs7Fwquqh8ysfXFz2L3IgX1ZynIZzrjBpLYtIdUWzgxbDYA5EHlVbNckaRM= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:e7d0:b0:20c:169f:7503 with SMTP id kb16-20020a17090ae7d000b0020c169f7503mr6483671pjb.175.1665598643087; Wed, 12 Oct 2022 11:17:23 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 12 Oct 2022 18:17:00 +0000 In-Reply-To: <20221012181702.3663607-1-seanjc@google.com> Mime-Version: 1.0 References: <20221012181702.3663607-1-seanjc@google.com> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog Message-ID: <20221012181702.3663607-10-seanjc@google.com> Subject: [PATCH v4 09/11] KVM: x86/mmu: Replace open coded usage of tdp_mmu_page with is_tdp_mmu_page() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, David Matlack , Isaku Yamahata Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Use is_tdp_mmu_page() instead of querying sp->tdp_mmu_page directly so that all users benefit if KVM ever finds a way to optimize the logic. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 2 +- arch/x86/kvm/mmu/tdp_mmu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 1598aaf29c4a..4792d76edd6d 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1907,7 +1907,7 @@ static bool is_obsolete_sp(struct kvm *kvm, struct kvm_mmu_page *sp) return true; /* TDP MMU pages due not use the MMU generation. */ - return !sp->tdp_mmu_page && + return !is_tdp_mmu_page(sp) && unlikely(sp->mmu_valid_gen != kvm->arch.mmu_valid_gen); } diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index f7c4555d5d36..477418a2ed9b 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -134,7 +134,7 @@ void kvm_tdp_mmu_put_root(struct kvm *kvm, struct kvm_mmu_page *root, if (!refcount_dec_and_test(&root->tdp_mmu_root_count)) return; - WARN_ON(!root->tdp_mmu_page); + WARN_ON(!is_tdp_mmu_page(root)); /* * The root now has refcount=0. It is valid, but readers already -- 2.38.0.rc1.362.ged0d419d3c-goog