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 1B4FFC48BE5 for ; Tue, 22 Jun 2021 18:00:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0131F611CE for ; Tue, 22 Jun 2021 18:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232874AbhFVSCU (ORCPT ); Tue, 22 Jun 2021 14:02:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232049AbhFVSBj (ORCPT ); Tue, 22 Jun 2021 14:01:39 -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 DA096C06114E for ; Tue, 22 Jun 2021 10:58:44 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id c3-20020a37b3030000b02903ad0001a2e8so19024368qkf.3 for ; Tue, 22 Jun 2021 10:58:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=SZ7EFM9JvxBFqeMOjL2/OIpnWNqEz9RcVmiKiiKZNTY=; b=qLd9EwwFXb6FlFuWBAbTj9GBDlYyWOUYlj7xXUfYrRNa1WNb1VndejiYUmHmszayUu vJJNYvBjPoVKSI9+0sHO8/Cqwkw+WQnXFw8jIRwzbWs1pnog36jxsR633uO8zyYVEQqt ZAA+9MbxgZNqSfXTBMxOL6rfQsdAC51ZTotDfDbR6QuUfChyS66PkYaNZREVoQdW5lG1 brykcQiDN9fo+LDwtBFz7mn2gQHQWZXj0RYrRz7FGERQH39ISxKIkmAJwg78cZe2fa+k 74DFnA7zYx5DjRgs6h537i/+T6yfDoRqE/TW+rS6bz53Zoy/A3o5oGOUbVJtkNMqhP3O kl6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=SZ7EFM9JvxBFqeMOjL2/OIpnWNqEz9RcVmiKiiKZNTY=; b=ZK2bQcg+8oWxfoa8gqhI9gJkr7eb+UT2ZpBgsxz7uQms5J1nXYHUd5qE7Rwv8H28zY thoeQfDMRS+ISgLkW8Rfo5e3YBuqNtj/b1RxpTNb1DKVI6Z1q0YAQHi0pLDplS/iCchl 6bsz/5/AcdSTeQkh8xPe4K8lGVHnr9bmirg1sHMOTBFc4bSX15wfrUTNOQQ9f2dEoHzc RZpNZftSinAPqk4NsuBKW1nqxDcFVo7R5DLZkghZIq6pnKRNW2iTK/EqKyCtZhEBLm29 pLlKCZSk0FI0EdydXEarTpi/k1FD2fFlfPmxs50pHyn34Wd+abUHaGD/3xBicOB+q+Z1 2xiA== X-Gm-Message-State: AOAM533QoZlN1SHQ6gPYd+a6u95fUwVCOi9yX66R3Dgpy4NAatX0ktxL G2KFxtQvGqNNQdUqRXCKRLaHd5o3cZI= X-Google-Smtp-Source: ABdhPJzkmP9nVcrzjn2llOniRu5uCh+stueauR2gXAVRn8bXGp699Eu7y8ow4WveZhwE3t7uNzL18eo8JOM= X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:f:10:5722:92ce:361f:3832]) (user=seanjc job=sendgmr) by 2002:ad4:5004:: with SMTP id s4mr21522qvo.8.1624384724058; Tue, 22 Jun 2021 10:58:44 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 22 Jun 2021 10:57:06 -0700 In-Reply-To: <20210622175739.3610207-1-seanjc@google.com> Message-Id: <20210622175739.3610207-22-seanjc@google.com> Mime-Version: 1.0 References: <20210622175739.3610207-1-seanjc@google.com> X-Mailer: git-send-email 2.32.0.288.g62a8d224e6-goog Subject: [PATCH 21/54] KVM: x86/mmu: Consolidate misc updates into shadow_mmu_init_context() 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, Yu Zhang , Maxim Levitsky Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Consolidate the MMU metadata update calls to deduplicate code, and to prep for future cleanup. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 3616c3b7618e..241408e6576d 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4507,11 +4507,6 @@ static void paging64_init_context_common(struct kvm_vcpu *vcpu, context->nx = is_nx(vcpu); context->root_level = root_level; - reset_rsvds_bits_mask(vcpu, context); - update_permission_bitmask(vcpu, context, false); - update_pkru_bitmask(vcpu, context, false); - update_last_nonleaf_level(vcpu, context); - MMU_WARN_ON(!is_pae(vcpu)); context->page_fault = paging64_page_fault; context->gva_to_gpa = paging64_gva_to_gpa; @@ -4534,12 +4529,6 @@ static void paging32_init_context(struct kvm_vcpu *vcpu, { context->nx = false; context->root_level = PT32_ROOT_LEVEL; - - reset_rsvds_bits_mask(vcpu, context); - update_permission_bitmask(vcpu, context, false); - update_pkru_bitmask(vcpu, context, false); - update_last_nonleaf_level(vcpu, context); - context->page_fault = paging32_page_fault; context->gva_to_gpa = paging32_gva_to_gpa; context->sync_page = paging32_sync_page; @@ -4703,6 +4692,12 @@ static void shadow_mmu_init_context(struct kvm_vcpu *vcpu, struct kvm_mmu *conte else paging32_init_context(vcpu, context); + if (____is_cr0_pg(regs)) { + reset_rsvds_bits_mask(vcpu, context); + update_permission_bitmask(vcpu, context, false); + update_pkru_bitmask(vcpu, context, false); + update_last_nonleaf_level(vcpu, context); + } context->shadow_root_level = new_role.base.level; context->mmu_role.as_u64 = new_role.as_u64; -- 2.32.0.288.g62a8d224e6-goog