diff options
author | David Rientjes <rientjes@google.com> | 2014-08-06 19:07:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 21:01:21 -0400 |
commit | 9ef0a0ffa28edbf5c7cfa6be73b4ecb9896a3875 (patch) | |
tree | 6c0d71402e6c354b97eb04f4f62f00cee138ccb6 /mm | |
parent | 14a4e2141e24304fff2c697be6382ffb83888185 (diff) |
mm, writeback: prevent race when calculating dirty limits
Setting vm_dirty_bytes and dirty_background_bytes is not protected by
any serialization.
Therefore, it's possible for either variable to change value after the
test in global_dirty_limits() to determine whether available_memory
needs to be initialized or not.
Always ensure that available_memory is properly initialized.
Signed-off-by: David Rientjes <rientjes@google.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/page-writeback.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index e0c943014eb7..91d73ef1744d 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
@@ -261,14 +261,11 @@ static unsigned long global_dirtyable_memory(void) | |||
261 | */ | 261 | */ |
262 | void global_dirty_limits(unsigned long *pbackground, unsigned long *pdirty) | 262 | void global_dirty_limits(unsigned long *pbackground, unsigned long *pdirty) |
263 | { | 263 | { |
264 | const unsigned long available_memory = global_dirtyable_memory(); | ||
264 | unsigned long background; | 265 | unsigned long background; |
265 | unsigned long dirty; | 266 | unsigned long dirty; |
266 | unsigned long uninitialized_var(available_memory); | ||
267 | struct task_struct *tsk; | 267 | struct task_struct *tsk; |
268 | 268 | ||
269 | if (!vm_dirty_bytes || !dirty_background_bytes) | ||
270 | available_memory = global_dirtyable_memory(); | ||
271 | |||
272 | if (vm_dirty_bytes) | 269 | if (vm_dirty_bytes) |
273 | dirty = DIV_ROUND_UP(vm_dirty_bytes, PAGE_SIZE); | 270 | dirty = DIV_ROUND_UP(vm_dirty_bytes, PAGE_SIZE); |
274 | else | 271 | else |