From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: Re: [PATCH v2] KVM: IOMMU: hva align mapping page size Date: Tue, 5 Nov 2013 09:56:37 +0200 Message-ID: <20131105075636.GI7513@redhat.com> References: <20131101160855.GB5052@psuche> <20131102011433.GA30381@amt.cnet> <20131104160812.GA6026@psuche> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20131104160812.GA6026@psuche> Sender: linux-kernel-owner@vger.kernel.org To: Greg Edwards Cc: kvm@vger.kernel.org, "iommu@lists.linux-foundation.org" , "linux-kernel@vger.kernel.org" , Marcelo Tosatti List-Id: iommu@lists.linux-foundation.org On Mon, Nov 04, 2013 at 09:08:12AM -0700, Greg Edwards wrote: > When determining the page size we could use to map with the IOMMU, the > page size should also be aligned with the hva, not just the gfn. The > gfn may not reflect the real alignment within the hugetlbfs file. > For some reason you dropped very good commit message from v1. I applied v2 with v1 commit message. > Signed-off-by: Greg Edwards > Cc: stable@vger.kernel.org > --- > virt/kvm/iommu.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c > index 72a130b..c329c8f 100644 > --- a/virt/kvm/iommu.c > +++ b/virt/kvm/iommu.c > @@ -103,6 +103,10 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot) > while ((gfn << PAGE_SHIFT) & (page_size - 1)) > page_size >>= 1; > > + /* Make sure hva is aligned to the page size we want to map */ > + while (__gfn_to_hva_memslot(slot, gfn) & (page_size - 1)) > + page_size >>= 1; > + > /* > * Pin all pages we are about to map in memory. This is > * important because we unmap and unpin in 4kb steps later. > -- > 1.8.3.2 > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Gleb.