From e97e9e62a1de9689ce8a2a77cb9657b387a1d14b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Aug 2016 15:01:59 -0700 Subject: [PATCH] vc4: Tell valgrind about BO allocations from mmap time to destroy. This helps in debugging memory pressure. It would be nice if we could tell valgrind about it all the way from allocation time to destroy, but we need a pointer to hand to VALGRIND_MALLOCLIKE_BLOCK. --- src/gallium/drivers/vc4/Makefile.am | 1 + src/gallium/drivers/vc4/vc4_bufmgr.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am index de82c2c515f..19fc3875955 100644 --- a/src/gallium/drivers/vc4/Makefile.am +++ b/src/gallium/drivers/vc4/Makefile.am @@ -32,6 +32,7 @@ AM_CFLAGS = \ $(VC4_CFLAGS) \ $(GALLIUM_DRIVER_CFLAGS) \ $(SIM_CFLAGS) \ + $(VALGRIND_CFLAGS) \ $() noinst_LTLIBRARIES = libvc4.la diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c index f6bacfd39e0..cf6a5114b87 100644 --- a/src/gallium/drivers/vc4/vc4_bufmgr.c +++ b/src/gallium/drivers/vc4/vc4_bufmgr.c @@ -35,6 +35,14 @@ #include "vc4_context.h" #include "vc4_screen.h" +#ifdef HAVE_VALGRIND +#include +#include +#define VG(x) x +#else +#define VG(x) +#endif + static bool dump_stats = false; static void @@ -209,6 +217,7 @@ vc4_bo_free(struct vc4_bo *bo) } #endif munmap(bo->map, bo->size); + VG(VALGRIND_FREELIKE_BLOCK(bo->map, 0)); } struct drm_gem_close c; @@ -618,6 +627,7 @@ vc4_bo_map_unsynchronized(struct vc4_bo *bo) bo->handle, (long long)offset, bo->size); abort(); } + VG(VALGRIND_MALLOCLIKE_BLOCK(bo->map, bo->size, 0, false)); return bo->map; } -- 2.30.2