Move cma_sysfs counter hooks from cma_sysfs.c to inline functions in cma.h. 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 --- Applies on top of my previous patch due to a context change, but otherwise independent thereof. On second thought, we might as well move these functions to cma.c as this is the only place where they are called, so it's hard to justify why they should be in a header file. Opinions? mm/cma.h | 20 +++++++++++++++++--- mm/cma_sysfs.c | 15 --------------- 2 files changed, 17 insertions(+), 18 deletions(-) --- linux-6.17.orig/mm/cma.h +++ linux-6.17/mm/cma.h @@ -81,9 +81,23 @@ static inline unsigned long cma_bitmap_m } #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); +static inline void cma_sysfs_account_success_pages(struct cma *cma, + unsigned long nr_pages) +{ + atomic64_add(nr_pages, &cma->nr_pages_succeeded); +} + +static inline void cma_sysfs_account_fail_pages(struct cma *cma, + unsigned long nr_pages) +{ + atomic64_add(nr_pages, &cma->nr_pages_failed); +} + +static inline void cma_sysfs_account_release_pages(struct cma *cma, + unsigned long nr_pages) +{ + atomic64_add(nr_pages, &cma->nr_pages_released); +} #else static inline void cma_sysfs_account_success_pages(struct cma *cma, unsigned long nr_pages) {}; --- 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; -- Jean Delvare SUSE L3 Support