From patchwork Tue Jun 22 17:57:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 12338307 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=ham 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 384BEC48BDF for ; Tue, 22 Jun 2021 18:03:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 216C861289 for ; Tue, 22 Jun 2021 18:03:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232749AbhFVSF7 (ORCPT ); Tue, 22 Jun 2021 14:05:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232911AbhFVSFM (ORCPT ); Tue, 22 Jun 2021 14:05:12 -0400 Received: from mail-qv1-xf4a.google.com (mail-qv1-xf4a.google.com [IPv6:2607:f8b0:4864:20::f4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02BBBC0698DC for ; Tue, 22 Jun 2021 10:59:43 -0700 (PDT) Received: by mail-qv1-xf4a.google.com with SMTP id k12-20020a0cfd6c0000b029020df9543019so18997278qvs.14 for ; Tue, 22 Jun 2021 10:59:42 -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=1ZiFOSwRtx32Cmg7gPoYH6t1rIajFQFzmmt4+1jIiJU=; b=Y53/BvHc6UgBTsWlXJMVwoW18CMnCIdlsbhixtdLTOkc1gfD7ZUohb8GJahWXHVEH8 ga7V0ax66f2eCcZTSl7ivlh37s/0jvP6YnK4vzsERBKzF2EaPHDEKh6jesaowpyW/L0c VDHUrOUxtgGGxfssFVzMAiEmmCCEPos9SdfRzoTfvQ9sgz0lehIB1HLdbc+vMehGzqDi 4tvwXCLnBfwWULefc4Q+SFW5rki89N7fFYK1sIQyZ0aiQExhl54ZcfLlIlHb+eWQgqtE +lAN3RNr+53em+DB0zBbzlhUdFsh+9yw0Cih+rODz6DmtDbO8pG9MHVWHBUDTkkGgwZT kXqg== 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=1ZiFOSwRtx32Cmg7gPoYH6t1rIajFQFzmmt4+1jIiJU=; b=Eip/jsdKVozmPwqPUeOZExfFqeNzFsbqDUqVD5VGYwTMh8zfqe93txIhOHjFFKkxdR rgkZ0rzZOtbjMlbKgFypdUBGGdq1tNX5cpn6CN5qIWOvs3Sdpl/ctEZDF00o38WF/4tR /So1zGq8lRGNXAz8DXbNO8EMro1jVI7hJKhkXqIitPJ62wqgBFOCirY+JDpzUugFA/Tr HDKKot45cRqCE0NDR5pzW268sIL4dDlcubQCheAxJf2t/hiKUFjBbOWeccCRQflmR37g JS0sp2jBnw263J6gJjYP2kkT2DTJxZNSmvnDcSaXmK3m0lQFIIgik0WEKma6BmVVlWDu mc1Q== X-Gm-Message-State: AOAM532be9jdqvCLDf2EbjEV+pj5SjiDJJDSKOcv8LzN2BSxOjJbBTLp DPb7ssVFI4nB+pWQShu/xVbBJj/K+BQ= X-Google-Smtp-Source: ABdhPJw4hXz1ZOVS1kR/VpmOtIrSSZMI49ufuWuH2yrlO4nuS0i+RZkS1BvaQo8S4ZKz+GBLbLUboFrS+o4= X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:f:10:5722:92ce:361f:3832]) (user=seanjc job=sendgmr) by 2002:a25:8b0b:: with SMTP id i11mr6993196ybl.484.1624384782096; Tue, 22 Jun 2021 10:59:42 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 22 Jun 2021 10:57:31 -0700 In-Reply-To: <20210622175739.3610207-1-seanjc@google.com> Message-Id: <20210622175739.3610207-47-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 46/54] KVM: x86/mmu: Use MMU's role to determine PTTYPE 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 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Use the MMU's role instead of vCPU state or role_regs to determine the PTTYPE, i.e. which helpers to wire up. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 4e11cb284006..92260cf48d5e 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4637,9 +4637,9 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu) context->inject_page_fault = kvm_inject_page_fault; context->root_level = role_regs_to_root_level(®s); - if (!is_paging(vcpu)) + if (!is_cr0_pg(context)) context->gva_to_gpa = nonpaging_gva_to_gpa; - else if (is_pae(vcpu)) + else if (is_cr4_pae(context)) context->gva_to_gpa = paging64_gva_to_gpa; else context->gva_to_gpa = paging32_gva_to_gpa; @@ -4689,9 +4689,9 @@ static void shadow_mmu_init_context(struct kvm_vcpu *vcpu, struct kvm_mmu *conte context->mmu_role.as_u64 = new_role.as_u64; - if (!____is_cr0_pg(regs)) + if (!is_cr0_pg(context)) nonpaging_init_context(context); - else if (____is_cr4_pae(regs)) + else if (is_cr4_pae(context)) paging64_init_context(context); else paging32_init_context(context);