forked from Minki/linux
78fa51503f
size_t in cma_alloc is confusing since it makes people think it's byte
count, not pages. Change it to unsigned long[1].
The unsigned int in cma_release is also not right so change it. Since we
have unsigned long in cma_release, free_contig_range should also respect
it.
[1] 67a2e213e7
, mm: cma: fix incorrect type conversion for size during dma allocation
Link: https://lore.kernel.org/linux-mm/20210324043434.GP1719932@casper.infradead.org/
Link: https://lkml.kernel.org/r/20210331164018.710560-1-minchan@kernel.org
Signed-off-by: Minchan Kim <minchan@kernel.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
114 lines
2.4 KiB
C
114 lines
2.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#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>
|
|
|
|
DECLARE_EVENT_CLASS(cma_alloc_class,
|
|
|
|
TP_PROTO(const char *name, unsigned long pfn, const struct page *page,
|
|
unsigned long count, unsigned int align),
|
|
|
|
TP_ARGS(name, pfn, page, count, align),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, name)
|
|
__field(unsigned long, pfn)
|
|
__field(const struct page *, page)
|
|
__field(unsigned long, count)
|
|
__field(unsigned int, align)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name, name);
|
|
__entry->pfn = pfn;
|
|
__entry->page = page;
|
|
__entry->count = count;
|
|
__entry->align = align;
|
|
),
|
|
|
|
TP_printk("name=%s pfn=%lx page=%p count=%lu align=%u",
|
|
__get_str(name),
|
|
__entry->pfn,
|
|
__entry->page,
|
|
__entry->count,
|
|
__entry->align)
|
|
);
|
|
|
|
TRACE_EVENT(cma_release,
|
|
|
|
TP_PROTO(const char *name, unsigned long pfn, const struct page *page,
|
|
unsigned long count),
|
|
|
|
TP_ARGS(name, pfn, page, count),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, name)
|
|
__field(unsigned long, pfn)
|
|
__field(const struct page *, page)
|
|
__field(unsigned long, count)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name, name);
|
|
__entry->pfn = pfn;
|
|
__entry->page = page;
|
|
__entry->count = count;
|
|
),
|
|
|
|
TP_printk("name=%s pfn=%lx page=%p count=%lu",
|
|
__get_str(name),
|
|
__entry->pfn,
|
|
__entry->page,
|
|
__entry->count)
|
|
);
|
|
|
|
TRACE_EVENT(cma_alloc_start,
|
|
|
|
TP_PROTO(const char *name, unsigned long count, unsigned int align),
|
|
|
|
TP_ARGS(name, count, align),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, name)
|
|
__field(unsigned long, count)
|
|
__field(unsigned int, align)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name, name);
|
|
__entry->count = count;
|
|
__entry->align = align;
|
|
),
|
|
|
|
TP_printk("name=%s count=%lu align=%u",
|
|
__get_str(name),
|
|
__entry->count,
|
|
__entry->align)
|
|
);
|
|
|
|
DEFINE_EVENT(cma_alloc_class, cma_alloc_finish,
|
|
|
|
TP_PROTO(const char *name, unsigned long pfn, const struct page *page,
|
|
unsigned long count, unsigned int align),
|
|
|
|
TP_ARGS(name, pfn, page, count, align)
|
|
);
|
|
|
|
DEFINE_EVENT(cma_alloc_class, cma_alloc_busy_retry,
|
|
|
|
TP_PROTO(const char *name, unsigned long pfn, const struct page *page,
|
|
unsigned long count, unsigned int align),
|
|
|
|
TP_ARGS(name, pfn, page, count, align)
|
|
);
|
|
|
|
#endif /* _TRACE_CMA_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|