On Mon, 16 Mar 2015 23:49:01 +0300 Stefan Strogin <s.strogin@xxxxxxxxxxxxxxxxxxx> wrote: > Oops... forgot to cc tracing maintainers. Sorry! Thanks, > > On 16/03/15 19:06, Stefan Strogin wrote: > > Add trace events for cma_alloc() and cma_release(). > > > > Signed-off-by: Stefan Strogin <stefan.strogin@xxxxxxxxx> > > --- > > include/trace/events/cma.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++ > > mm/cma.c | 5 ++++ > > 2 files changed, 62 insertions(+) > > create mode 100644 include/trace/events/cma.h > > > > diff --git a/include/trace/events/cma.h b/include/trace/events/cma.h > > new file mode 100644 > > index 0000000..d88881b > > --- /dev/null > > +++ b/include/trace/events/cma.h > > @@ -0,0 +1,57 @@ > > +#undef TRACE_SYSTEM > > +#define TRACE_SYSTEM cma > > + > > +#if !defined(_TRACE_CMA_H) || defined(TRACE_HEADER_MULTI_READ) > > +#define _TRACE_CMA_H > > + > > +#include <linux/types.h> > > +#include <linux/tracepoint.h> > > + > > +TRACE_EVENT(cma_alloc, > > + > > + TP_PROTO(struct cma *cma, struct page *page, int count), > > + > > + TP_ARGS(cma, page, count), > > + > > + TP_STRUCT__entry( > > + __field(struct page *, page) > > + __field(unsigned long, count) > > + ), > > + > > + TP_fast_assign( > > + __entry->page = page; > > + __entry->count = count; > > + ), > > + > > + TP_printk("page=%p pfn=%lu count=%lu", > > + __entry->page, > > + __entry->page ? page_to_pfn(__entry->page) : 0, Can page_to_pfn(value) ever be different throughout the life of the boot? That is, can it return a different result given the same value (vmalloc area comes to mind). > > + __entry->count) > > +); > > + > > +TRACE_EVENT(cma_release, > > + > > + TP_PROTO(struct cma *cma, unsigned long pfn, int count), > > + > > + TP_ARGS(cma, pfn, count), > > + > > + TP_STRUCT__entry( > > + __field(unsigned long, pfn) > > + __field(unsigned long, count) > > + ), > > + > > + TP_fast_assign( > > + __entry->pfn = pfn; > > + __entry->count = count; > > + ), > > + > > + TP_printk("pfn=%lu page=%p count=%lu", > > + __entry->pfn, > > + pfn_to_page(__entry->pfn), Same here. Can pfn_to_page(value) ever return a different result with the same value in a single boot? -- Steve > > + __entry->count) > > +); > > + > > +#endif /* _TRACE_CMA_H */ > > + > > +/* This part must be outside protection */ > > +#include <trace/define_trace.h> > > diff --git a/mm/cma.c b/mm/cma.c > > index 47203fa..63dfc0e 100644 > > --- a/mm/cma.c > > +++ b/mm/cma.c > > @@ -23,6 +23,7 @@ > > # define DEBUG > > #endif > > #endif > > +#define CREATE_TRACE_POINTS > > > > #include <linux/memblock.h> > > #include <linux/err.h> > > @@ -34,6 +35,7 @@ > > #include <linux/cma.h> > > #include <linux/highmem.h> > > #include <linux/io.h> > > +#include <trace/events/cma.h> > > > > #include "cma.h" > > > > @@ -414,6 +416,8 @@ struct page *cma_alloc(struct cma *cma, unsigned int count, unsigned int align) > > start = bitmap_no + mask + 1; > > } > > > > + trace_cma_alloc(cma, page, count); > > + > > pr_debug("%s(): returned %p\n", __func__, page); > > return page; > > } > > @@ -446,6 +450,7 @@ bool cma_release(struct cma *cma, const struct page *pages, unsigned int count) > > > > free_contig_range(pfn, count); > > cma_clear_bitmap(cma, pfn, count); > > + trace_cma_release(cma, pfn, count); > > > > return true; > > } > > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>