mm: Convert sysfs sprintf family to sysfs_emit
Subsystems (8)
v2 cover mm: Convert sysfs sprintf family to sysfs_emit
Use the new sysfs_emit family and not the sprintf family.
V2: Correct missing page test defect in mm/slub.c slabs_cpu_partial_show()
Trivial update to commit message in mm: shmem
Joe Perches (5):
mm: Use sysfs_emit for struct kobject * uses
mm: huge_memory: Convert remaining use of sprintf to sysfs_emit and
neatening
mm:backing-dev: Use sysfs_emit in macro defining functions
mm: shmem: Convert shmem_enabled_show to use sysfs_emit_at
mm: slub: Convert sysfs sprintf family to sysfs_emit/sysfs_emit_at
mm/backing-dev.c | 8 +-- mm/huge_memory.c | 56 +++++++++++------- mm/hugetlb.c | 13 ++-- mm/khugepaged.c | 22 +++---- mm/ksm.c | 32 +++++----- mm/shmem.c | 21 ++++--- mm/slub.c | 150 ++++++++++++++++++++++++----------------------- mm/swap_state.c | 3 +- 8 files changed, 164 insertions(+), 141 deletions(-)
Signature · 1 line
2.26.0
PATCH v2 1/5 mm: Use sysfs_emit for struct kobject * uses
Use the sysfs_emit function instead of the sprintf family.
Done with cocci script as in commit 3c6bff3cf988
("RDMA: Convert sysfs kobject * show functions to use sysfs_emit()")
--- mm/huge_memory.c | 28 ++++++++++++++++------------ mm/hugetlb.c | 13 +++++++------ mm/khugepaged.c | 22 +++++++++++----------- mm/ksm.c | 32 ++++++++++++++++---------------- mm/swap_state.c | 3 ++- 5 files changed, 52 insertions(+), 46 deletions(-)
mm/huge_memory.c +16 -12
@@ -164,11 +164,11 @@ static ssize_t enabled_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { if (test_bit(TRANSPARENT_HUGEPAGE_FLAG, &transparent_hugepage_flags)) - return sprintf(buf, "[always] madvise never\n"); + return sysfs_emit(buf, "[always] madvise never\n"); else if (test_bit(TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG, &transparent_hugepage_flags)) - return sprintf(buf, "always [madvise] never\n"); + return sysfs_emit(buf, "always [madvise] never\n"); else - return sprintf(buf, "always madvise [never]\n"); + return sysfs_emit(buf, "always madvise [never]\n"); } static ssize_t enabled_store(struct kobject *kobj,
@@ -233,14 +233,18 @@ static ssize_t defrag_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { if (test_bit(TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, &transparent_hugepage_flags)) - return sprintf(buf, "[always] defer defer+madvise madvise never\n"); + return sysfs_emit(buf, + "[always] defer defer+madvise madvise never\n");if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG , &transparent_hugepage_flags)) -return sprintf (buf,"always [defer] defer+madvise madvise never\n" ); +return sysfs_emit (buf, +"always [defer] defer+madvise madvise never\n" );if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG , &transparent_hugepage_flags)) -return sprintf (buf,"always defer [defer+madvise] madvise never\n" ); +return sysfs_emit (buf, +"always defer [defer+madvise] madvise never\n" );if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG , &transparent_hugepage_flags)) -return sprintf (buf,"always defer defer+madvise [madvise] never\n" ); -return sprintf (buf,"always defer defer+madvise madvise [never]\n" ); +return sysfs_emit (buf, +"always defer defer+madvise [madvise] never\n" ); +return sysfs_emit (buf,"always defer defer+madvise madvise [never]\n" ); } static ssize_t defrag_store(struct kobject *kobj,
@@ -281,10 +285,10 @@ static struct kobj_attribute defrag_attr =__ATTR (defrag,0644 , defrag_show, defrag_store);static ssize_t use_zero_page_show (struct kobject *kobj, -struct kobj_attribute *attr,char *buf) +struct kobj_attribute *attr,char *buf) {return single_hugepage_flag_show (kobj, attr, buf, -TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG ); +TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG ); }static ssize_t use_zero_page_store (struct kobject *kobj,struct kobj_attribute *attr,const char *buf,size_t count)
@@ -296,9 +300,9 @@ static struct kobj_attribute use_zero_page_attr =__ATTR (use_zero_page,0644 , use_zero_page_show, use_zero_page_store);static ssize_t hpage_pmd_size_show (struct kobject *kobj, -struct kobj_attribute *attr,char *buf) +struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%lu\n" ,HPAGE_PMD_SIZE ); +return sysfs_emit (buf,"%lu\n" ,HPAGE_PMD_SIZE ); }static struct kobj_attribute hpage_pmd_size_attr =__ATTR_RO (hpage_pmd_size);
mm/hugetlb.c +7 -6
@@ -2758,7 +2758,7 @@ static ssize_t nr_hugepages_show_common(struct kobject *kobj,else nr_huge_pages = h->nr_huge_pages_node[nid]; -return sprintf (buf,"%lu\n" , nr_huge_pages); +return sysfs_emit (buf,"%lu\n" , nr_huge_pages); } static ssize_t __nr_hugepages_store_common(bool obey_mempolicy,
@@ -2831,7 +2831,8 @@ HSTATE_ATTR(nr_hugepages);* huge page alloc/free. */ static ssize_t nr_hugepages_mempolicy_show (struct kobject *kobj, -struct kobj_attribute *attr,char *buf) +struct kobj_attribute *attr, +char *buf) {return nr_hugepages_show_common (kobj, attr, buf); }
@@ -2849,7 +2850,7 @@ static ssize_t nr_overcommit_hugepages_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { struct hstate *h = kobj_to_hstate(kobj, NULL); -return sprintf (buf,"%lu\n" , h->nr_overcommit_huge_pages); +return sysfs_emit (buf,"%lu\n" , h->nr_overcommit_huge_pages); } static ssize_t nr_overcommit_hugepages_store(struct kobject *kobj,
@@ -2887,7 +2888,7 @@ static ssize_t free_hugepages_show(struct kobject *kobj,else free_huge_pages = h->free_huge_pages_node[nid]; -return sprintf (buf,"%lu\n" , free_huge_pages); +return sysfs_emit (buf,"%lu\n" , free_huge_pages); }HSTATE_ATTR_RO (free_hugepages);
@@ -2895,7 +2896,7 @@ static ssize_t resv_hugepages_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { struct hstate *h = kobj_to_hstate(kobj, NULL); -return sprintf (buf,"%lu\n" , h->resv_huge_pages); +return sysfs_emit (buf,"%lu\n" , h->resv_huge_pages); }HSTATE_ATTR_RO (resv_hugepages);
@@ -2912,7 +2913,7 @@ static ssize_t surplus_hugepages_show(struct kobject *kobj,else surplus_huge_pages = h->surplus_huge_pages_node[nid]; -return sprintf (buf,"%lu\n" , surplus_huge_pages); +return sysfs_emit (buf,"%lu\n" , surplus_huge_pages); }HSTATE_ATTR_RO (surplus_hugepages);
mm/khugepaged.c +11 -11
@@ -124,7 +124,7 @@ static ssize_t scan_sleep_millisecs_show(struct kobject *kobj,struct kobj_attribute *attr, char *buf) { - return sprintf(buf, "%u\n", khugepaged_scan_sleep_millisecs); + return sysfs_emit(buf, "%u\n", khugepaged_scan_sleep_millisecs); } static ssize_t scan_sleep_millisecs_store(struct kobject *kobj,
@@ -152,7 +152,7 @@ static ssize_t alloc_sleep_millisecs_show(struct kobject *kobj,struct kobj_attribute *attr, char *buf) { - return sprintf(buf, "%u\n", khugepaged_alloc_sleep_millisecs); + return sysfs_emit(buf, "%u\n", khugepaged_alloc_sleep_millisecs); } static ssize_t alloc_sleep_millisecs_store(struct kobject *kobj,
@@ -180,7 +180,7 @@ static ssize_t pages_to_scan_show(struct kobject *kobj,struct kobj_attribute *attr, char *buf) { - return sprintf(buf, "%u\n", khugepaged_pages_to_scan); + return sysfs_emit(buf, "%u\n", khugepaged_pages_to_scan); } static ssize_t pages_to_scan_store(struct kobject *kobj, struct kobj_attribute *attr,
@@ -205,7 +205,7 @@ static ssize_t pages_collapsed_show(struct kobject *kobj,struct kobj_attribute *attr, char *buf) { - return sprintf(buf, "%u\n", khugepaged_pages_collapsed); + return sysfs_emit(buf, "%u\n", khugepaged_pages_collapsed); }static struct kobj_attribute pages_collapsed_attr =__ATTR_RO (pages_collapsed);
@@ -214,7 +214,7 @@ static ssize_t full_scans_show(struct kobject *kobj,struct kobj_attribute *attr, char *buf) { - return sprintf(buf, "%u\n", khugepaged_full_scans); + return sysfs_emit(buf, "%u\n", khugepaged_full_scans); }static struct kobj_attribute full_scans_attr =__ATTR_RO (full_scans);
@@ -223,7 +223,7 @@ static ssize_t khugepaged_defrag_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { return single_hugepage_flag_show(kobj, attr, buf, -TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG ); +TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG ); } static ssize_t khugepaged_defrag_store(struct kobject *kobj, struct kobj_attribute *attr,
@@ -248,7 +248,7 @@ static ssize_t khugepaged_max_ptes_none_show(struct kobject *kobj,struct kobj_attribute *attr, char *buf) { - return sprintf(buf, "%u\n", khugepaged_max_ptes_none); + return sysfs_emit(buf, "%u\n", khugepaged_max_ptes_none); } static ssize_t khugepaged_max_ptes_none_store(struct kobject *kobj, struct kobj_attribute *attr,
@@ -273,7 +273,7 @@ static ssize_t khugepaged_max_ptes_swap_show(struct kobject *kobj,struct kobj_attribute *attr, char *buf) { - return sprintf(buf, "%u\n", khugepaged_max_ptes_swap); + return sysfs_emit(buf, "%u\n", khugepaged_max_ptes_swap); } static ssize_t khugepaged_max_ptes_swap_store(struct kobject *kobj,
@@ -297,10 +297,10 @@ static struct kobj_attribute khugepaged_max_ptes_swap_attr = khugepaged_max_ptes_swap_store);static ssize_t khugepaged_max_ptes_shared_show (struct kobject *kobj, -struct kobj_attribute *attr, -char *buf) +struct kobj_attribute *attr, +char *buf) { -return sprintf (buf,"%u\n" , khugepaged_max_ptes_shared); +return sysfs_emit (buf,"%u\n" , khugepaged_max_ptes_shared); } static ssize_t khugepaged_max_ptes_shared_store(struct kobject *kobj,
mm/ksm.c +16 -16
@@ -2833,7 +2833,7 @@ static void wait_while_offlining(void)static ssize_t sleep_millisecs_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%u\n" , ksm_thread_sleep_millisecs); +return sysfs_emit (buf,"%u\n" , ksm_thread_sleep_millisecs); } static ssize_t sleep_millisecs_store(struct kobject *kobj,
@@ -2857,7 +2857,7 @@ KSM_ATTR(sleep_millisecs);static ssize_t pages_to_scan_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%u\n" , ksm_thread_pages_to_scan); +return sysfs_emit (buf,"%u\n" , ksm_thread_pages_to_scan); } static ssize_t pages_to_scan_store(struct kobject *kobj,
@@ -2880,7 +2880,7 @@ KSM_ATTR(pages_to_scan);static ssize_t run_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%lu\n" , ksm_run); +return sysfs_emit (buf,"%lu\n" , ksm_run); } static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr,
@@ -2927,9 +2927,9 @@ KSM_ATTR(run);#ifdef CONFIG_NUMA static ssize_t merge_across_nodes_show (struct kobject *kobj, -struct kobj_attribute *attr,char *buf) +struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%u\n" , ksm_merge_across_nodes); +return sysfs_emit (buf,"%u\n" , ksm_merge_across_nodes); } static ssize_t merge_across_nodes_store(struct kobject *kobj,
@@ -2984,9 +2984,9 @@ KSM_ATTR(merge_across_nodes);#endif static ssize_t use_zero_pages_show (struct kobject *kobj, -struct kobj_attribute *attr,char *buf) +struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%u\n" , ksm_use_zero_pages); +return sysfs_emit (buf,"%u\n" , ksm_use_zero_pages); } static ssize_t use_zero_pages_store(struct kobject *kobj, struct kobj_attribute *attr,
@@ -3008,7 +3008,7 @@ KSM_ATTR(use_zero_pages);static ssize_t max_page_sharing_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%u\n" , ksm_max_page_sharing); +return sysfs_emit (buf,"%u\n" , ksm_max_page_sharing); } static ssize_t max_page_sharing_store(struct kobject *kobj,
@@ -3049,21 +3049,21 @@ KSM_ATTR(max_page_sharing);static ssize_t pages_shared_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%lu\n" , ksm_pages_shared); +return sysfs_emit (buf,"%lu\n" , ksm_pages_shared); }KSM_ATTR_RO (pages_shared);static ssize_t pages_sharing_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%lu\n" , ksm_pages_sharing); +return sysfs_emit (buf,"%lu\n" , ksm_pages_sharing); }KSM_ATTR_RO (pages_sharing);static ssize_t pages_unshared_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%lu\n" , ksm_pages_unshared); +return sysfs_emit (buf,"%lu\n" , ksm_pages_unshared); }KSM_ATTR_RO (pages_unshared);
@@ -3080,21 +3080,21 @@ static ssize_t pages_volatile_show(struct kobject *kobj,*/ if (ksm_pages_volatile <0 ) ksm_pages_volatile =0 ; -return sprintf (buf,"%ld\n" , ksm_pages_volatile); +return sysfs_emit (buf,"%ld\n" , ksm_pages_volatile); }KSM_ATTR_RO (pages_volatile);static ssize_t stable_node_dups_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%lu\n" , ksm_stable_node_dups); +return sysfs_emit (buf,"%lu\n" , ksm_stable_node_dups); }KSM_ATTR_RO (stable_node_dups);static ssize_t stable_node_chains_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%lu\n" , ksm_stable_node_chains); +return sysfs_emit (buf,"%lu\n" , ksm_stable_node_chains); }KSM_ATTR_RO (stable_node_chains);
@@ -3103,7 +3103,7 @@ stable_node_chains_prune_millisecs_show(struct kobject *kobj,struct kobj_attribute *attr, char *buf) { - return sprintf(buf, "%u\n", ksm_stable_node_chains_prune_millisecs); + return sysfs_emit(buf, "%u\n", ksm_stable_node_chains_prune_millisecs); } static ssize_t
@@ -3127,7 +3127,7 @@ KSM_ATTR(stable_node_chains_prune_millisecs);static ssize_t full_scans_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%lu\n" , ksm_scan.seqnr); +return sysfs_emit (buf,"%lu\n" , ksm_scan.seqnr); }KSM_ATTR_RO (full_scans);
mm/swap_state.c +2 -1
@@ -902,7 +902,8 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask,static ssize_t vma_ra_enabled_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%s\n" , enable_vma_readahead ?"true" :"false" ); +return sysfs_emit (buf,"%s\n" , + enable_vma_readahead ?"true" :"false" ); } static ssize_t vma_ra_enabled_store(struct kobject *kobj, struct kobj_attribute *attr,
Signature · 1 line
2.26.0
PATCH v2 2/5 mm: huge_memory: Convert remaining use of sprintf to sysfs_emit and neatening
In reply to Joe PerchesConvert the only use of sprintf with struct kobject * that the cocci script could not convert.
Miscellanea:
o Neaten the uses of a constant string with sysfs_emit to use a const char * to reduce overall object size
--- mm/huge_memory.c | 52 +++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 21 deletions(-)
mm/huge_memory.c +31 -21
@@ -163,12 +163,17 @@ static struct shrinker huge_zero_page_shrinker = {static ssize_t enabled_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { +const char *output; +if (test_bit (TRANSPARENT_HUGEPAGE_FLAG , &transparent_hugepage_flags)) -return sysfs_emit (buf,"[always] madvise never\n" ); -else if (test_bit (TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG , &transparent_hugepage_flags)) -return sysfs_emit (buf,"always [madvise] never\n" ); + output ="[always] madvise never" ; +else if (test_bit (TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG , + &transparent_hugepage_flags)) + output ="always [madvise] never" ;else -return sysfs_emit (buf,"always madvise [never]\n" ); + output ="always madvise [never]" ; + +return sysfs_emit (buf,"%s\n" , output); } static ssize_t enabled_store(struct kobject *kobj,
@@ -200,11 +205,11 @@ static struct kobj_attribute enabled_attr =__ATTR (enabled,0644 , enabled_show, enabled_store);ssize_t single_hugepage_flag_show (struct kobject *kobj, -struct kobj_attribute *attr,char *buf, -enum transparent_hugepage_flag flag) +struct kobj_attribute *attr,char *buf, +enum transparent_hugepage_flag flag) { -return sprintf (buf,"%d\n" , - !!test_bit (flag, &transparent_hugepage_flags)); +return sysfs_emit (buf,"%d\n" , + !!test_bit (flag, &transparent_hugepage_flags)); } ssize_t single_hugepage_flag_store(struct kobject *kobj,
@@ -232,19 +237,24 @@ ssize_t single_hugepage_flag_store(struct kobject *kobj,static ssize_t defrag_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG , &transparent_hugepage_flags)) -return sysfs_emit (buf, -"[always] defer defer+madvise madvise never\n" ); -if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG , &transparent_hugepage_flags)) -return sysfs_emit (buf, -"always [defer] defer+madvise madvise never\n" ); -if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG , &transparent_hugepage_flags)) -return sysfs_emit (buf, -"always defer [defer+madvise] madvise never\n" ); -if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG , &transparent_hugepage_flags)) -return sysfs_emit (buf, -"always defer defer+madvise [madvise] never\n" ); -return sysfs_emit (buf,"always defer defer+madvise madvise [never]\n" ); +const char *output; + +if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG , + &transparent_hugepage_flags)) + output ="[always] defer defer+madvise madvise never" ; +else if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG , + &transparent_hugepage_flags)) + output ="always [defer] defer+madvise madvise never" ; +else if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG , + &transparent_hugepage_flags)) + output ="always defer [defer+madvise] madvise never" ; +else if (test_bit (TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG , + &transparent_hugepage_flags)) + output ="always defer defer+madvise [madvise] never" ; +else + output ="always defer defer+madvise madvise [never]" ; + +return sysfs_emit (buf,"%s\n" , output); } static ssize_t defrag_store(struct kobject *kobj,
Signature · 1 line
2.26.0
PATCH v2 3/5 mm:backing-dev: Use sysfs_emit in macro defining functions
In reply to Joe PerchesThe cocci script used in commit bdacbb8d04f ("mm: Use sysfs_emit for struct kobject * uses") does not convert the name##_show macro because the macro uses concatenation via ##.
Convert it by hand.
--- mm/backing-dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/backing-dev.c +4 -4
@@ -150,11 +150,11 @@ static ssize_t read_ahead_kb_store(struct device *dev,#define BDI_SHOW (name, expr) \ static ssize_t name##_show(struct device *dev, \ - struct device_attribute *attr, char *page) \ + struct device_attribute *attr, char *buf) \ { \ struct backing_dev_info *bdi = dev_get_drvdata(dev); \ \ - return snprintf(page, PAGE_SIZE-1, "%lld\n", (long long)expr); \ + return sysfs_emit(buf, "%lld\n", (long long)expr); \ } \ static DEVICE_ATTR_RW(name);
@@ -200,11 +200,11 @@ BDI_SHOW(max_ratio, bdi->max_ratio)static ssize_t stable_pages_required_show (struct device *dev,struct device_attribute *attr, -char *page) +char *buf) {dev_warn_once (dev,"the stable_pages_required attribute has been removed. Use the stable_writes queue attribute instead.\n" ); -return snprintf (page,PAGE_SIZE -1 ,"%d\n" ,0 ); +return sysfs_emit (buf,"%d\n" ,0 ); }static DEVICE_ATTR_RO (stable_pages_required);
Signature · 1 line
2.26.0
PATCH v2 4/5 mm: shmem: Convert shmem_enabled_show to use sysfs_emit_at
In reply to Joe PerchesUpdate the function to use sysfs_emit_at while neatening the uses of sprintf and overwriting the last space char with a newline to avoid possible output buffer overflow.
Miscellanea:
o in shmem_enabled_show, the removal of the indirected use of fmt allows __printf verification
--- mm/shmem.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
mm/shmem.c +12 -9
@@ -4047,7 +4047,7 @@ int __init shmem_init(void) #if defined(CONFIG_TRANSPARENT_HUGEPAGE) && defined(CONFIG_SYSFS) static ssize_t shmem_enabled_show(struct kobject *kobj, - struct kobj_attribute *attr, char *buf) + struct kobj_attribute *attr, char *buf) { static const int values[] = { SHMEM_HUGE_ALWAYS,
@@ -4057,16 +4057,19 @@ static ssize_t shmem_enabled_show(struct kobject *kobj,SHMEM_HUGE_DENY , SHMEM_HUGE_FORCE, }; -int i, count; - -for (i =0 , count =0 ; i <ARRAY_SIZE (values); i++) { -const char *fmt = shmem_huge == values[i] ?"[%s] " :"%s " ; +int len =0 ; +int i; - count +=sprintf (buf + count, fmt, -shmem_format_huge (values[i])); +for (i =0 ; i <ARRAY_SIZE (values); i++) { + len +=sysfs_emit_at (buf, len, + shmem_huge == values[i] ?"%s[%s]" :"%s%s" , + i ?" " :"" , +shmem_format_huge (values[i])); } - buf[count -1 ] ='\n' ; -return count; + + len +=sysfs_emit_at (buf, len,"\n" ); + +return len; } static ssize_t shmem_enabled_store(struct kobject *kobj,
Signature · 1 line
2.26.0
PATCH v2 5/5 mm: slub: Convert sysfs sprintf family to sysfs_emit/sysfs_emit_at
In reply to Joe PerchesConvert the unbounded uses of sprintf to sysfs_emit.
A few conversions may now not end in a newline if the output buffer is overflowed.
---
v2: Add back missing test for page in slabs_cpu_partial_show()
mm/slub.c | 150 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 73 deletions(-)
mm/slub.c +77 -73
@@ -4758,7 +4758,7 @@ static void process_slab(struct loc_track *t, struct kmem_cache *s, }static int list_locations (struct kmem_cache *s,char *buf, -enum track_item alloc) +enum track_item alloc) {int len =0 ;unsigned long i;
@@ -4768,7 +4768,7 @@ static int list_locations(struct kmem_cache *s, char *buf,if (!alloc_loc_track (&t,PAGE_SIZE /sizeof (struct location ),GFP_KERNEL )) { -return sprintf (buf,"Out of memory\n" ); +return sysfs_emit (buf,"Out of memory\n" ); }/* Push back cpu slabs */ flush_all (s);
@@ -4791,50 +4791,45 @@ static int list_locations(struct kmem_cache *s, char *buf,for (i =0 ; i < t.count; i++) {struct location *l = &t.loc[i]; -if (len >PAGE_SIZE -KSYM_SYMBOL_LEN -100 ) -break ; - len +=sprintf (buf + len,"%7ld " , l->count); + len +=sysfs_emit_at (buf, len,"%7ld " , l->count);if (l->addr) - len +=sprintf (buf + len,"%pS" , (void *)l->addr); + len +=sysfs_emit_at (buf, len,"%pS" , (void *)l->addr);else - len +=sprintf (buf + len,"<not-available>" ); - -if (l->sum_time != l->min_time) { - len +=sprintf (buf + len," age=%ld/%ld/%ld" , - l->min_time, - (long )div_u64 (l->sum_time, l->count), - l->max_time); - }else - len +=sprintf (buf + len," age=%ld" , - l->min_time); + len +=sysfs_emit_at (buf, len,"<not-available>" ); + +if (l->sum_time != l->min_time) + len +=sysfs_emit_at (buf, len," age=%ld/%ld/%ld" , + l->min_time, + (long )div_u64 (l->sum_time, + l->count), + l->max_time); +else + len +=sysfs_emit_at (buf, len," age=%ld" , l->min_time);if (l->min_pid != l->max_pid) - len +=sprintf (buf + len," pid=%ld-%ld" , - l->min_pid, l->max_pid); + len +=sysfs_emit_at (buf, len," pid=%ld-%ld" , + l->min_pid, l->max_pid);else - len +=sprintf (buf + len," pid=%ld" , - l->min_pid); + len +=sysfs_emit_at (buf, len," pid=%ld" , + l->min_pid);if (num_online_cpus () >1 && - !cpumask_empty (to_cpumask (l->cpus)) && - len <PAGE_SIZE -60 ) - len +=scnprintf (buf + len,PAGE_SIZE - len -50 , -" cpus=%*pbl" , -cpumask_pr_args (to_cpumask (l->cpus))); - -if (nr_online_nodes >1 && !nodes_empty (l->nodes) && - len <PAGE_SIZE -60 ) - len +=scnprintf (buf + len,PAGE_SIZE - len -50 , -" nodes=%*pbl" , -nodemask_pr_args (&l->nodes)); - - len +=sprintf (buf + len,"\n" ); + !cpumask_empty (to_cpumask (l->cpus))) + len +=sysfs_emit_at (buf, len," cpus=%*pbl" , +cpumask_pr_args (to_cpumask (l->cpus))); + +if (nr_online_nodes >1 && !nodes_empty (l->nodes)) + len +=sysfs_emit_at (buf, len," nodes=%*pbl" , +nodemask_pr_args (&l->nodes)); + + len +=sysfs_emit_at (buf, len,"\n" ); }free_loc_track (&t);if (!t.count) - len +=sprintf (buf,"No data\n" ); + len +=sysfs_emit_at (buf, len,"No data\n" ); + return len; }#endif /* CONFIG_SLUB_DEBUG */
@@ -4931,12 +4926,13 @@ __setup("slub_memcg_sysfs=", setup_slub_memcg_sysfs);#endif static ssize_t show_slab_objects (struct kmem_cache *s, -char *buf,unsigned long flags) +char *buf,unsigned long flags) {unsigned long total =0 ;int node;int x;unsigned long *nodes; +int len =0 ; nodes =kcalloc (nr_node_ids,sizeof (unsigned long ),GFP_KERNEL );if (!nodes)
@@ -5025,15 +5021,19 @@ static ssize_t show_slab_objects(struct kmem_cache *s, nodes[node] += x; } } - x =sprintf (buf,"%lu" , total); + + len +=sysfs_emit_at (buf, len,"%lu" , total);#ifdef CONFIG_NUMA -for (node =0 ; node < nr_node_ids; node++) +for (node =0 ; node < nr_node_ids; node++) {if (nodes[node]) - x +=sprintf (buf + x," N%d=%lu" , - node, nodes[node]); + len +=sysfs_emit_at (buf, len," N%d=%lu" , + node, nodes[node]); + }#endif + len +=sysfs_emit_at (buf, len,"\n" );kfree (nodes); -return x +sprintf (buf + x,"\n" ); + +return len; }#define to_slab_attr (n) container_of(n, struct slab_attribute, attr)
@@ -5055,37 +5055,37 @@ struct slab_attribute {static ssize_t slab_size_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%u\n" , s->size); +return sysfs_emit (buf,"%u\n" , s->size); }SLAB_ATTR_RO (slab_size);static ssize_t align_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%u\n" , s->align); +return sysfs_emit (buf,"%u\n" , s->align); }SLAB_ATTR_RO (align);static ssize_t object_size_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%u\n" , s->object_size); +return sysfs_emit (buf,"%u\n" , s->object_size); }SLAB_ATTR_RO (object_size);static ssize_t objs_per_slab_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%u\n" ,oo_objects (s->oo)); +return sysfs_emit (buf,"%u\n" ,oo_objects (s->oo)); }SLAB_ATTR_RO (objs_per_slab);static ssize_t order_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%u\n" ,oo_order (s->oo)); +return sysfs_emit (buf,"%u\n" ,oo_order (s->oo)); }SLAB_ATTR_RO (order);static ssize_t min_partial_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%lu\n" , s->min_partial); +return sysfs_emit (buf,"%lu\n" , s->min_partial); } static ssize_t min_partial_store(struct kmem_cache *s, const char *buf,
@@ -5105,7 +5105,7 @@ SLAB_ATTR(min_partial);static ssize_t cpu_partial_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%u\n" ,slub_cpu_partial (s)); +return sysfs_emit (buf,"%u\n" ,slub_cpu_partial (s)); } static ssize_t cpu_partial_store(struct kmem_cache *s, const char *buf,
@@ -5130,13 +5130,13 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf) {if (!s->ctor)return 0 ; -return sprintf (buf,"%pS\n" , s->ctor); +return sysfs_emit (buf,"%pS\n" , s->ctor); }SLAB_ATTR_RO (ctor);static ssize_t aliases_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , s->refcount <0 ?0 : s->refcount -1 ); +return sysfs_emit (buf,"%d\n" , s->refcount <0 ?0 : s->refcount -1 ); }SLAB_ATTR_RO (aliases);
@@ -5169,7 +5169,7 @@ static ssize_t slabs_cpu_partial_show(struct kmem_cache *s, char *buf)int objects =0 ;int pages =0 ;int cpu; -int len; +int len =0 ;for_each_online_cpu (cpu) {struct page *page;
@@ -5182,52 +5182,53 @@ static ssize_t slabs_cpu_partial_show(struct kmem_cache *s, char *buf) } } - len =sprintf (buf,"%d(%d)" , objects, pages); + len +=sysfs_emit_at (buf, len,"%d(%d)" , objects, pages);#ifdef CONFIG_SMP for_each_online_cpu (cpu) {struct page *page; page =slub_percpu_partial (per_cpu_ptr (s->cpu_slab, cpu)); - -if (page && len <PAGE_SIZE -20 ) - len +=sprintf (buf + len," C%d=%d(%d)" , cpu, - page->pobjects, page->pages); +if (page) + len +=sysfs_emit_at (buf, len," C%d=%d(%d)" , + cpu, page->pobjects, page->pages); }#endif -return len +sprintf (buf + len,"\n" ); + len +=sysfs_emit_at (buf, len,"\n" ); + +return len; }SLAB_ATTR_RO (slabs_cpu_partial);static ssize_t reclaim_account_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , !!(s->flags &SLAB_RECLAIM_ACCOUNT )); +return sysfs_emit (buf,"%d\n" , !!(s->flags &SLAB_RECLAIM_ACCOUNT )); }SLAB_ATTR_RO (reclaim_account);static ssize_t hwcache_align_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , !!(s->flags &SLAB_HWCACHE_ALIGN )); +return sysfs_emit (buf,"%d\n" , !!(s->flags &SLAB_HWCACHE_ALIGN )); }SLAB_ATTR_RO (hwcache_align);#ifdef CONFIG_ZONE_DMA static ssize_t cache_dma_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , !!(s->flags &SLAB_CACHE_DMA )); +return sysfs_emit (buf,"%d\n" , !!(s->flags &SLAB_CACHE_DMA )); }SLAB_ATTR_RO (cache_dma);#endif static ssize_t usersize_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%u\n" , s->usersize); +return sysfs_emit (buf,"%u\n" , s->usersize); }SLAB_ATTR_RO (usersize);static ssize_t destroy_by_rcu_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , !!(s->flags &SLAB_TYPESAFE_BY_RCU )); +return sysfs_emit (buf,"%d\n" , !!(s->flags &SLAB_TYPESAFE_BY_RCU )); }SLAB_ATTR_RO (destroy_by_rcu);
@@ -5246,33 +5247,33 @@ SLAB_ATTR_RO(total_objects);static ssize_t sanity_checks_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , !!(s->flags &SLAB_CONSISTENCY_CHECKS )); +return sysfs_emit (buf,"%d\n" , !!(s->flags &SLAB_CONSISTENCY_CHECKS )); }SLAB_ATTR_RO (sanity_checks);static ssize_t trace_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , !!(s->flags &SLAB_TRACE )); +return sysfs_emit (buf,"%d\n" , !!(s->flags &SLAB_TRACE )); }SLAB_ATTR_RO (trace);static ssize_t red_zone_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , !!(s->flags &SLAB_RED_ZONE )); +return sysfs_emit (buf,"%d\n" , !!(s->flags &SLAB_RED_ZONE )); }SLAB_ATTR_RO (red_zone);static ssize_t poison_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , !!(s->flags &SLAB_POISON )); +return sysfs_emit (buf,"%d\n" , !!(s->flags &SLAB_POISON )); }SLAB_ATTR_RO (poison);static ssize_t store_user_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , !!(s->flags &SLAB_STORE_USER )); +return sysfs_emit (buf,"%d\n" , !!(s->flags &SLAB_STORE_USER )); }SLAB_ATTR_RO (store_user);
@@ -5316,7 +5317,7 @@ SLAB_ATTR_RO(free_calls);#ifdef CONFIG_FAILSLAB static ssize_t failslab_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%d\n" , !!(s->flags &SLAB_FAILSLAB )); +return sysfs_emit (buf,"%d\n" , !!(s->flags &SLAB_FAILSLAB )); }SLAB_ATTR_RO (failslab);#endif
@@ -5340,7 +5341,7 @@ SLAB_ATTR(shrink);#ifdef CONFIG_NUMA static ssize_t remote_node_defrag_ratio_show (struct kmem_cache *s,char *buf) { -return sprintf (buf,"%u\n" , s->remote_node_defrag_ratio /10 ); +return sysfs_emit (buf,"%u\n" , s->remote_node_defrag_ratio /10 ); } static ssize_t remote_node_defrag_ratio_store(struct kmem_cache *s,
@@ -5367,7 +5368,7 @@ static int show_stat(struct kmem_cache *s, char *buf, enum stat_item si) {unsigned long sum =0 ;int cpu; -int len; +int len =0 ;int *data =kmalloc_array (nr_cpu_ids,sizeof (int ),GFP_KERNEL );if (!data)
@@ -5380,16 +5381,19 @@ static int show_stat(struct kmem_cache *s, char *buf, enum stat_item si) sum += x; } - len =sprintf (buf,"%lu" , sum); + len +=sysfs_emit_at (buf, len,"%lu" , sum);#ifdef CONFIG_SMP for_each_online_cpu (cpu) { -if (data[cpu] && len <PAGE_SIZE -20 ) - len +=sprintf (buf + len," C%d=%u" , cpu, data[cpu]); +if (data[cpu]) + len +=sysfs_emit_at (buf, len," C%d=%u" , + cpu, data[cpu]); }#endif kfree (data); -return len +sprintf (buf + len,"\n" ); + len +=sysfs_emit_at (buf, len,"\n" ); + +return len; }static void clear_stat (struct kmem_cache *s,enum stat_item si)
Signature · 1 line
2.26.0