diff options
| author | Tahsin Erdogan <tahsin@google.com> | 2017-02-25 13:00:19 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-26 13:05:58 +0200 |
| commit | 3f406ecddf8a8d4b6c2de195336ae1c6b56722c1 (patch) | |
| tree | 781d53d110c0da3ac08ed998306e86e5c58a5cc3 /mm/percpu.c | |
| parent | a33e71c5f0cbbf9d5f25ebad90ed2b2b117444bb (diff) | |
| download | linux-stable-3f406ecddf8a8d4b6c2de195336ae1c6b56722c1.tar.gz linux-stable-3f406ecddf8a8d4b6c2de195336ae1c6b56722c1.tar.bz2 linux-stable-3f406ecddf8a8d4b6c2de195336ae1c6b56722c1.zip | |
percpu: acquire pcpu_lock when updating pcpu_nr_empty_pop_pages
commit 320661b08dd6f1746d5c7ab4eb435ec64b97cd45 upstream.
Update to pcpu_nr_empty_pop_pages in pcpu_alloc() is currently done
without holding pcpu_lock. This can lead to bad updates to the variable.
Add missing lock calls.
Fixes: b539b87fed37 ("percpu: implmeent pcpu_nr_empty_pop_pages and chunk->nr_populated")
Signed-off-by: Tahsin Erdogan <tahsin@google.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/percpu.c')
| -rw-r--r-- | mm/percpu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 255714302394..f014cebbf405 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1010,8 +1010,11 @@ area_found: mutex_unlock(&pcpu_alloc_mutex); } - if (chunk != pcpu_reserved_chunk) + if (chunk != pcpu_reserved_chunk) { + spin_lock_irqsave(&pcpu_lock, flags); pcpu_nr_empty_pop_pages -= occ_pages; + spin_unlock_irqrestore(&pcpu_lock, flags); + } if (pcpu_nr_empty_pop_pages < PCPU_EMPTY_POP_PAGES_LOW) pcpu_schedule_balance_work(); |