Skip to content

Commit

Permalink
mm: compaction: fix echo 1 > compact_memory return error issue
Browse files Browse the repository at this point in the history
when run the folloing command under shell, it will return error

  sh/$ echo 1 > /proc/sys/vm/compact_memory
  sh/$ sh: write error: Bad address

After strace, I found the following log:

  ...
  write(1, "1\n", 2)               = 3
  write(1, "", 4294967295)         = -1 EFAULT (Bad address)
  write(2, "echo: write error: Bad address\n", 31echo: write error: Bad address
  ) = 31

This tells system return 3(COMPACT_COMPLETE) after write data to
compact_memory.

The fix is to make the system just return 0 instead 3(COMPACT_COMPLETE)
from sysctl_compaction_handler after compaction_nodes finished.

Signed-off-by: Jason Liu <[email protected]>
Suggested-by: David Rientjes <[email protected]>
Acked-by: Mel Gorman <[email protected]>
Cc: Rik van Riel <[email protected]>
Cc: Minchan Kim <[email protected]>
Cc: KAMEZAWA Hiroyuki <[email protected]>
Acked-by: David Rientjes <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
LiuHui-Jason authored and torvalds committed Jan 11, 2013
1 parent c0232ae commit 7964c06
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions mm/compaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ static int compact_node(int nid)
}

/* Compact all nodes in the system */
static int compact_nodes(void)
static void compact_nodes(void)
{
int nid;

Expand All @@ -1219,8 +1219,6 @@ static int compact_nodes(void)

for_each_online_node(nid)
compact_node(nid);

return COMPACT_COMPLETE;
}

/* The written value is actually unused, all memory is compacted */
Expand All @@ -1231,7 +1229,7 @@ int sysctl_compaction_handler(struct ctl_table *table, int write,
void __user *buffer, size_t *length, loff_t *ppos)
{
if (write)
return compact_nodes();
compact_nodes();

return 0;
}
Expand Down

0 comments on commit 7964c06

Please sign in to comment.