[merged mm-stable] mm-cma-pairing-the-trace_cma_alloc_start-finish.patch removed from -mm tree

[merged mm-stable] mm-cma-pairing-the-trace_cma_alloc_start-finish.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm/cma: pair the trace_cma_alloc_start/finish
has been removed from the -mm tree.  Its filename was
     mm-cma-pairing-the-trace_cma_alloc_start-finish.patch

This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Richard Chang <richardycc@google.com>
Subject: mm/cma: pair the trace_cma_alloc_start/finish
Date: Thu, 5 Jun 2025 07:25:32 +0000

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: Richard Chang <richardycc@google.com>
Acked-by: David 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: Andrew Morton <akpm@linux-foundation.org>
---

 mm/cma.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/mm/cma.c~mm-cma-pairing-the-trace_cma_alloc_start-finish
+++ a/mm/cma.c
@@ -854,8 +854,6 @@ static struct page *__cma_alloc(struct c
 	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 c
 	if (!count)
 		return page;
 
+	trace_cma_alloc_start(name, count, align);
+
 	for (r = 0; r < cma->nranges; r++) {
 		page = NULL;
 
_

Patches currently in -mm which might be from richardycc@google.com are