Skip to contentSkip to conversation

mm/cma: Inline cma_sysfs counter hooks

PATCH In review Jean Delvare 3 participants 5 messages Nov 17, 2025 – Nov 18, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 mm/cma: Inline cma_sysfs counter hooks

Move cma_sysfs counter hooks from cma_sysfs.c to cma.c. These one-liner functions are only used once each, but the compiler currently can't inline them because they are defined in one object and used in another. Letting the compiler inline these functions lowers the footprint and runtime cost of the sysfs interface to CMA stats even more.

---
Changes in v2:
* Move the functions to cma.c as this is the only place where they are used.

 mm/cma.c       |   27 +++++++++++++++++++++++++++
 mm/cma.h       |   12 ------------
 mm/cma_sysfs.c |   15 ---------------
 3 files changed, 27 insertions(+), 27 deletions(-)
mm/cma.h +0 -12
@@ -80,16 +80,4 @@ static inline unsigned long cma_bitmap_m
 	return cmr->count >> cma->order_per_bit;
 }
 
-#ifdef CONFIG_SYSFS
-void cma_sysfs_account_success_pages(struct cma *cma, unsigned long nr_pages);
-void cma_sysfs_account_fail_pages(struct cma *cma, unsigned long nr_pages);
-void cma_sysfs_account_release_pages(struct cma *cma, unsigned long nr_pages);
-#else
-static inline void cma_sysfs_account_success_pages(struct cma *cma,
-						   unsigned long nr_pages) {};
-static inline void cma_sysfs_account_fail_pages(struct cma *cma,
-						unsigned long nr_pages) {};
-static inline void cma_sysfs_account_release_pages(struct cma *cma,
-						   unsigned long nr_pages) {};
-#endif
 #endif
mm/cma_sysfs.c +0 -15
@@ -14,21 +14,6 @@
 #define CMA_ATTR_RO(_name) \
 	static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
 
-void cma_sysfs_account_success_pages(struct cma *cma, unsigned long nr_pages)
-{
-	atomic64_add(nr_pages, &cma->nr_pages_succeeded);
-}
-
-void cma_sysfs_account_fail_pages(struct cma *cma, unsigned long nr_pages)
-{
-	atomic64_add(nr_pages, &cma->nr_pages_failed);
-}
-
-void cma_sysfs_account_release_pages(struct cma *cma, unsigned long nr_pages)
-{
-	atomic64_add(nr_pages, &cma->nr_pages_released);
-}
-
 static inline struct cma *cma_from_kobj(struct kobject *kobj)
 {
 	return container_of(kobj, struct cma_kobject, kobj)->cma;
mm/cma.c +27 -0
@@ -36,6 +36,33 @@
 struct cma cma_areas[MAX_CMA_AREAS];
 unsigned int cma_area_count;
 
+#ifdef CONFIG_SYSFS
+static void cma_sysfs_account_success_pages(struct cma *cma,
+					    unsigned long nr_pages)
+{
+	atomic64_add(nr_pages, &cma->nr_pages_succeeded);
+}
+
+static void cma_sysfs_account_fail_pages(struct cma *cma,
+					 unsigned long nr_pages)
+{
+	atomic64_add(nr_pages, &cma->nr_pages_failed);
+}
+
+static void cma_sysfs_account_release_pages(struct cma *cma,
+					    unsigned long nr_pages)
+{
+	atomic64_add(nr_pages, &cma->nr_pages_released);
+}
+#else
+static void cma_sysfs_account_success_pages(struct cma *cma,
+					    unsigned long nr_pages) {};
+static void cma_sysfs_account_fail_pages(struct cma *cma,
+					 unsigned long nr_pages) {};
+static void cma_sysfs_account_release_pages(struct cma *cma,
+					    unsigned long nr_pages) {};
+#endif
+
 phys_addr_t cma_get_base(const struct cma *cma)
 {
 	WARN_ON_ONCE(cma->nranges != 1);
Signature · 2 lines
Jean Delvare
SUSE L3 Support
#1 lore raw

RFC PATCH 2/2 mm/cma: Consolidate accounting in dedicated functions

Move all accounting to dedicated functions and rename them accordingly.

---
This is based on a suggestion by SeongJae Park. Comments welcome.

 mm/cma.c |   43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)
mm/cma.c +18 -25
@@ -37,31 +37,27 @@ struct cma cma_areas[MAX_CMA_AREAS];
 unsigned int cma_area_count;
 
 #ifdef CONFIG_SYSFS
-static void cma_sysfs_account_success_pages(struct cma *cma,
-					    unsigned long nr_pages)
+#define cma_inc_page_counter(n, a)	atomic64_add((n), (a))
+#else
+#define cma_inc_page_counter(n, a)	do {} while (0)
+#endif
+
+static void cma_account_success(struct cma *cma, unsigned long nr_pages)
 {
-	atomic64_add(nr_pages, &cma->nr_pages_succeeded);
+	count_vm_event(CMA_ALLOC_SUCCESS);
+	cma_inc_page_counter(nr_pages, &cma->nr_pages_succeeded);
 }
 
-static void cma_sysfs_account_fail_pages(struct cma *cma,
-					 unsigned long nr_pages)
+static void cma_account_fail(struct cma *cma, unsigned long nr_pages)
 {
-	atomic64_add(nr_pages, &cma->nr_pages_failed);
+	count_vm_event(CMA_ALLOC_FAIL);
+	cma_inc_page_counter(nr_pages, &cma->nr_pages_failed);
 }
 
-static void cma_sysfs_account_release_pages(struct cma *cma,
-					    unsigned long nr_pages)
+static void cma_account_release(struct cma *cma, unsigned long nr_pages)
 {
-	atomic64_add(nr_pages, &cma->nr_pages_released);
+	cma_inc_page_counter(nr_pages, &cma->nr_pages_released);
 }
-#else
-static void cma_sysfs_account_success_pages(struct cma *cma,
-					    unsigned long nr_pages) {};
-static void cma_sysfs_account_fail_pages(struct cma *cma,
-					 unsigned long nr_pages) {};
-static void cma_sysfs_account_release_pages(struct cma *cma,
-					    unsigned long nr_pages) {};
-#endif
 
 phys_addr_t cma_get_base(const struct cma *cma)
 {
@@ -921,13 +917,10 @@ static struct page *__cma_alloc(struct c
 	pr_debug("%s(): returned %p\n", __func__, page);
 	trace_cma_alloc_finish(name, page ? page_to_pfn(page) : 0,
 			       page, count, align, ret);
-	if (page) {
-		count_vm_event(CMA_ALLOC_SUCCESS);
-		cma_sysfs_account_success_pages(cma, count);
-	} else {
-		count_vm_event(CMA_ALLOC_FAIL);
-		cma_sysfs_account_fail_pages(cma, count);
-	}
+	if (page)
+		cma_account_success(cma, count);
+	else
+		cma_account_fail(cma, count);
 
 	return page;
 }
@@ -1029,7 +1022,7 @@ bool cma_release(struct cma *cma, const
 
 	free_contig_range(pfn, count);
 	cma_clear_bitmap(cma, cmr, pfn, count);
-	cma_sysfs_account_release_pages(cma, count);
+	cma_account_release(cma, count);
 	trace_cma_release(cma->name, pfn, pages, count);
 
 	return true;
Signature · 2 lines
Jean Delvare
SUSE L3 Support
maintainer Acked-by on v2 1/2
#3 lore raw
In reply to Jean Delvare
Quoted 9 lines · Jean Delvare

Move cma_sysfs counter hooks from cma_sysfs.c to cma.c. These one-liner functions are only used once each, but the compiler currently can't inline them because they are defined in one object and used in another. Letting the compiler inline these functions lowers the footprint and runtime cost of the sysfs interface to CMA stats even more.

---

I would have moved them to the header, but no strong opinion

Signature · 3 lines
Cheers

David
Reviewed-by on v2 1/2
#4 lore raw
In reply to Jean Delvare
Quoted 8 lines · On Mon, 17 Nov 2025 11:56:02 +0100 Jean Delvare <[email protected]> wrote:

Move cma_sysfs counter hooks from cma_sysfs.c to cma.c. These one-liner functions are only used once each, but the compiler currently can't inline them because they are defined in one object and used in another. Letting the compiler inline these functions lowers the footprint and runtime cost of the sysfs interface to CMA stats even more.

Thanks,
SJ

[...]

Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH RFC 2/2] mm/cma: Consolidate accounting in dedicated functions

In reply to Jean Delvare
Quoted 4 lines · On Mon, 17 Nov 2025 12:15:02 +0100 Jean Delvare <[email protected]> wrote:

Move all accounting to dedicated functions and rename them accordingly.

Quoted 8 lines

---
This is based on a suggestion by SeongJae Park. Comments welcome.

 mm/cma.c |   43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)
mm/cma.c +0 -0

[...]

mm/cma.c bool cma_release(struct cma *cma, const · line 1026

Quoted 7 lines
mm/cma.c +1 -1
@@ -1029,7 +1022,7 @@ bool cma_release(struct cma *cma, const
 
 	free_contig_range(pfn, count);
 	cma_clear_bitmap(cma, cmr, pfn, count);
-	cma_sysfs_account_release_pages(cma, count);
+	cma_account_release(cma, count);
 	trace_cma_release(cma->name, pfn, pages, count);

I was thinking we could further move trace_*() function calls to the new functions, but this version also looks good to me.

Thanks,
SJ

[...]