From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] Revert "KVM: x86: check for cr3 validity in ioctl_set_sregs" Date: Wed, 01 Jul 2009 20:52:03 +0200 Message-ID: <4A4BB053.6010407@web.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigE975E55A42BBBF95903C88C3" Cc: kvm-devel To: Avi Kivity , Marcelo Tosatti Return-path: Received: from fmmailgate03.web.de ([217.72.192.234]:46945 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750917AbZGASwG (ORCPT ); Wed, 1 Jul 2009 14:52:06 -0400 Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigE975E55A42BBBF95903C88C3 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable This reverts commit 6c20e1442bb1c62914bb85b7f4a38973d2a423ba. To my understanding, it became obsolete with the advent of the more robust check in mmu_alloc_roots (89da4ff17f). Moreover, it prevents the conceptually safe pattern 1. set sregs 2. register mem-slots 3. run vcpu by setting a sticky triple fault during step 1. Signed-off-by: Jan Kiszka --- arch/x86/kvm/x86.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index af53f64..8c5f7ef 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4355,13 +4355,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu = *vcpu, =20 vcpu->arch.cr2 =3D sregs->cr2; mmu_reset_needed |=3D vcpu->arch.cr3 !=3D sregs->cr3; - - down_read(&vcpu->kvm->slots_lock); - if (gfn_to_memslot(vcpu->kvm, sregs->cr3 >> PAGE_SHIFT)) - vcpu->arch.cr3 =3D sregs->cr3; - else - set_bit(KVM_REQ_TRIPLE_FAULT, &vcpu->requests); - up_read(&vcpu->kvm->slots_lock); + vcpu->arch.cr3 =3D sregs->cr3; =20 kvm_set_cr8(vcpu, sregs->cr8); =20 --------------enigE975E55A42BBBF95903C88C3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkpLsFgACgkQniDOoMHTA+kx+QCfRlLNwZLdLUHC2vtEc8hR31aE 5Q8AnR7XFRMr0LGxt1q3XgjFfKv7ZF8W =Pj4R -----END PGP SIGNATURE----- --------------enigE975E55A42BBBF95903C88C3--