commit b5e2c58ad865be4d88e4d29b5461015a82633e78
author Marcin Ślusarz <marcin.slusarz@intel.com> Wed Oct 21 17:51:22 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Mon Nov 02 19:52:11 2020 +0000
tree 8385407b33dba4941d29e86bd7eabaab13667082
parent 990343b70da7969e84730980c312404ab2509a22

anv: always annotate memory returned from anv_gem_mmap

anv_bo_pool_alloc expects that the memory returned by and_gem_mmap
was annotated using VALGRIND_MALLOCLIKE_BLOCK, but anv_gem_mmap_offset
didn't do that. Move annotation from anv_gem_mmap_legacy to common
code.

Fixes: 4abf0837cdb ("anv: Add support for new MMAP_OFFSET ioctl.")

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7381>

src/intel/vulkan/anv_gem.c

diff --git a/src/intel/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c
index fdc780c..81e2242 100644
--- a/src/intel/vulkan/anv_gem.c
+++ b/src/intel/vulkan/anv_gem.c
@@ -105,7 +105,6 @@
    if (ret != 0)
       return MAP_FAILED;
 
-   VG(VALGRIND_MALLOCLIKE_BLOCK(gem_mmap.addr_ptr, gem_mmap.size, 0, 1));
    return (void *)(uintptr_t) gem_mmap.addr_ptr;
 }
 
@@ -116,10 +115,16 @@
 anv_gem_mmap(struct anv_device *device, uint32_t gem_handle,
              uint64_t offset, uint64_t size, uint32_t flags)
 {
+   void *map;
    if (device->physical->has_mmap_offset)
-      return anv_gem_mmap_offset(device, gem_handle, offset, size, flags);
+      map = anv_gem_mmap_offset(device, gem_handle, offset, size, flags);
    else
-      return anv_gem_mmap_legacy(device, gem_handle, offset, size, flags);
+      map = anv_gem_mmap_legacy(device, gem_handle, offset, size, flags);
+
+   if (map != MAP_FAILED)
+      VG(VALGRIND_MALLOCLIKE_BLOCK(map, size, 0, 1));
+
+   return map;
 }
 
 /* This is just a wrapper around munmap, but it also notifies valgrind that
@@ -128,8 +133,7 @@
 void
 anv_gem_munmap(struct anv_device *device, void *p, uint64_t size)
 {
-   if (!device->physical->has_mmap_offset)
-      VG(VALGRIND_FREELIKE_BLOCK(p, 0));
+   VG(VALGRIND_FREELIKE_BLOCK(p, 0));
    munmap(p, size);
 }