mm: compaction: limit illegal input parameters of compact_memory interface
Subsystems (4)
PATCH 1/1 mm: compaction: limit illegal input parameters of compact_memory interface
From: Minghao Chi <[email protected]>
Available only when CONFIG_COMPACTION is set. When 1 is written to the file, all zones are compacted such that free memory is available in contiguous blocks where possible.
But echo others-parameter > compact_memory, this function will be triggered by writing parameters to the interface.
Applied this patch,
sh/$ echo 1.1 > /proc/sys/vm/compact_memory
sh/$ sh: write error: Invalid argument
The start and end time of printing triggering compact_memory.
--- include/linux/compaction.h | 1 + kernel/sysctl.c | 4 +++- mm/compaction.c | 12 +++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-)
include/linux/compaction.h +1 -0
@@ -81,6 +81,7 @@ static inline unsigned long compact_gap(unsigned int order) }#ifdef CONFIG_COMPACTION +extern int sysctl_compact_memory;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);
kernel/sysctl.c +3 -1
@@ -2192,10 +2192,12 @@ static struct ctl_table vm_table[] = { #ifdef CONFIG_COMPACTION { .procname = "compact_memory", - .data = NULL, + .data = &sysctl_compact_memory, .maxlen = sizeof(int), .mode = 0200, .proc_handler = sysctl_compaction_handler, + .extra1 = SYSCTL_ONE, + .extra2 = SYSCTL_ONE, }, { .procname = "compaction_proactiveness",
mm/compaction.c +11 -1
@@ -2763,6 +2763,8 @@ int compaction_proactiveness_sysctl_handler(struct ctl_table *table, int write,return 0 ; } +/* The written value is actually unused, all memory is compacted */ +int sysctl_compact_memory;/* * This is the entry point for compacting all nodes via * /proc/sys/vm/compact_memory
@@ -2770,8 +2772,16 @@ int compaction_proactiveness_sysctl_handler(struct ctl_table *table, int write,int sysctl_compaction_handler (struct ctl_table *table,int write,void *buffer,size_t *length,loff_t *ppos) { -if (write) +int ret; + + ret =proc_dointvec_minmax (table, write, buffer, length, ppos); +if (ret) +return ret; +if (write) { +pr_info ("compact_nodes start\n" );compact_nodes (); +pr_info ("compact_nodes end\n" ); + }return 0 ; }
Signature · 1 line
2.25.1
Quoted 8 lines · On Fri, Mar 03, 2023 at 08:44:41AM +0800, [email protected] wrote:
From: Minghao Chi <[email protected]>
Available only when
CONFIG_COMPACTIONis set. When 1 is written to the file, all zones are compacted such that free memory is available in contiguous blocks where possible.
But echo others-parameter >compact_memory, this function will be triggered by writing parameters to the interface.
Quoted 7 lines
Applied this patch,
sh/$ echo 1.1 >/proc/sys/vm/compact_memory
sh/$ sh: write error: Invalid argument
The start and end time of printing triggeringcompact_memory.Signed-off-by Minghao Chi <[email protected]>Signed-off-by Ye Xingchen <[email protected]>
Do a huge favor and while you're at it split this into two patches, one which takes this out of kernel/sysctl.c and move it to mm/compaction.c and a second one that does your change here.
Since kernel/sysctl.c is being trimmed you can base your changes on sysctl-next [0] and I'm happy to take in there if Andrew agrees to it.
[0] https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git/log/?h=sysctl-next
Luis