From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH v2] kvm: Fix overlapping check for memory slots Date: Mon, 13 Apr 2009 11:59:32 +0200 Message-ID: <49E30D04.3090903@web.de> References: <49E06754.8050906@web.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig5A003EEE3020DCE125FE2D99" Cc: kvm-devel , Glauber Costa , qemu-devel To: Avi Kivity Return-path: Received: from fmmailgate03.web.de ([217.72.192.234]:36470 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755529AbZDMJ7n (ORCPT ); Mon, 13 Apr 2009 05:59:43 -0400 In-Reply-To: <49E06754.8050906@web.de> Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig5A003EEE3020DCE125FE2D99 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable When checking for overlapping slots on registration of a new one, kvm currently also considers zero-length (ie. deleted) slots and rejects requests incorrectly. This finally denies user space from joining slots. Fix the check by skipping deleted slots and advertise this via a KVM_CAP_JOIN_MEMORY_REGIONS_WORKS. Signed-off-by: Jan Kiszka --- include/linux/kvm.h | 2 ++ virt/kvm/kvm_main.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/linux/kvm.h b/include/linux/kvm.h index ee755e2..644e3a9 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -413,6 +413,8 @@ struct kvm_trace_rec { #define KVM_CAP_DEVICE_MSIX 28 #endif #define KVM_CAP_ASSIGN_DEV_IRQ 29 +/* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */ +#define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30 =20 #ifdef KVM_CAP_IRQ_ROUTING =20 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 363af32..3265566 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1117,7 +1117,7 @@ int __kvm_set_memory_region(struct kvm *kvm, for (i =3D 0; i < KVM_MEMORY_SLOTS; ++i) { struct kvm_memory_slot *s =3D &kvm->memslots[i]; =20 - if (s =3D=3D memslot) + if (s =3D=3D memslot || !s->npages) continue; if (!((base_gfn + npages <=3D s->base_gfn) || (base_gfn >=3D s->base_gfn + s->npages))) @@ -2262,6 +2262,7 @@ static long kvm_dev_ioctl_check_extension_generic(l= ong arg) switch (arg) { case KVM_CAP_USER_MEMORY: case KVM_CAP_DESTROY_MEMORY_REGION_WORKS: + case KVM_CAP_JOIN_MEMORY_REGIONS_WORKS: return 1; #ifdef CONFIG_HAVE_KVM_IRQCHIP case KVM_CAP_IRQ_ROUTING: --------------enig5A003EEE3020DCE125FE2D99 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 iEYEARECAAYFAknjDQ0ACgkQniDOoMHTA+mVrgCfUmiQT84DsdYeH0S3RZbWSFyb AuAAniOeK/ugXV1QUOmbKOVb7pkJR8fg =5pOb -----END PGP SIGNATURE----- --------------enig5A003EEE3020DCE125FE2D99--