From patchwork Wed Nov 10 22:29:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardon X-Patchwork-Id: 12613447 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0AE1C433EF for ; Wed, 10 Nov 2021 22:30:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C96766124C for ; Wed, 10 Nov 2021 22:30:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233716AbhKJWdl (ORCPT ); Wed, 10 Nov 2021 17:33:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233932AbhKJWdb (ORCPT ); Wed, 10 Nov 2021 17:33:31 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A02D4C061208 for ; Wed, 10 Nov 2021 14:30:42 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id k63-20020a628442000000b004812ea67c34so2755458pfd.2 for ; Wed, 10 Nov 2021 14:30:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=7mdCvtcLdHr4CBiJSM0JyhidXjaakUIXa0mwfIITG4U=; b=XN6a3I6PjHvm5Ar/2g+NNS3gv+POg2AhfK/2qSa/WIUkP5Unpm2fS1p2roOVcCTF2E ak5fz8+RtInZGm/GxLJDAl5DPUvywcDbiLqh0akEy6T25/vLL4QsbK6XLdSHe2sZLgeP 63/6uu05RAXgqcmvtOMr2p4bK0bPa55sBHKzAPngPb7tiOHQ/+QAYTdV1AJm+fsLbuLp q8Hl+HOHGDF1DmkLv2LEB7SrHOGCRJZgvPw/W3iCar35oKr/OTrC34ecbo7YShyIA7Tk TFrQc+T+78K8bXiPjwG5DazWhnUNxmeaDBTtXB/wxj5xKTgA6ieBuGy+ugssRzH3PWjZ LjYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=7mdCvtcLdHr4CBiJSM0JyhidXjaakUIXa0mwfIITG4U=; b=pxFlnepDUrJ1w4WuiJtGy4JhpzrnqD6XMYO9BCsKy6trh6ix5ojvLhNQxbnLmubLz1 rv1vSbsxzjPwmADROSg8oZvepfPaqasHJG8j2rUXC1woWM8J5+WyBxRBNqvnRCgDgGUn mY5kmARiHMi8JvR9GQ+uUAg1DiC7prm0SqbFGHTvTe96SD/ad2WE05aiCcHCUFJwmC0n ayyCAlK5idPwRT5TkL2vZGT3eRZCMMPX3KiIV6Ann1250d+aYK32CqRGQ7J1TUtuwXF3 0tQwEGHQ0uquoni9I4iO/jbZGVIVSkbxxM3HYkqtgibZaC9xQud1kBA+wZ4vfKwEky0F eMeg== X-Gm-Message-State: AOAM530AkGp48gomFYJxpIDnubFgmSFyCR2sA9lTWK4dTpTngKyZxIXj YXtHH6UCyhTDG69WfFhA8EwrfObzWVpJ X-Google-Smtp-Source: ABdhPJzgUfoZW15hmkTkx4ifInPQGv4C5+MNkhrE8JA+yI2RTx3AKNuUgQK/Us4wcCAzHAXrVvzbwGpbNnyS X-Received: from bgardon.sea.corp.google.com ([2620:15c:100:202:6586:7b2f:b259:2011]) (user=bgardon job=sendgmr) by 2002:a65:6a4a:: with SMTP id o10mr1488725pgu.357.1636583442186; Wed, 10 Nov 2021 14:30:42 -0800 (PST) Date: Wed, 10 Nov 2021 14:29:58 -0800 In-Reply-To: <20211110223010.1392399-1-bgardon@google.com> Message-Id: <20211110223010.1392399-8-bgardon@google.com> Mime-Version: 1.0 References: <20211110223010.1392399-1-bgardon@google.com> X-Mailer: git-send-email 2.34.0.rc0.344.g81b53c2807-goog Subject: [RFC 07/19] KVM: x86/mmu: Factor wrprot for nested PML out of make_spte From: Ben Gardon To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Peter Xu , Sean Christopherson , Peter Shier , David Matlack , Mingwei Zhang , Yulei Zhang , Wanpeng Li , Xiao Guangrong , Kai Huang , Keqian Zhu , David Hildenbrand , Ben Gardon Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org When running a nested VM, KVM write protects SPTEs in the EPT/NPT02 instead of using PML for dirty tracking. This avoids expensive translation later, when emptying the Page Modification Log. In service of removing the vCPU pointer from make_spte, factor the check for nested PML out of the function. Signed-off-by: Ben Gardon Signed-off-by: Sean Christopherson Reviewed-by: Ben Gardon --- arch/x86/kvm/mmu/spte.c | 10 +++++++--- arch/x86/kvm/mmu/spte.h | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/mmu/spte.c b/arch/x86/kvm/mmu/spte.c index 04d26e913941..3cf08a534a16 100644 --- a/arch/x86/kvm/mmu/spte.c +++ b/arch/x86/kvm/mmu/spte.c @@ -92,7 +92,8 @@ static bool kvm_is_mmio_pfn(kvm_pfn_t pfn) bool make_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, struct kvm_memory_slot *slot, unsigned int pte_access, gfn_t gfn, kvm_pfn_t pfn, u64 old_spte, bool prefetch, - bool can_unsync, bool host_writable, u64 *new_spte) + bool can_unsync, bool host_writable, bool ad_need_write_protect, + u64 *new_spte) { int level = sp->role.level; u64 spte = SPTE_MMU_PRESENT_MASK; @@ -100,7 +101,7 @@ bool make_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, if (sp->role.ad_disabled) spte |= SPTE_TDP_AD_DISABLED_MASK; - else if (kvm_vcpu_ad_need_write_protect(vcpu)) + else if (ad_need_write_protect) spte |= SPTE_TDP_AD_WRPROT_ONLY_MASK; /* @@ -195,8 +196,11 @@ bool vcpu_make_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, gfn_t gfn, kvm_pfn_t pfn, u64 old_spte, bool prefetch, bool can_unsync, bool host_writable, u64 *new_spte) { + bool ad_need_write_protect = kvm_vcpu_ad_need_write_protect(vcpu); + return make_spte(vcpu, sp, slot, pte_access, gfn, pfn, old_spte, - prefetch, can_unsync, host_writable, new_spte); + prefetch, can_unsync, host_writable, + ad_need_write_protect, new_spte); } diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h index 14f18082d505..bcf58602f224 100644 --- a/arch/x86/kvm/mmu/spte.h +++ b/arch/x86/kvm/mmu/spte.h @@ -332,7 +332,8 @@ static inline u64 get_mmio_spte_generation(u64 spte) bool make_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, struct kvm_memory_slot *slot, unsigned int pte_access, gfn_t gfn, kvm_pfn_t pfn, u64 old_spte, bool prefetch, - bool can_unsync, bool host_writable, u64 *new_spte); + bool can_unsync, bool host_writable, bool ad_need_write_protect, + u64 *new_spte); bool vcpu_make_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, struct kvm_memory_slot *slot, unsigned int pte_access, gfn_t gfn, kvm_pfn_t pfn,