video: tegra: nvmap: update nvmap_alloc_handle trace event

Add alloc info to nvmap_alloc_handle trace event.
This allows tracing allocs once nvmap stats are enabled.

Change-Id: Id16d2fb19ac3ec5d6af7571080bd91af0a7d2888
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/377457

diff --git a/drivers/video/tegra/nvmap/nvmap_handle.c b/drivers/video/tegra/nvmap/nvmap_handle.c
index 068b33110817b5c6c1bbfe615ddf6231c29b95e2..7fbe37bb55cab7ccb5e04494084ffb693c23b7ef 100644 (file)
--- a/drivers/video/tegra/nvmap/nvmap_handle.c
+++ b/drivers/video/tegra/nvmap/nvmap_handle.c
@@ -339,9 +339,11 @@ int nvmap_alloc_handle(struct nvmap_client *client,
        }
 
        nvmap_stats_inc(NS_TOTAL, PAGE_ALIGN(h->orig_size));
+       nvmap_stats_inc(NS_ALLOC, PAGE_ALIGN(h->size));
        trace_nvmap_alloc_handle(client, h,
                h->size, heap_mask, align, flags,
-               nvmap_stats_read(NS_TOTAL));
+               nvmap_stats_read(NS_TOTAL),
+               nvmap_stats_read(NS_ALLOC));
        h->userflags = flags;
        nr_page = ((h->size + PAGE_SIZE - 1) >> PAGE_SHIFT);
        h->secure = !!(flags & NVMAP_HANDLE_SECURE);
@@ -392,13 +394,13 @@ int nvmap_alloc_handle(struct nvmap_client *client,
 
 out:
        if (h->alloc) {
-               nvmap_stats_inc(NS_ALLOC, h->size);
                if (client->kernel_client)
                        nvmap_stats_inc(NS_KALLOC, h->size);
                else
                        nvmap_stats_inc(NS_UALLOC, h->size);
        } else {
                nvmap_stats_dec(NS_TOTAL, PAGE_ALIGN(h->orig_size));
+               nvmap_stats_dec(NS_ALLOC, PAGE_ALIGN(h->orig_size));
        }
 
        err = (h->alloc) ? 0 : err;

diff --git a/include/trace/events/nvmap.h b/include/trace/events/nvmap.h
index 671aed193034bf5fecf65ef785d480e12b253899..06d14c8cff20c50b599c515bc79b6557734fae1a 100644 (file)
--- a/include/trace/events/nvmap.h
+++ b/include/trace/events/nvmap.h
@@ -94,10 +94,11 @@ TRACE_EVENT(nvmap_alloc_handle,
                 u32 heap_mask,
                 u32 align,
                 u32 flags,
-                u64 total
+                u64 total,
+                u64 alloc
        ),
 
-       TP_ARGS(client, handle, size, heap_mask, align, flags, total),
+       TP_ARGS(client, handle, size, heap_mask, align, flags, total, alloc),
 
        TP_STRUCT__entry(
                __field(struct nvmap_client *, client)
@@ -107,6 +108,7 @@ TRACE_EVENT(nvmap_alloc_handle,
                __field(u32, align)
                __field(u32, flags)
                __field(u64, total)
+               __field(u64, alloc)
        ),
 
        TP_fast_assign(
@@ -117,12 +119,14 @@ TRACE_EVENT(nvmap_alloc_handle,
                __entry->align = align;
                __entry->flags = flags;
                __entry->total = total;
+               __entry->alloc = alloc;
        ),
 
-       TP_printk("client=%p, id=0x%p, size=%zu, heap_mask=0x%x, align=%d, flags=0x%x, total=%llu",
+       TP_printk("client=%p, id=0x%p, size=%zu, heap_mask=0x%x, align=%d, flags=0x%x, total=%llu, alloc=%llu",
                __entry->client, __entry->handle, __entry->size,
                __entry->heap_mask, __entry->align, __entry->flags,
-               (unsigned long long)__entry->total)
+               (unsigned long long)__entry->total,
+               (unsigned long long)__entry->alloc)
 );
 
 TRACE_EVENT(nvmap_free_handle,