mm: move page-writeback sysctls to their own file

kernel/sysctl.c is a kitchen sink where everyone leaves their dirty
dishes, this makes it very difficult to maintain.

To help with this maintenance let's start by moving sysctls to places
where they actually belong.  The proc sysctl maintainers do not want to
know what sysctl knobs you wish to add for your own piece of code, we just
care about the core logic.

So move the page-writeback sysctls to its own file.

[akpm@linux-foundation.org: coding-style cleanups]

akpm@linux-foundation.org: fix CONFIG_SYSCTL=n warnings]
Link: https://lkml.kernel.org/r/20220129012955.26594-1-zhanglianjie@uniontech.com
Signed-off-by: zhanglianjie <zhanglianjie@uniontech.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index fec248ab1fec58fb7474c5e34ab1307357522f33..dc2b94e6a94f0d507c1fa512b971a78c7aa33212 100644 (file)
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -345,28 +345,13 @@ void wb_domain_exit(struct wb_domain *dom);
 extern struct wb_domain global_wb_domain;
 
 /* These are exported to sysctl. */
-extern int dirty_background_ratio;
-extern unsigned long dirty_background_bytes;
-extern int vm_dirty_ratio;
-extern unsigned long vm_dirty_bytes;
 extern unsigned int dirty_writeback_interval;
 extern unsigned int dirty_expire_interval;
 extern unsigned int dirtytime_expire_interval;
-extern int vm_highmem_is_dirtyable;
 extern int laptop_mode;
 
-int dirty_background_ratio_handler(struct ctl_table *table, int write,
-               void *buffer, size_t *lenp, loff_t *ppos);
-int dirty_background_bytes_handler(struct ctl_table *table, int write,
-               void *buffer, size_t *lenp, loff_t *ppos);
-int dirty_ratio_handler(struct ctl_table *table, int write,
-               void *buffer, size_t *lenp, loff_t *ppos);
-int dirty_bytes_handler(struct ctl_table *table, int write,
-               void *buffer, size_t *lenp, loff_t *ppos);
 int dirtytime_interval_handler(struct ctl_table *table, int write,
                void *buffer, size_t *lenp, loff_t *ppos);
-int dirty_writeback_centisecs_handler(struct ctl_table *table, int write,
-               void *buffer, size_t *lenp, loff_t *ppos);
 
 void global_dirty_limits(unsigned long *pbackground, unsigned long *pdirty);
 unsigned long wb_calc_thresh(struct bdi_writeback *wb, unsigned long thresh);

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index a21c0ea396f3b8dce3886b00d92f5d0e113dfc28..36bfe1c92d4494ea2be74d1cb66402055d44f851 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -100,8 +100,6 @@
 static const int six_hundred_forty_kb = 640 * 1024;
 #endif
 
-/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
-static const unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
 
 static const int ngroups_max = NGROUPS_MAX;
 static const int cap_last_cap = CAP_LAST_CAP;
@@ -2263,55 +2261,6 @@ static struct ctl_table vm_table[] = {
                .proc_handler   = proc_dointvec_minmax,
                .extra1         = SYSCTL_ZERO,
        },
-       {
-               .procname       = "dirty_background_ratio",
-               .data           = &dirty_background_ratio,
-               .maxlen         = sizeof(dirty_background_ratio),
-               .mode           = 0644,
-               .proc_handler   = dirty_background_ratio_handler,
-               .extra1         = SYSCTL_ZERO,
-               .extra2         = SYSCTL_ONE_HUNDRED,
-       },
-       {
-               .procname       = "dirty_background_bytes",
-               .data           = &dirty_background_bytes,
-               .maxlen         = sizeof(dirty_background_bytes),
-               .mode           = 0644,
-               .proc_handler   = dirty_background_bytes_handler,
-               .extra1         = SYSCTL_LONG_ONE,
-       },
-       {
-               .procname       = "dirty_ratio",
-               .data           = &vm_dirty_ratio,
-               .maxlen         = sizeof(vm_dirty_ratio),
-               .mode           = 0644,
-               .proc_handler   = dirty_ratio_handler,
-               .extra1         = SYSCTL_ZERO,
-               .extra2         = SYSCTL_ONE_HUNDRED,
-       },
-       {
-               .procname       = "dirty_bytes",
-               .data           = &vm_dirty_bytes,
-               .maxlen         = sizeof(vm_dirty_bytes),
-               .mode           = 0644,
-               .proc_handler   = dirty_bytes_handler,
-               .extra1         = (void *)&dirty_bytes_min,
-       },
-       {
-               .procname       = "dirty_writeback_centisecs",
-               .data           = &dirty_writeback_interval,
-               .maxlen         = sizeof(dirty_writeback_interval),
-               .mode           = 0644,
-               .proc_handler   = dirty_writeback_centisecs_handler,
-       },
-       {
-               .procname       = "dirty_expire_centisecs",
-               .data           = &dirty_expire_interval,
-               .maxlen         = sizeof(dirty_expire_interval),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_minmax,
-               .extra1         = SYSCTL_ZERO,
-       },
        {
                .procname       = "dirtytime_expire_seconds",
                .data           = &dirtytime_expire_interval,
@@ -2483,13 +2432,6 @@ static struct ctl_table vm_table[] = {
                .extra1         = SYSCTL_ZERO,
        },
 #endif
-       {
-               .procname       = "laptop_mode",
-               .data           = &laptop_mode,
-               .maxlen         = sizeof(laptop_mode),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_jiffies,
-       },
        {
                .procname       = "vfs_cache_pressure",
                .data           = &sysctl_vfs_cache_pressure,
@@ -2587,17 +2529,6 @@ static struct ctl_table vm_table[] = {
                .extra1         = SYSCTL_ZERO,
        },
 #endif
-#ifdef CONFIG_HIGHMEM
-       {
-               .procname       = "highmem_is_dirtyable",
-               .data           = &vm_highmem_is_dirtyable,
-               .maxlen         = sizeof(vm_highmem_is_dirtyable),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_minmax,
-               .extra1         = SYSCTL_ZERO,
-               .extra2         = SYSCTL_ONE,
-       },
-#endif
 #ifdef CONFIG_MEMORY_FAILURE
        {
                .procname       = "memory_failure_early_kill",

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 7e2da284e427188aafefe15b0d6b0f0c6ec80544..438762173a59c3b77935978060f87da6a6d2b6d4 100644 (file)
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -70,30 +70,33 @@ static long ratelimit_pages = 32;
 /*
  * Start background writeback (via writeback threads) at this percentage
  */
-int dirty_background_ratio = 10;
+static int dirty_background_ratio = 10;
 
 /*
  * dirty_background_bytes starts at 0 (disabled) so that it is a function of
  * dirty_background_ratio * the amount of dirtyable memory
  */
-unsigned long dirty_background_bytes;
+static unsigned long dirty_background_bytes;
 
 /*
  * free highmem will not be subtracted from the total free memory
  * for calculating free ratios if vm_highmem_is_dirtyable is true
  */
-int vm_highmem_is_dirtyable;
+static int vm_highmem_is_dirtyable;
 
 /*
  * The generator of dirty data starts writeback at this percentage
  */
-int vm_dirty_ratio = 20;
+static int vm_dirty_ratio = 20;
+
+/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
+static const unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
 
 /*
  * vm_dirty_bytes starts at 0 (disabled) so that it is a function of
  * vm_dirty_ratio * the amount of dirtyable memory
  */
-unsigned long vm_dirty_bytes;
+static unsigned long vm_dirty_bytes;
 
 /*
  * The interval between `kupdate'-style writebacks
@@ -491,7 +494,8 @@ bool node_dirty_ok(struct pglist_data *pgdat)
        return nr_pages <= limit;
 }
 
-int dirty_background_ratio_handler(struct ctl_table *table, int write,
+#ifdef CONFIG_SYSCTL
+static int dirty_background_ratio_handler(struct ctl_table *table, int write,
                void *buffer, size_t *lenp, loff_t *ppos)
 {
        int ret;
@@ -502,7 +506,7 @@ int dirty_background_ratio_handler(struct ctl_table *table, int write,
        return ret;
 }
 
-int dirty_background_bytes_handler(struct ctl_table *table, int write,
+static int dirty_background_bytes_handler(struct ctl_table *table, int write,
                void *buffer, size_t *lenp, loff_t *ppos)
 {
        int ret;
@@ -513,7 +517,7 @@ int dirty_background_bytes_handler(struct ctl_table *table, int write,
        return ret;
 }
 
-int dirty_ratio_handler(struct ctl_table *table, int write, void *buffer,
+static int dirty_ratio_handler(struct ctl_table *table, int write, void *buffer,
                size_t *lenp, loff_t *ppos)
 {
        int old_ratio = vm_dirty_ratio;
@@ -527,7 +531,7 @@ int dirty_ratio_handler(struct ctl_table *table, int write, void *buffer,
        return ret;
 }
 
-int dirty_bytes_handler(struct ctl_table *table, int write,
+static int dirty_bytes_handler(struct ctl_table *table, int write,
                void *buffer, size_t *lenp, loff_t *ppos)
 {
        unsigned long old_bytes = vm_dirty_bytes;
@@ -540,6 +544,7 @@ int dirty_bytes_handler(struct ctl_table *table, int write,
        }
        return ret;
 }
+#endif
 
 static unsigned long wp_next_time(unsigned long cur_time)
 {
@@ -1981,10 +1986,11 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb)
        return false;
 }
 
+#ifdef CONFIG_SYSCTL
 /*
  * sysctl handler for /proc/sys/vm/dirty_writeback_centisecs
  */
-int dirty_writeback_centisecs_handler(struct ctl_table *table, int write,
+static int dirty_writeback_centisecs_handler(struct ctl_table *table, int write,
                void *buffer, size_t *length, loff_t *ppos)
 {
        unsigned int old_interval = dirty_writeback_interval;
@@ -2005,6 +2011,7 @@ int dirty_writeback_centisecs_handler(struct ctl_table *table, int write,
 
        return ret;
 }
+#endif
 
 void laptop_mode_timer_fn(struct timer_list *t)
 {
@@ -2069,6 +2076,79 @@ static int page_writeback_cpu_online(unsigned int cpu)
        return 0;
 }
 
+#ifdef CONFIG_SYSCTL
+static struct ctl_table vm_page_writeback_sysctls[] = {
+       {
+               .procname   = "dirty_background_ratio",
+               .data       = &dirty_background_ratio,
+               .maxlen     = sizeof(dirty_background_ratio),
+               .mode       = 0644,
+               .proc_handler   = dirty_background_ratio_handler,
+               .extra1     = SYSCTL_ZERO,
+               .extra2     = SYSCTL_ONE_HUNDRED,
+       },
+       {
+               .procname   = "dirty_background_bytes",
+               .data       = &dirty_background_bytes,
+               .maxlen     = sizeof(dirty_background_bytes),
+               .mode       = 0644,
+               .proc_handler   = dirty_background_bytes_handler,
+               .extra1     = SYSCTL_LONG_ONE,
+       },
+       {
+               .procname   = "dirty_ratio",
+               .data       = &vm_dirty_ratio,
+               .maxlen     = sizeof(vm_dirty_ratio),
+               .mode       = 0644,
+               .proc_handler   = dirty_ratio_handler,
+               .extra1     = SYSCTL_ZERO,
+               .extra2     = SYSCTL_ONE_HUNDRED,
+       },
+       {
+               .procname   = "dirty_bytes",
+               .data       = &vm_dirty_bytes,
+               .maxlen     = sizeof(vm_dirty_bytes),
+               .mode       = 0644,
+               .proc_handler   = dirty_bytes_handler,
+               .extra1     = (void *)&dirty_bytes_min,
+       },
+       {
+               .procname   = "dirty_writeback_centisecs",
+               .data       = &dirty_writeback_interval,
+               .maxlen     = sizeof(dirty_writeback_interval),
+               .mode       = 0644,
+               .proc_handler   = dirty_writeback_centisecs_handler,
+       },
+       {
+               .procname   = "dirty_expire_centisecs",
+               .data       = &dirty_expire_interval,
+               .maxlen     = sizeof(dirty_expire_interval),
+               .mode       = 0644,
+               .proc_handler   = proc_dointvec_minmax,
+               .extra1     = SYSCTL_ZERO,
+       },
+#ifdef CONFIG_HIGHMEM
+       {
+               .procname       = "highmem_is_dirtyable",
+               .data           = &vm_highmem_is_dirtyable,
+               .maxlen         = sizeof(vm_highmem_is_dirtyable),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec_minmax,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
+       },
+#endif
+       {
+               .procname       = "laptop_mode",
+               .data           = &laptop_mode,
+               .maxlen         = sizeof(laptop_mode),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec_jiffies,
+       },
+       {}
+};
+#endif
+
 /*
  * Called early on to tune the page writeback dirty limits.
  *
@@ -2093,6 +2173,9 @@ void __init page_writeback_init(void)
                          page_writeback_cpu_online, NULL);
        cpuhp_setup_state(CPUHP_MM_WRITEBACK_DEAD, "mm/writeback:dead", NULL,
                          page_writeback_cpu_online);
+#ifdef CONFIG_SYSCTL
+       register_sysctl_init("vm", vm_page_writeback_sysctls);
+#endif
 }
 
 /**