| Message ID | 1496320911-51305-24-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jun 01, 2017 at 02:41:41PM +0200, Paolo Bonzini wrote: > From: Peter Xu <peterx@redhat.com> > > The IOTLB that it returned didn't guarantee that page_mask is indeed a > so-called page mask. That won't affect current usage since now only > vhost is using it (vhost API allows arbitary IOTLB range). However we > have IOTLB scemantic and we should best follow it. This patch fixes this > issue to make sure the page_mask is always a valid page mask. > > Fixes: a764040 ("exec: abstract address_space_do_translate()") > Signed-off-by: Peter Xu <peterx@redhat.com> > Message-Id: <1496212378-22605-1-git-send-email-peterx@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > exec.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/exec.c b/exec.c > index 29633cd..22b8f0c 100644 > --- a/exec.c > +++ b/exec.c > @@ -528,16 +528,14 @@ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr, > section.offset_within_region; > > if (plen == (hwaddr)-1) { > - /* > - * We use default page size here. Logically it only happens > - * for identity mappings. > - */ > - plen = TARGET_PAGE_SIZE; > + /* If not specified during translation, use default mask */ > + plen = TARGET_PAGE_MASK; > + } else { > + /* Make it a valid page mask */ > + assert(plen); > + plen = pow2floor(plen) - 1; > } > > - /* Convert to address mask */ > - plen -= 1; > - > return (IOMMUTLBEntry) { > .target_as = section.address_space, > .iova = addr & ~plen, > -- > 1.8.3.1 Paolo, I got a better idea on refactoring address_space_get_iotlb_entry(). If you haven't started preparing another pull request, please feel free to drop this one (it fixed the problem but not that complete). Otherwise I'll just work upon it, which is fine as well. Sorry for the troublesome.
diff --git a/exec.c b/exec.c index 29633cd..22b8f0c 100644 --- a/exec.c +++ b/exec.c @@ -528,16 +528,14 @@ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr, section.offset_within_region; if (plen == (hwaddr)-1) { - /* - * We use default page size here. Logically it only happens - * for identity mappings. - */ - plen = TARGET_PAGE_SIZE; + /* If not specified during translation, use default mask */ + plen = TARGET_PAGE_MASK; + } else { + /* Make it a valid page mask */ + assert(plen); + plen = pow2floor(plen) - 1; } - /* Convert to address mask */ - plen -= 1; - return (IOMMUTLBEntry) { .target_as = section.address_space, .iova = addr & ~plen,