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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D381C433F5 for ; Wed, 10 Nov 2021 14:48:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D5CE61268 for ; Wed, 10 Nov 2021 14:48:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232231AbhKJOvm (ORCPT ); Wed, 10 Nov 2021 09:51:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31214 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231316AbhKJOvj (ORCPT ); Wed, 10 Nov 2021 09:51:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636555731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=onLRqby/eIAq81jKitDiy/r/F+xHidt2JfJxJtklnSk=; b=iLg/5tGeoKByO13/iGXdLcgc1d5UPJJcJA6TMgvfBANKHLPIZVnaLOF7NwnhlfpyouAs5b uBtM6+UYgRxje8CfVdkQCJl03ril7Tb0vm/bZyYN4EMkBFg+DMrnYjSfTxZuHW4Fv+B+ru izDojWjVNjnYA4Z89nld7D2yZVGzHA4= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-200-DXiUm1woN1qtBH5cdybrKA-1; Wed, 10 Nov 2021 09:48:48 -0500 X-MC-Unique: DXiUm1woN1qtBH5cdybrKA-1 Received: by mail-ed1-f70.google.com with SMTP id y12-20020a056402270c00b003e28de6e995so2516631edd.11 for ; Wed, 10 Nov 2021 06:48:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=onLRqby/eIAq81jKitDiy/r/F+xHidt2JfJxJtklnSk=; b=7NhRMcUmKPmSooym+ImUS7HRMz4hY7n8T6vjjDvNVpuKZJcmNXqfXx4G10VK/LVwwu Rizi1LOn73Om100mxEGsbOspOJsFszXAiFvygvsWxFeMNWQkyGkFjZSlkB83gsavBbvD bdLnk2z1LR3yv7HnFgdK+pqV1A5pjsLPMbbbB9t19hDT67r58LwReNBTbwRQ36ofwBwu zpa9iRYQzGOxeTkuagQeMRL1HRigkzsTw2yW1YW7n/CR0MtB5+ocaNG0jVt35PiwAnYV l3OWF7EJHRjGIQYZITUYcgniBkfTn3Y1zDUYaTIjCKyA77Zrn22ObLHzoB74wegVGWdd 3BAw== X-Gm-Message-State: AOAM531FlO/W01KGGaDHOJAGVbFSCUbY+1VzdLq6/ApbbCDmBibYFMdq 5aUhcrzrrlOcaw6MXa3kN+oeyeg2hrR7heQPqcVXpGm629gaee4nIB3sQvQHtqaqfwi5vdHcjv2 7Zi53rB3noXbfX0MYESCH/kvU X-Received: by 2002:aa7:c693:: with SMTP id n19mr131544edq.101.1636555724968; Wed, 10 Nov 2021 06:48:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJycgjlrgpdudJbIXw52pMUGEBH8ONRvqGHDlcIB26TAbCbcDxYXjODus0tdOlyWBNvNweOtJg== X-Received: by 2002:aa7:c693:: with SMTP id n19mr131150edq.101.1636555721957; Wed, 10 Nov 2021 06:48:41 -0800 (PST) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id m11sm9463538edd.58.2021.11.10.06.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 06:48:41 -0800 (PST) From: Vitaly Kuznetsov To: Maxim Levitsky , kvm@vger.kernel.org Cc: Wanpeng Li , Borislav Petkov , Ingo Molnar , "H. Peter Anvin" , linux-kernel@vger.kernel.org, Sean Christopherson , Joerg Roedel , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , Thomas Gleixner , Paolo Bonzini , Jim Mattson , Maxim Levitsky Subject: Re: [PATCH 3/3] KVM: x86/mmu: don't skip mmu initialization when mmu root level changes In-Reply-To: <20211110100018.367426-4-mlevitsk@redhat.com> References: <20211110100018.367426-1-mlevitsk@redhat.com> <20211110100018.367426-4-mlevitsk@redhat.com> Date: Wed, 10 Nov 2021 15:48:40 +0100 Message-ID: <87r1bom5h3.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Maxim Levitsky writes: > When running mix of 32 and 64 bit guests, it is possible to have mmu > reset with same mmu role but different root level (32 bit vs 64 bit paging) > > Signed-off-by: Maxim Levitsky > --- > arch/x86/kvm/mmu/mmu.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 354d2ca92df4d..763867475860f 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -4745,7 +4745,10 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu) > union kvm_mmu_role new_role = > kvm_calc_tdp_mmu_root_page_role(vcpu, ®s, false); > > - if (new_role.as_u64 == context->mmu_role.as_u64) > + u8 new_root_level = role_regs_to_root_level(®s); > + > + if (new_role.as_u64 == context->mmu_role.as_u64 && > + context->root_level == new_root_level) > return; role_regs_to_root_level() uses 3 things: CR0.PG, EFER.LMA and CR4.PAE and two of these three are already encoded into extended mmu role (kvm_calc_mmu_role_ext()). Could we achieve the same result by adding EFER.LMA there? > > context->mmu_role.as_u64 = new_role.as_u64; > @@ -4757,7 +4760,7 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu) > context->get_guest_pgd = get_cr3; > context->get_pdptr = kvm_pdptr_read; > context->inject_page_fault = kvm_inject_page_fault; > - context->root_level = role_regs_to_root_level(®s); > + context->root_level = new_root_level; > > if (!is_cr0_pg(context)) > context->gva_to_gpa = nonpaging_gva_to_gpa; > @@ -4806,7 +4809,10 @@ static void shadow_mmu_init_context(struct kvm_vcpu *vcpu, struct kvm_mmu *conte > struct kvm_mmu_role_regs *regs, > union kvm_mmu_role new_role) > { > - if (new_role.as_u64 == context->mmu_role.as_u64) > + u8 new_root_level = role_regs_to_root_level(regs); > + > + if (new_role.as_u64 == context->mmu_role.as_u64 && > + context->root_level == new_root_level) > return; > > context->mmu_role.as_u64 = new_role.as_u64; > @@ -4817,8 +4823,8 @@ static void shadow_mmu_init_context(struct kvm_vcpu *vcpu, struct kvm_mmu *conte > paging64_init_context(context); > else > paging32_init_context(context); > - context->root_level = role_regs_to_root_level(regs); > > + context->root_level = new_root_level; > reset_guest_paging_metadata(vcpu, context); > context->shadow_root_level = new_role.base.level; -- Vitaly