Commit 8267cf8b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20180405.0' into staging 



VFIO fixes 2018-04-05

 - Convert over zealous error_report to trace point and make more
   meaningful (Eric Auger)

# gpg: Signature made Thu 05 Apr 2018 19:18:06 BST
# gpg:                using RSA key 239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg:                 aka "Alex Williamson <alex@shazbot.org>"
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22

* remotes/awilliam/tags/vfio-fixes-20180405.0:
  vfio: Use a trace point when a RAM section cannot be DMA mapped

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0e87fdc9 5c086005

hw/vfio/common.c

+5 −6
Original line number Diff line number Diff line
@@ -548,10 +548,9 @@ static void vfio_listener_region_add(MemoryListener *listener, 
        hwaddr pgmask = (1ULL << ctz64(hostwin->iova_pgsizes)) - 1;



        if ((iova & pgmask) || (int128_get64(llsize) & pgmask)) {

            error_report("Region 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx

                         " is not aligned to 0x%"HWADDR_PRIx

                         " and cannot be mapped for DMA",

                         section->offset_within_region,

            trace_vfio_listener_region_add_no_dma_map(

                memory_region_name(section->mr),

                section->offset_within_address_space,

                int128_getlo(section->size),

                pgmask + 1);

            return;

hw/vfio/trace-events

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ vfio_iommu_map_notify(const char *op, uint64_t iova_start, uint64_t iova_end) "i 
vfio_listener_region_add_skip(uint64_t start, uint64_t end) "SKIPPING region_add 0x%"PRIx64" - 0x%"PRIx64

vfio_listener_region_add_iommu(uint64_t start, uint64_t end) "region_add [iommu] 0x%"PRIx64" - 0x%"PRIx64

vfio_listener_region_add_ram(uint64_t iova_start, uint64_t iova_end, void *vaddr) "region_add [ram] 0x%"PRIx64" - 0x%"PRIx64" [%p]"

vfio_listener_region_add_no_dma_map(const char *name, uint64_t iova, uint64_t size, uint64_t page_size) "Region \"%s\" 0x%"PRIx64" size=0x%"PRIx64" is not aligned to 0x%"PRIx64" and cannot be mapped for DMA"

vfio_listener_region_del_skip(uint64_t start, uint64_t end) "SKIPPING region_del 0x%"PRIx64" - 0x%"PRIx64

vfio_listener_region_del(uint64_t start, uint64_t end) "region_del 0x%"PRIx64" - 0x%"PRIx64

vfio_disconnect_container(int fd) "close container->fd=%d"