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.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
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(-)

--- linux-6.17.orig/mm/cma.h
+++ linux-6.17/mm/cma.h
@@ -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
--- linux-6.17.orig/mm/cma_sysfs.c
+++ linux-6.17/mm/cma_sysfs.c
@@ -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;
--- linux-6.17.orig/mm/cma.c
+++ linux-6.17/mm/cma.c
@@ -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);

-- 
Jean Delvare
SUSE L3 Support