mm: compaction: move compaction sysctl to its own file
Subsystems (4)
PATCH v6 1/2 mm: compaction: move compaction sysctl to its own file
From: Minghao Chi <[email protected]>
This moves all compaction sysctls to its own file.
Signed-off-by Minghao Chi <[email protected]>
Signed-off-by Ye Xingchen <[email protected]>
--- include/linux/compaction.h | 7 ---- kernel/sysctl.c | 59 ------------------------------ mm/compaction.c | 73 ++++++++++++++++++++++++++++++++++---- 3 files changed, 67 insertions(+), 72 deletions(-)
include/linux/compaction.h +0 -7
@@ -81,13 +81,6 @@ static inline unsigned long compact_gap(unsigned int order) }#ifdef CONFIG_COMPACTION -extern unsigned int sysctl_compaction_proactiveness; -extern int sysctl_compaction_handler (struct ctl_table *table,int write, -void *buffer,size_t *length,loff_t *ppos); -extern int compaction_proactiveness_sysctl_handler (struct ctl_table *table, -int write,void *buffer,size_t *length,loff_t *ppos); -extern int sysctl_extfrag_threshold; -extern int sysctl_compact_unevictable_allowed;extern unsigned int extfrag_for_order (struct zone *zone,unsigned int order);extern int fragmentation_index (struct zone *zone,unsigned int order);
kernel/sysctl.c +0 -59
77 lines not on this page · raw message
mm/compaction.c +67 -6
109 lines not on this page · raw message
Signature · 1 line
2.25.1
Quoted 120 lines · On 3/22/23 04:08, [email protected] wrote:
From: Minghao Chi <[email protected]>
This moves all compaction sysctls to its own file.
Signed-off-by Minghao Chi <[email protected]>Signed-off-by Ye Xingchen <[email protected]>--- include/linux/compaction.h | 7 ---- kernel/sysctl.c | 59 ------------------------------ mm/compaction.c | 73 ++++++++++++++++++++++++++++++++++---- 3 files changed, 67 insertions(+), 72 deletions(-)include/linux/compaction.h +0
-7@@ -81,13 +81,6 @@ static inline unsigned long compact_gap(unsigned int order) }#ifdef CONFIG_COMPACTION -extern unsigned int sysctl_compaction_proactiveness; -extern int sysctl_compaction_handler (struct ctl_table *table,int write, -void *buffer,size_t *length,loff_t *ppos); -extern int compaction_proactiveness_sysctl_handler (struct ctl_table *table, -int write,void *buffer,size_t *length,loff_t *ppos); -extern int sysctl_extfrag_threshold; -extern int sysctl_compact_unevictable_allowed;extern unsigned int extfrag_for_order (struct zone *zone,unsigned int order);extern int fragmentation_index (struct zone *zone,unsigned int order);kernel/sysctl.c +0
-59@@ -42,7 +42,6 @@#include <linux/highuid.h> #include <linux/writeback.h> #include <linux/ratelimit.h> -#include <linux/compaction.h> #include <linux/hugetlb.h> #include <linux/initrd.h> #include <linux/key.h> @@ -746,27 +745,6 @@ int proc_dointvec(struct ctl_table *table, int write, void *buffer,return do_proc_dointvec (table, write, buffer, lenp, ppos,NULL ,NULL ); } -#ifdef CONFIG_COMPACTION -static int proc_dointvec_minmax_warn_RT_change (struct ctl_table *table, -int write,void *buffer,size_t *lenp,loff_t *ppos) -{ -int ret, old; - -if (!IS_ENABLED (CONFIG_PREEMPT_RT ) || !write) -return proc_dointvec_minmax (table, write, buffer, lenp, ppos); - - old = *(int *)table->data; - ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos); -if (ret) -return ret; -if (old != *(int *)table->data) -pr_warn_once ("sysctl attribute %s changed by %s[%d]\n" , - table->procname, current->comm, -task_pid_nr (current)); -return ret; -} -#endif -/** * proc_douintvec - read a vector of unsigned integers * @table: the sysctl table @@ -2157,43 +2135,6 @@ static struct ctl_table vm_table[] = { .extra1 = SYSCTL_ONE, .extra2 = SYSCTL_FOUR, }, -#ifdef CONFIG_COMPACTION - { - .procname = "compact_memory", - .data = NULL, - .maxlen = sizeof(int), - .mode = 0200, - .proc_handler = sysctl_compaction_handler, - }, - { - .procname = "compaction_proactiveness", - .data = &sysctl_compaction_proactiveness, - .maxlen = sizeof(sysctl_compaction_proactiveness), - .mode = 0644, - .proc_handler = compaction_proactiveness_sysctl_handler, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE_HUNDRED, - }, - { - .procname = "extfrag_threshold", - .data = &sysctl_extfrag_threshold, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE_THOUSAND, - }, - { - .procname = "compact_unevictable_allowed", - .data = &sysctl_compact_unevictable_allowed, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax_warn_RT_change, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, - -#endif /* CONFIG_COMPACTION */ { .procname = "min_free_kbytes", .data = &min_free_kbytes,mm/compaction.c +0
-0
mm/compaction.c typedef enum { · line 1732
Quoted 6 lines
mm/compaction.c +2
-1@@ -1728,7 +1728,9 @@ typedef enum {* Allow userspace to control policy on scanning the unevictable LRU for * compactable pages. */ -int sysctl_compact_unevictable_allowed__read_mostly =CONFIG_COMPACT_UNEVICTABLE_DEFAULT ; +static int sysctl_compact_unevictable_allowed__read_mostly =CONFIG_COMPACT_UNEVICTABLE_DEFAULT ; +unsigned int sysctl_compaction_proactiveness;
Couldn't you move the "__read_mostly" and "= 20" part here as well? And the explanatory comment? And make it static too?
Quoted 14 lines
mm/compaction.c +1
-2+static int sysctl_extfrag_threshold =500 ;static inline void update_fast_start_pfn (struct compact_control *cc,unsigned long pfn)@@ -2584,8 +2586,6 @@ static enum compact_result compact_zone_order(struct zone *zone, int order,return ret; } -int sysctl_extfrag_threshold =500 ; -/** * try_to_compact_pages - Direct compact to satisfy a high-order allocation * @gfp_mask: The GFP mask of the current allocation
mm/compaction.c static void compact_nodes(void) · line 2750
Quoted 3 lines
mm/compaction.c +0
-0@@ -2748,8 +2748,7 @@ static void compact_nodes(void)* background. It takes values in the range [0, 100]. */ unsigned int __read_mostly sysctl_compaction_proactiveness =20 ;
And remove this.
Quoted 91 lines
mm/compaction.c +64
-3- -int compaction_proactiveness_sysctl_handler (struct ctl_table *table,int write, +static int compaction_proactiveness_sysctl_handler (struct ctl_table *table,int write,void *buffer,size_t *length,loff_t *ppos) {int rc, nid;@@ -2779,7 +2778,7 @@ int compaction_proactiveness_sysctl_handler(struct ctl_table *table, int write,* This is the entry point for compacting all nodes via * /proc/sys/vm/compact_memory */ -int sysctl_compaction_handler (struct ctl_table *table,int write, +static int sysctl_compaction_handler (struct ctl_table *table,int write,void *buffer,size_t *length,loff_t *ppos) {if (write)@@ -3075,6 +3074,65 @@ static int kcompactd_cpu_online(unsigned int cpu)return 0 ; } +static int proc_dointvec_minmax_warn_RT_change (struct ctl_table *table, +int write,void *buffer,size_t *lenp,loff_t *ppos) +{ +int ret, old; + +if (!IS_ENABLED (CONFIG_PREEMPT_RT ) || !write) +return proc_dointvec_minmax (table, write, buffer, lenp, ppos); + + old = *(int *)table->data; + ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos); +if (ret) +return ret; +if (old != *(int *)table->data) +pr_warn_once ("sysctl attribute %s changed by %s[%d]\n" , + table->procname, current->comm, +task_pid_nr (current)); +return ret; +} + +#ifdef CONFIG_SYSCTL +static struct ctl_table vm_compaction[] = { + { + .procname ="compact_memory" , + .data =NULL , + .maxlen =sizeof (int ), + .mode =0200 , + .proc_handler = sysctl_compaction_handler, + }, + { + .procname ="compaction_proactiveness" , + .data = &sysctl_compaction_proactiveness, + .maxlen =sizeof (sysctl_compaction_proactiveness), + .mode =0644 , + .proc_handler = compaction_proactiveness_sysctl_handler, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_ONE_HUNDRED , + }, + { + .procname ="extfrag_threshold" , + .data = &sysctl_extfrag_threshold, + .maxlen =sizeof (int ), + .mode =0644 , + .proc_handler = proc_dointvec_minmax, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_ONE_THOUSAND , + }, + { + .procname ="compact_unevictable_allowed" , + .data = &sysctl_compact_unevictable_allowed, + .maxlen =sizeof (int ), + .mode =0644 , + .proc_handler = proc_dointvec_minmax_warn_RT_change, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_ONE , + }, + { } +}; +#endif +static int __init kcompactd_init (void ) {int nid;@@ -3090,6 +3148,9 @@ static int __init kcompactd_init(void)for_each_node_state (nid,N_MEMORY )kcompactd_run (nid); +#ifdef CONFIG_SYSCTL +register_sysctl_init ("vm" , vm_compaction); +#endif return 0 ; }subsys_initcall (kcompactd_init)