From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hollis Blanchard Subject: Re: [PATCH 1/1] KVM: Fix kernel allocated memory slot Date: Tue, 11 Nov 2008 08:58:25 -0600 Message-ID: <1226415505.458.5.camel@localhost.localdomain> References: <1226388640-32200-1-git-send-email-sheng@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: Avi Kivity , kvm@vger.kernel.org To: Sheng Yang Return-path: Received: from e1.ny.us.ibm.com ([32.97.182.141]:42807 "EHLO e1.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755868AbYKKO62 (ORCPT ); Tue, 11 Nov 2008 09:58:28 -0500 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e1.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id mABEwMvO019107 for ; Tue, 11 Nov 2008 09:58:22 -0500 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id mABEwRrH117816 for ; Tue, 11 Nov 2008 09:58:27 -0500 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id mABEwQIe022301 for ; Tue, 11 Nov 2008 09:58:27 -0500 In-Reply-To: <1226388640-32200-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: On Tue, 2008-11-11 at 15:30 +0800, Sheng Yang wrote: > Commit 7fd49de9773fdcb7b75e823b21c1c5dc1e218c14 "KVM: ensure that memslot > userspace addresses are page-aligned" broke kernel space allocated memory > slot, for the userspace_addr is invalid. > > Signed-off-by: Sheng Yang > --- > virt/kvm/kvm_main.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 0a0a959..4727c08 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -715,7 +715,7 @@ int __kvm_set_memory_region(struct kvm *kvm, > goto out; > if (mem->guest_phys_addr & (PAGE_SIZE - 1)) > goto out; > - if (mem->userspace_addr & (PAGE_SIZE - 1)) > + if (user_alloc && (mem->userspace_addr & (PAGE_SIZE - 1))) > goto out; > if (mem->slot >= KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS) > goto out; Wow, I didn't realize we still had kernel-allocated guest memory. Why is that? Anyways, the above patch seems fine to me. Acked-by: Hollis Blanchard -- Hollis Blanchard IBM Linux Technology Center