Skip to contentSkip to conversation

mm-cma-pairing-the-trace_cma_alloc_start-finish.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jul 10, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

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 <[email protected]>
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.

---

 mm/cma.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/cma.c renamed from mm/cma.c~mm-cma-pairing-the-trace_cma_alloc_start-finish +2 -2
@@ -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 [email protected] are