From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOQWJ-0003IH-Vl for qemu-devel@nongnu.org; Wed, 27 Jan 2016 08:52:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOQWF-0002Cc-08 for qemu-devel@nongnu.org; Wed, 27 Jan 2016 08:52:27 -0500 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:33338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOQWE-0002CW-M0 for qemu-devel@nongnu.org; Wed, 27 Jan 2016 08:52:22 -0500 Received: by mail-wm0-x229.google.com with SMTP id l66so3579248wml.0 for ; Wed, 27 Jan 2016 05:52:22 -0800 (PST) From: Eric Auger Date: Wed, 27 Jan 2016 13:51:55 +0000 Message-Id: <1453902715-25304-8-git-send-email-eric.auger@linaro.org> In-Reply-To: <1453902715-25304-1-git-send-email-eric.auger@linaro.org> References: <1453902715-25304-1-git-send-email-eric.auger@linaro.org> Subject: [Qemu-devel] [RFC 7/7] hw: vfio: common: adapt vfio_listeners for reserved_iova region List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, alex.williamson@redhat.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, pbonzini@redhat.com, agraf@suse.de Cc: Bharat.Bhushan@freescale.com, suravee.suthikulpanit@amd.com, christoffer.dall@linaro.org In case of reserved iova region, let's declare this region to the kernel so that it can use it for IOVA/PA bindings. Signed-off-by: Eric Auger --- hw/vfio/common.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 247c87b..ee957ba 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -217,10 +217,8 @@ static int vfio_dma_unmap(VFIOContainer *container, * * unregistration is handled using vfio_dma_unmap */ -int vfio_register_reserved_iova(VFIOContainer *container, hwaddr iova, - ram_addr_t size); -int vfio_register_reserved_iova(VFIOContainer *container, hwaddr iova, - ram_addr_t size) +static int vfio_register_reserved_iova(VFIOContainer *container, hwaddr iova, + ram_addr_t size) { struct vfio_iommu_type1_dma_map map = { .argsz = sizeof(map), @@ -271,6 +269,7 @@ static int vfio_dma_map(VFIOContainer *container, hwaddr iova, static bool vfio_listener_skipped_section(MemoryRegionSection *section) { return (!memory_region_is_ram(section->mr) && + !memory_region_is_reserved_iova(section->mr) && !memory_region_is_iommu(section->mr)) || /* * Sizing an enabled 64-bit BAR can cause spurious mappings to @@ -354,7 +353,7 @@ static void vfio_listener_region_add(MemoryListener *listener, hwaddr iova, end; Int128 llend; void *vaddr; - int ret; + int ret = -1; if (vfio_listener_skipped_section(section)) { trace_vfio_listener_region_add_skip( @@ -418,24 +417,35 @@ static void vfio_listener_region_add(MemoryListener *listener, return; } - /* Here we assume that memory_region_is_ram(section->mr)==true */ + /* Here we assume that the memory region is ram or reserved iova */ - vaddr = memory_region_get_ram_ptr(section->mr) + - section->offset_within_region + - (iova - section->offset_within_address_space); + if (memory_region_is_ram(section->mr)) { + vaddr = memory_region_get_ram_ptr(section->mr) + + section->offset_within_region + + (iova - section->offset_within_address_space); - trace_vfio_listener_region_add_ram(iova, end - 1, vaddr); + trace_vfio_listener_region_add_ram(iova, end - 1, vaddr); - ret = vfio_dma_map(container, iova, end - iova, vaddr, section->readonly); - if (ret) { - error_report("vfio_dma_map(%p, 0x%"HWADDR_PRIx", " - "0x%"HWADDR_PRIx", %p) = %d (%m)", - container, iova, end - iova, vaddr, ret); - goto fail; + ret = vfio_dma_map(container, iova, end - iova, vaddr, + section->readonly); + if (ret) { + error_report("vfio_dma_map(%p, 0x%"HWADDR_PRIx", " + "0x%"HWADDR_PRIx", %p) = %d (%m)", + container, iova, end - iova, vaddr, ret); + goto fail; + } + return; + } else if (memory_region_is_reserved_iova(section->mr)) { + ret = vfio_register_reserved_iova(container, iova, end - iova); + if (ret) { + error_report("vfio_register_reserved_iova(%p, 0x%"HWADDR_PRIx", " + "0x%"HWADDR_PRIx") = %d (%m)", + container, iova, end - iova, ret); + goto fail; + } + return; } - return; - fail: /* * On the initfn path, store the first error in the container so we -- 1.9.1