Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
Message-ID: <6c3c9a5b-ccf3-4702-8832-b44a98822966@default>
Date:   Sun, 13 May 2018 01:28:29 -0700 (PDT)
From:   Liran Alon <liran.alon@oracle.com>
To:     <kernellwp@gmail.com>
Cc:     <rkrcmar@redhat.com>, <pbonzini@redhat.com>,
        <linux-kernel@vger.kernel.org>, <junaids@google.com>,
        <kvm@vger.kernel.org>
Subject: Re: [PATCH 1/2] KVM: X86: Fix CR3 reserve bits
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


----- kernellwp@gmail.com wrote:

> 2018-05-13 15:53 GMT+08:00 Liran Alon <liran.alon@oracle.com>:
> >
> > ----- kernellwp@gmail.com wrote:
> >
> >> From: Wanpeng Li <wanpengli@tencent.com>
> >>
> >> MSB of CR3 is a reserved bit if the PCIDE bit is not set in CR4.
> >> It should be checked when PCIDE bit is not set, however commit
> >> 'd1cd3ce900441 ("KVM: MMU: check guest CR3 reserved bits based on
> >> its physical address width")' removes the bit 63 checking
> >> unconditionally. This patch fixes it by checking bit 63 of CR3
> >> when PCIDE bit is not set in CR4.
> >>
> >> Fixes: d1cd3ce900441 (KVM: MMU: check guest CR3 reserved bits based
> on
> >> its physical address width)
> >> Cc: Paolo Bonzini <pbonzini@redhat.com>
> >> Cc: Radim Kr=C4=8Dm=C3=A1=C5=99 <rkrcmar@redhat.com>
> >> Cc: Junaid Shahid <junaids@google.com>
> >> Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> >> ---
> >>  arch/x86/kvm/emulate.c | 4 +++-
> >>  arch/x86/kvm/x86.c     | 2 +-
> >>  2 files changed, 4 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> >> index b3705ae..b21f427 100644
> >> --- a/arch/x86/kvm/emulate.c
> >> +++ b/arch/x86/kvm/emulate.c
> >> @@ -4189,7 +4189,9 @@ static int check_cr_write(struct
> >> x86_emulate_ctxt *ctxt)
> >>                               maxphyaddr =3D eax & 0xff;
> >>                       else
> >>                               maxphyaddr =3D 36;
> >> -                     rsvd =3D rsvd_bits(maxphyaddr, 62);
> >> +                     if (ctxt->ops->get_cr(ctxt, 4) &
> X86_CR4_PCIDE)
> >> +                             new_val &=3D ~CR3_PCID_INVD;
> >> +                     rsvd =3D rsvd_bits(maxphyaddr, 63);
> >
> > I would prefer instead to do this:
> > if (ctxt->ops->get_cr(ctxt, 4) & X86_CR4_PCIDE)
> >     rsvd &=3D ~CR3_PCID_INVD;
> > It makes more sense as opposed to temporary removing the
> CR3_PCID_INVD bit from new_val.
>=20
> It tries the same way
> https://urldefense.proofpoint.com/v2/url?u=3Dhttps-3A__git.kernel.org_pub=
_scm_virt_kvm_kvm.git_commit_-3Fid-3Dc19986fea873f3c745122bf79013a872a190f2=
12&d=3DDwIFaQ&c=3DRoP1YumCXCgaWHvlZYR8PZh8Bv7qIrMUB65eapI_JnE&r=3DJk6Q8nNzk=
Q6LJ6g42qARkg6ryIDGQr-yKXPNGZbpTx0&m=3Dr52WDgKBorUHwe_B_5Nw2Le_F_E0ne8lqqWW=
6n-3bSg&s=3DufTcXvhhAMkY3XP6gAx-HiKCT8ynPWo2fs2z9DqCzM4&e=3D
> pointed out.
>=20
> Regards,
> Wanpeng Li

Yes but there it makes sense as new CR3 value should not have bit 63 set in=
 vcpu->arch.cr3.

>=20
> >
> >>               }
> >>
> >>               if (new_val & rsvd)
> >> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> >> index 87e4805..9a90668 100644
> >> --- a/arch/x86/kvm/x86.c
> >> +++ b/arch/x86/kvm/x86.c
> >> @@ -863,7 +863,7 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu,
> unsigned
> >> long cr3)
> >>       }
> >>
> >>       if (is_long_mode(vcpu) &&
> >> -         (cr3 & rsvd_bits(cpuid_maxphyaddr(vcpu), 62)))
> >> +         (cr3 & rsvd_bits(cpuid_maxphyaddr(vcpu), 63)))
> >>               return 1;
> >>       else if (is_pae(vcpu) && is_paging(vcpu) &&
> >>                  !load_pdptrs(vcpu, vcpu->arch.walk_mmu, cr3))
> >> --
> >> 2.7.4