* [Qemu-devel] [REBASED 1/2] exec: add page_mask for flatview_do_translate
2017-10-05 17:13 [Qemu-devel] [REBASED 0/2] exec: further refine address_space_get_iotlb_entry() Maxime Coquelin
@ 2017-10-05 17:13 ` Maxime Coquelin
2017-10-06 10:28 ` Maxime Coquelin
2017-10-05 17:13 ` [Qemu-devel] [REBASED 2/2] exec: simplify address_space_get_iotlb_entry Maxime Coquelin
2017-10-06 4:04 ` [Qemu-devel] [REBASED 0/2] exec: further refine address_space_get_iotlb_entry() Michael S. Tsirkin
2 siblings, 1 reply; 5+ messages in thread
From: Maxime Coquelin @ 2017-10-05 17:13 UTC (permalink / raw)
To: peterx, pbonzini, mst, jasowang, qemu-devel; +Cc: qemu-stable, Maxime Coquelin
From: Peter Xu <peterx@redhat.com>
The function is originally used for flatview_space_translate() and what
we care about most is (xlat, plen) range. However for iotlb requests, we
don't really care about "plen", but the size of the page that "xlat" is
located on. While, plen cannot really contain this information.
A simple example to show why "plen" is not good for IOTLB translations:
E.g., for huge pages, it is possible that guest mapped 1G huge page on
device side that used this GPA range:
0x100000000 - 0x13fffffff
Then let's say we want to translate one IOVA that finally mapped to GPA
0x13ffffe00 (which is located on this 1G huge page). Then here we'll
get:
(xlat, plen) = (0x13fffe00, 0x200)
So the IOTLB would be only covering a very small range since from
"plen" (which is 0x200 bytes) we cannot tell the size of the page.
Actually we can really know that this is a huge page - we just throw the
information away in flatview_do_translate().
This patch introduced "page_mask" optional parameter to capture that
page mask info. Also, I made "plen" an optional parameter as well, with
some comments for the whole function.
No functional change yet.
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
exec.c | 46 ++++++++++++++++++++++++++++++++++++++++------
1 file changed, 40 insertions(+), 6 deletions(-)
diff --git a/exec.c b/exec.c
index 7a80460725..c5f2752f7d 100644
--- a/exec.c
+++ b/exec.c
@@ -467,11 +467,29 @@ address_space_translate_internal(AddressSpaceDispatch *d, hwaddr addr, hwaddr *x
return section;
}
-/* Called from RCU critical section */
+/**
+ * flatview_do_translate - translate an address in FlatView
+ *
+ * @fv: the flat view that we want to translate on
+ * @addr: the address to be translated in above address space
+ * @xlat: the translated address offset within memory region. It
+ * cannot be @NULL.
+ * @plen_out: valid read/write length of the translated address. It
+ * can be @NULL when we don't care about it.
+ * @page_mask_out: page mask for the translated address. This
+ * should only be meaningful for IOMMU translated
+ * addresses, since there may be huge pages that this bit
+ * would tell. It can be @NULL if we don't care about it.
+ * @is_write: whether the translation operation is for write
+ * @is_mmio: whether this can be MMIO, set true if it can
+ *
+ * This function is called from RCU critical section
+ */
static MemoryRegionSection flatview_do_translate(FlatView *fv,
hwaddr addr,
hwaddr *xlat,
- hwaddr *plen,
+ hwaddr *plen_out,
+ hwaddr *page_mask_out,
bool is_write,
bool is_mmio,
AddressSpace **target_as)
@@ -480,11 +498,17 @@ static MemoryRegionSection flatview_do_translate(FlatView *fv,
MemoryRegionSection *section;
IOMMUMemoryRegion *iommu_mr;
IOMMUMemoryRegionClass *imrc;
+ hwaddr page_mask = TARGET_PAGE_MASK;
+ hwaddr plen = (hwaddr)(-1);
+
+ if (plen_out) {
+ plen = *plen_out;
+ }
for (;;) {
section = address_space_translate_internal(
flatview_to_dispatch(fv), addr, &addr,
- plen, is_mmio);
+ &plen, is_mmio);
iommu_mr = memory_region_get_iommu(section->mr);
if (!iommu_mr) {
@@ -496,7 +520,8 @@ static MemoryRegionSection flatview_do_translate(FlatView *fv,
IOMMU_WO : IOMMU_RO);
addr = ((iotlb.translated_addr & ~iotlb.addr_mask)
| (addr & iotlb.addr_mask));
- *plen = MIN(*plen, (addr | iotlb.addr_mask) - addr + 1);
+ page_mask = iotlb.addr_mask;
+ plen = MIN(plen, (addr | iotlb.addr_mask) - addr + 1);
if (!(iotlb.perm & (1 << is_write))) {
goto translate_fail;
}
@@ -507,6 +532,14 @@ static MemoryRegionSection flatview_do_translate(FlatView *fv,
*xlat = addr;
+ if (page_mask_out) {
+ *page_mask_out = page_mask;
+ }
+
+ if (plen_out) {
+ *plen_out = plen;
+ }
+
return *section;
translate_fail:
@@ -525,7 +558,7 @@ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr,
/* This can never be MMIO. */
section = flatview_do_translate(address_space_to_flatview(as), addr,
- &xlat, &plen, is_write, false, &as);
+ &xlat, &plen, NULL, is_write, false, &as);
/* Illegal translation */
if (section.mr == &io_mem_unassigned) {
@@ -569,7 +602,8 @@ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat,
AddressSpace *as = NULL;
/* This can be MMIO, so setup MMIO bit. */
- section = flatview_do_translate(fv, addr, xlat, plen, is_write, true, &as);
+ section = flatview_do_translate(fv, addr, xlat, plen, NULL,
+ is_write, true, &as);
mr = section.mr;
if (xen_enabled() && memory_access_is_direct(mr, is_write)) {
--
2.13.6
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Qemu-devel] [REBASED 2/2] exec: simplify address_space_get_iotlb_entry
2017-10-05 17:13 [Qemu-devel] [REBASED 0/2] exec: further refine address_space_get_iotlb_entry() Maxime Coquelin
2017-10-05 17:13 ` [Qemu-devel] [REBASED 1/2] exec: add page_mask for flatview_do_translate Maxime Coquelin
@ 2017-10-05 17:13 ` Maxime Coquelin
2017-10-06 4:04 ` [Qemu-devel] [REBASED 0/2] exec: further refine address_space_get_iotlb_entry() Michael S. Tsirkin
2 siblings, 0 replies; 5+ messages in thread
From: Maxime Coquelin @ 2017-10-05 17:13 UTC (permalink / raw)
To: peterx, pbonzini, mst, jasowang, qemu-devel; +Cc: qemu-stable, Maxime Coquelin
From: Peter Xu <peterx@redhat.com>
This patch let address_space_get_iotlb_entry() to use the newly
introduced page_mask parameter in flatview_do_translate(). Then we
will be sure the IOTLB can be aligned to page mask, also we should
nicely support huge pages now when introducing a764040.
Fixes: a764040 ("exec: abstract address_space_do_translate()")
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
exec.c | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/exec.c b/exec.c
index c5f2752f7d..39fc96a19e 100644
--- a/exec.c
+++ b/exec.c
@@ -551,14 +551,14 @@ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr,
bool is_write)
{
MemoryRegionSection section;
- hwaddr xlat, plen;
+ hwaddr xlat, page_mask;
- /* Try to get maximum page mask during translation. */
- plen = (hwaddr)-1;
-
- /* This can never be MMIO. */
- section = flatview_do_translate(address_space_to_flatview(as), addr,
- &xlat, &plen, NULL, is_write, false, &as);
+ /*
+ * This can never be MMIO, and we don't really care about plen,
+ * but page mask.
+ */
+ section = flatview_do_translate(address_space_to_flatview(as), addr, &xlat,
+ NULL, &page_mask, is_write, false, &as);
/* Illegal translation */
if (section.mr == &io_mem_unassigned) {
@@ -569,22 +569,11 @@ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr,
xlat += section.offset_within_address_space -
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;
- }
-
- /* Convert to address mask */
- plen -= 1;
-
return (IOMMUTLBEntry) {
.target_as = as,
- .iova = addr & ~plen,
- .translated_addr = xlat & ~plen,
- .addr_mask = plen,
+ .iova = addr & ~page_mask,
+ .translated_addr = xlat & ~page_mask,
+ .addr_mask = page_mask,
/* IOTLBs are for DMAs, and DMA only allows on RAMs. */
.perm = IOMMU_RW,
};
--
2.13.6
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [REBASED 0/2] exec: further refine address_space_get_iotlb_entry()
2017-10-05 17:13 [Qemu-devel] [REBASED 0/2] exec: further refine address_space_get_iotlb_entry() Maxime Coquelin
2017-10-05 17:13 ` [Qemu-devel] [REBASED 1/2] exec: add page_mask for flatview_do_translate Maxime Coquelin
2017-10-05 17:13 ` [Qemu-devel] [REBASED 2/2] exec: simplify address_space_get_iotlb_entry Maxime Coquelin
@ 2017-10-06 4:04 ` Michael S. Tsirkin
2 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2017-10-06 4:04 UTC (permalink / raw)
To: Maxime Coquelin; +Cc: peterx, pbonzini, jasowang, qemu-devel, qemu-stable
On Thu, Oct 05, 2017 at 07:13:07PM +0200, Maxime Coquelin wrote:
> This series is a rebase of the first two patches of Peter's series
> improving address_space_get_iotlb_entry():
> Message-Id: <1496404254-17429-1-git-send-email-peterx@redhat.com>
>
> It is actually not only an improvement, but fixes a regression in the way
> IOTLB updates sent to the backends are generated.
> The regression is introduced by patch:
> a764040cc8 ("exec: abstract address_space_do_translate()")
>
> Prior to this patch IOTLB entries sent to the backend were aligned on the
> guest page boundaries (both addresses and size).
> For example, with the guest using 2MB pages:
> * Backend sends IOTLB miss request for iova = 0x112378fb4
> * QEMU replies with an IOTLB update with iova = 0x112200000, size = 0x200000
> * Bakend insert above entry in its cache and compute the translation
> In this case, if the backend needs later to translate 0x112378004, it will
> result in a cache it and no need to send another IOTLB miss.
>
> With this patch, the addr of the IOTLB entry will be the address requested
> via the IOTLB miss, the size is computed to cover the remaining of the guest
> page.
> The same example gives:
> * Backend sends IOTLB miss request for iova = 0x112378fb4
> * QEMU replies with an IOTLB update with iova = 112378fb4, size = 0x8704c
> * Bakend insert above entry in its cache and compute the translation
> In this case, if the backend needs later to translate 0x112378004, it will
> result in another cache miss:
> * Backend sends IOTLB miss request for iova = 0x112378004
> * QEMU replies with an IOTLB update with iova = 0x112378004, size = 0x87FFC
> * Bakend insert above entry in its cache and compute the translation
> It results in having much more IOTLB misses, and more importantly it pollutes
> the device IOTLB cache by multiplying the number of entries that moreover
> overlap.
>
> Note that current Kernel & User backends implementation do not merge contiguous
> and overlapping IOTLB entries at device IOTLB cache insertion.
>
> This series fixes this regression, so that IOTLB updates are aligned on
> guest's page boundaries.
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> Peter Xu (2):
> exec: add page_mask for flatview_do_translate
> exec: simplify address_space_get_iotlb_entry
>
> exec.c | 75 +++++++++++++++++++++++++++++++++++++++++++-----------------------
> 1 file changed, 49 insertions(+), 26 deletions(-)
>
> --
> 2.13.6
^ permalink raw reply [flat|nested] 5+ messages in thread