Yisheng Xie
70feee0e1e
mlock: fix mlock count can not decrease in race condition
...
Kefeng reported that when running the follow test, the mlock count in
meminfo will increase permanently:
[1] testcase
linux:~ # cat test_mlockal
grep Mlocked /proc/meminfo
for j in `seq 0 10`
do
for i in `seq 4 15`
do
./p_mlockall >> log &
done
sleep 0.2
done
# wait some time to let mlock counter decrease and 5s may not enough
sleep 5
grep Mlocked /proc/meminfo
linux:~ # cat p_mlockall.c
#include <sys/mman.h>
#include <stdlib.h>
#include <stdio.h>
#define SPACE_LEN 4096
int main(int argc, char ** argv)
{
int ret;
void *adr = malloc(SPACE_LEN);
if (!adr)
return -1;
ret = mlockall(MCL_CURRENT | MCL_FUTURE);
printf("mlcokall ret = %d\n", ret);
ret = munlockall();
printf("munlcokall ret = %d\n", ret);
free(adr);
return 0;
}
In __munlock_pagevec() we should decrement NR_MLOCK for each page where
we clear the PageMlocked flag. Commit 1ebb7cc6a5 ("mm: munlock: batch
NR_MLOCK zone state updates") has introduced a bug where we don't
decrement NR_MLOCK for pages where we clear the flag, but fail to
isolate them from the lru list (e.g. when the pages are on some other
cpu's percpu pagevec). Since PageMlocked stays cleared, the NR_MLOCK
accounting gets permanently disrupted by this.
Fix it by counting the number of page whose PageMlock flag is cleared.
Fixes: 1ebb7cc6a5 (" mm: munlock: batch NR_MLOCK zone state updates")
Link: http://lkml.kernel.org/r/1495678405-54569-1-git-send-email-xieyisheng1@huawei.com
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
Reported-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Tested-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Joern Engel <joern@logfs.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michel Lespinasse <walken@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Cc: zhongjiang <zhongjiang@huawei.com>
Cc: Hanjun Guo <guohanjun@huawei.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-06-02 15:07:38 -07:00
..
kasan
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-10 10:30:46 -07:00
backing-dev.c
bdi: Drop 'parent' argument from bdi_register[_va]()
2017-04-20 12:09:55 -06:00
balloon_compaction.c
bootmem.c
mm/bootmem.c: cosmetic improvement of code readability
2017-02-22 16:41:29 -08:00
cleancache.c
cma.c
cma: Introduce cma_for_each_area
2017-04-18 20:41:12 +02:00
cma.h
cma: Store a name in the cma structure
2017-04-18 20:41:12 +02:00
cma_debug.c
cma: Store a name in the cma structure
2017-04-18 20:41:12 +02:00
compaction.c
mm, compaction: finish whole pageblock to reduce fragmentation
2017-05-08 17:15:10 -07:00
debug.c
mm, debug: print raw struct page data in __dump_page()
2016-12-12 18:55:08 -08:00
debug_page_ref.c
dmapool.c
lib/vsprintf.c: remove %Z support
2017-02-27 18:43:47 -08:00
early_ioremap.c
fadvise.c
mm: fadvise: avoid expensive remote LRU cache draining after FADV_DONTNEED
2016-12-20 09:48:46 -08:00
failslab.c
filemap.c
Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2017-05-09 09:01:21 -07:00
frame_vector.c
treewide: use kv[mz]alloc* rather than opencoded variants
2017-05-08 17:15:13 -07:00
frontswap.c
gup.c
mm/gup.c: fix access_ok() argument type
2017-05-03 15:52:12 -07:00
highmem.c
huge_memory.c
mm/huge_memory.c: deposit a pgtable for DAX PMD faults when required
2017-05-08 17:15:15 -07:00
hugetlb.c
mm/hugetlb.c: don't call region_abort if region_chg fails
2017-03-31 17:13:30 -07:00
hugetlb_cgroup.c
hwpoison-inject.c
mm: hwpoison: call shake_page() unconditionally
2017-05-03 15:52:12 -07:00
init-mm.c
mm: Add a user_ns owner to mm_struct and fix ptrace permission checks
2016-11-22 11:49:48 -06:00
internal.h
mm, compaction: finish whole pageblock to reduce fragmentation
2017-05-08 17:15:10 -07:00
interval_tree.c
Kconfig
mm: remove AVR32 arch special handling in mm/Kconfig
2017-05-01 09:36:31 +02:00
Kconfig.debug
mm: enable page poisoning early at boot
2017-05-03 15:52:10 -07:00
khugepaged.c
mm, thp: copying user pages must schedule on collapse
2017-05-12 15:57:16 -07:00
kmemcheck.c
mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU
2017-04-18 11:42:36 -07:00
kmemleak-test.c
kmemleak.c
mm: fix section name for .data..ro_after_init
2017-03-31 17:13:30 -07:00
ksm.c
ksm: prevent crash after write_protect_page fails
2017-06-02 15:07:37 -07:00
list_lru.c
mm/list_lru.c: avoid error-path NULL pointer deref
2016-10-27 18:43:42 -07:00
maccess.c
madvise.c
mm/madvise: move up the behavior parameter validation
2017-05-03 15:52:11 -07:00
Makefile
mm: add arch-independent testcases for RODATA
2017-02-27 18:43:48 -08:00
memblock.c
memblock: add memblock_cap_memory_range()
2017-04-05 18:26:50 +01:00
memcontrol.c
hwpoison, memcg: forcibly uncharge LRU pages
2017-05-12 15:57:15 -07:00
memory-failure.c
mm/migrate: fix refcount handling when !hugepage_migration_supported()
2017-06-02 15:07:38 -07:00
memory.c
mm: avoid spurious 'bad pmd' warning messages
2017-06-02 15:07:37 -07:00
memory_hotplug.c
mm, vmscan: prevent kswapd sleeping prematurely due to mismatched classzone_idx
2017-05-03 15:52:09 -07:00
mempolicy.c
mm/mempolicy.c: fix error handling in set_mempolicy and mbind.
2017-04-08 10:57:55 -07:00
mempool.c
memtest.c
migrate.c
mm: make rmap_one boolean function
2017-05-03 15:52:10 -07:00
mincore.c
mm: remove shmem_mapping() shmem_zero_setup() duplicates
2017-02-24 17:46:56 -08:00
mlock.c
mlock: fix mlock count can not decrease in race condition
2017-06-02 15:07:38 -07:00
mm_init.c
mmap.c
mm/mmap: replace SHM_HUGE_MASK with MAP_HUGE_MASK inside mmap_pgoff
2017-05-03 15:52:10 -07:00
mmu_context.c
sched/headers: Prepare to move the task_lock()/unlock() APIs to <linux/sched/task.h>
2017-03-02 08:42:38 +01:00
mmu_notifier.c
mm: Use static initialization for "srcu"
2017-04-18 11:38:22 -07:00
mmzone.c
mm/mmzone.c: swap likely to unlikely as code logic is different for next_zones_zonelist()
2017-02-22 16:41:29 -08:00
mprotect.c
mm: convert generic code to 5-level paging
2017-03-09 11:48:47 -08:00
mremap.c
mm: convert generic code to 5-level paging
2017-03-09 11:48:47 -08:00
msync.c
nobootmem.c
mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
2016-10-11 15:06:33 -07:00
nommu.c
mm, vmalloc: use __GFP_HIGHMEM implicitly
2017-05-08 17:15:13 -07:00
oom_kill.c
oom: improve oom disable handling
2017-05-03 15:52:10 -07:00
page-writeback.c
Add GETFSMAP support; some performance improvements for very large
2017-05-08 11:30:05 -07:00
page_alloc.c
mm/page_alloc.c: make sure OOM victim can try allocations with no watermarks once
2017-06-02 15:07:37 -07:00
page_counter.c
page_ext.c
mm: enable page poisoning early at boot
2017-05-03 15:52:10 -07:00
page_idle.c
mm: make rmap_one boolean function
2017-05-03 15:52:10 -07:00
page_io.c
writeback: add wbc_to_write_flags()
2016-11-02 10:24:03 -06:00
page_isolation.c
mm, page_alloc: count movable pages when stealing from pageblock
2017-05-08 17:15:10 -07:00
page_owner.c
page_poison.c
mm: enable page poisoning early at boot
2017-05-03 15:52:10 -07:00
page_vma_mapped.c
mm: fix page_vma_mapped_walk() for ksm pages
2017-04-08 00:47:48 -07:00
pagewalk.c
mm: convert generic code to 5-level paging
2017-03-09 11:48:47 -08:00
percpu-km.c
percpu-vm.c
percpu: remove unused chunk_alloc parameter from pcpu_get_pages()
2017-03-06 15:56:55 -05:00
percpu.c
Merge branch 'sched/core' into locking/core
2017-04-04 11:31:12 +02:00
pgtable-generic.c
mm: convert generic code to 5-level paging
2017-03-09 11:48:47 -08:00
process_vm_access.c
sched/headers: Prepare for new header dependencies before moving code to <linux/sched/mm.h>
2017-03-02 08:42:28 +01:00
quicklist.c
readahead.c
mm: don't cap request size based on read-ahead setting
2016-12-12 18:55:08 -08:00
rmap.c
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-10 10:30:46 -07:00
rodata_test.c
mm: remove rodata_test_data export, add pr_fmt
2017-05-03 15:52:09 -07:00
shmem.c
Merge branch 'rebased-statx' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2017-03-03 11:38:56 -08:00
slab.c
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-10 10:30:46 -07:00
slab.h
mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU
2017-04-18 11:42:36 -07:00
slab_common.c
mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU
2017-04-18 11:42:36 -07:00
slob.c
mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU
2017-04-18 11:42:36 -07:00
slub.c
slub/memcg: cure the brainless abuse of sysfs attributes
2017-06-02 15:07:37 -07:00
sparse-vmemmap.c
mm: convert generic code to 5-level paging
2017-03-09 11:48:47 -08:00
sparse.c
mm/sparse: refine usemap_size() a little
2017-05-03 15:52:09 -07:00
swap.c
mm: move MADV_FREE pages into LRU_INACTIVE_FILE list
2017-05-03 15:52:08 -07:00
swap_cgroup.c
mm, swap_cgroup: reschedule when neeed in swap_cgroup_swapoff()
2017-04-08 00:47:49 -07:00
swap_slots.c
mm, swap: use kvzalloc to allocate some swap data structures
2017-05-08 17:15:13 -07:00
swap_state.c
mm, swap: use kvzalloc to allocate some swap data structures
2017-05-08 17:15:13 -07:00
swapfile.c
mm, swap: use kvzalloc to allocate some swap data structures
2017-05-08 17:15:13 -07:00
truncate.c
mm: fix data corruption due to stale mmap reads
2017-05-12 15:57:15 -07:00
usercopy.c
mm/usercopy: Drop extra is_vmalloc_or_module() check
2017-04-05 12:30:18 -07:00
userfaultfd.c
mm: convert generic code to 5-level paging
2017-03-09 11:48:47 -08:00
util.c
mm: clarify why we want kmalloc before falling backto vmallock
2017-06-02 15:07:37 -07:00
vmacache.c
sched/headers: Prepare to move 'init_task' and 'init_thread_union' from <linux/sched.h> to <linux/sched/task.h>
2017-03-02 08:42:38 +01:00
vmalloc.c
mm, vmalloc: fix vmalloc users tracking properly
2017-05-12 15:57:15 -07:00
vmpressure.c
mm: vmpressure: fix sending wrong events on underflow
2017-02-24 17:46:56 -08:00
vmscan.c
mm: vmscan: scan until it finds eligible pages
2017-05-12 15:57:16 -07:00
vmstat.c
mm, vmstat: Remove spurious WARN() during zoneinfo print
2017-05-12 15:57:15 -07:00
workingset.c
mm: memcontrol: use node page state naming scheme for memcg
2017-05-03 15:52:11 -07:00
z3fold.c
z3fold: fix page locking in z3fold_alloc()
2017-04-13 18:24:20 -07:00
zbud.c
zpool.c
zsmalloc.c
zsmalloc: expand class bit
2017-04-13 18:24:21 -07:00
zswap.c
zswap: don't param_set_charp while holding spinlock
2017-02-27 18:43:45 -08:00