Commit 08e21e24 authored by Richard Chang's avatar Richard Chang Committed by Andrew Morton
Browse files

mm/cma: pair the trace_cma_alloc_start/finish 

In the bad input validation cases, there is no trace_cma_alloc_finish to
match the trace_cma_alloc_start.  Move the trace_cma_alloc_start event
after the validations.

Link: https://lkml.kernel.org/r/20250605072532.972081-1-richardycc@google.com


Signed-off-by: default avatarRichard Chang <richardycc@google.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Martin Liu <liumartin@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 99edea30

mm/cma.c

+2 −2
Original line number Diff line number Diff line
@@ -854,8 +854,6 @@ static struct page *__cma_alloc(struct cma *cma, unsigned long count, 
	unsigned long i;

	const char *name = cma ? cma->name : NULL;



	trace_cma_alloc_start(name, count, align);



	if (!cma || !cma->count)

		return page;
@@ -865,6 +863,8 @@ static struct page *__cma_alloc(struct cma *cma, unsigned long count, 
	if (!count)

		return page;



	trace_cma_alloc_start(name, count, align);



	for (r = 0; r < cma->nranges; r++) {

		page = NULL;