John Hubbard 08be37b798 mm/gup: finish consolidating error handling ... Commit df06b37ffe ("mm/gup: cache dev_pagemap while pinning pages") attempted to operate on each page that get_user_pages had retrieved. In order to do that, it created a common exit point from the routine. However, one case was missed, which this patch fixes up. Also, there was still an unnecessary shadow declaration (with a different type) of the "ret" variable, which this patch removes. Keith's description of the situation is: This also fixes a potentially leaked dev_pagemap reference count if a failure occurs when an iteration crosses a vma boundary. I don't think it's normal to have different vma's on a users mapped zone device memory, but good to fix anyway. I actually thought that this code: /* first iteration or cross vma bound */ if (!vma || start >= vma->vm_end) { vma = find_extend_vma(mm, start); if (!vma && in_gate_area(mm, start)) { ret = get_gate_page(mm, start & PAGE_MASK, gup_flags, &vma, pages ? &pages[i] : NULL); if (ret) goto out; dealt with the "you're trying to pin the gate page, as part of this call", rather than the generic case of crossing a vma boundary. (I think there's a fine point that I must be overlooking.) But it's still a valid case, either way. Link: http://lkml.kernel.org/r/20181121081402.29641-2-jhubbard@nvidia.com Fixes: df06b37ffe ("mm/gup: cache dev_pagemap while pinning pages") Signed-off-by: John Hubbard <jhubbard@nvidia.com> Reviewed-by: Keith Busch <keith.busch@intel.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Dave Hansen <dave.hansen@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2018-11-30 14:56:13 -08:00
..
kasan
backing-dev.c
balloon_compaction.c
cleancache.c
cma_debug.c
cma.c
cma.h
compaction.c
debug_page_ref.c
debug.c
dmapool.c
early_ioremap.c
fadvise.c
failslab.c
filemap.c	vfs: rework data cloning infrastructure	2018-11-02 09:33:08 -07:00
frame_vector.c
frontswap.c
gup_benchmark.c
gup.c	mm/gup: finish consolidating error handling	2018-11-30 14:56:13 -08:00
highmem.c
hmm.c
huge_memory.c	mm, thp: consolidate THP gfp handling into alloc_hugepage_direct_gfpmask	2018-11-03 10:09:37 -07:00
hugetlb_cgroup.c
hugetlb.c	hugetlbfs: fix kernel BUG at fs/hugetlbfs/inode.c:444!	2018-11-18 10:15:09 -08:00
hwpoison-inject.c
init-mm.c
internal.h
interval_tree.c
Kconfig
Kconfig.debug
khugepaged.c
kmemleak-test.c
kmemleak.c
ksm.c
list_lru.c
maccess.c
madvise.c
Makefile
memblock.c	mm/memblock.c: fix a typo in __next_mem_pfn_range() comments	2018-11-18 10:15:10 -08:00
memcontrol.c	mm: handle no memcg case in memcg_kmem_charge() properly	2018-11-03 10:09:37 -07:00
memfd.c
memory_hotplug.c	memory_hotplug: cond_resched in __remove_pages	2018-11-03 10:09:38 -07:00
memory-failure.c
memory.c
mempolicy.c	mm, thp: consolidate THP gfp handling into alloc_hugepage_direct_gfpmask	2018-11-03 10:09:37 -07:00
mempool.c
memtest.c
migrate.c
mincore.c
mlock.c
mm_init.c
mmap.c
mmu_context.c
mmu_gather.c
mmu_notifier.c
mmzone.c
mprotect.c
mremap.c
msync.c
nommu.c
oom_kill.c
page_alloc.c	mm, page_alloc: check for max order in hot path	2018-11-18 10:15:10 -08:00
page_counter.c
page_ext.c
page_idle.c
page_io.c	for-linus-20181102	2018-11-02 11:25:48 -07:00
page_isolation.c
page_owner.c
page_poison.c
page_vma_mapped.c
page-writeback.c
pagewalk.c
percpu-internal.h
percpu-km.c
percpu-stats.c
percpu-vm.c
percpu.c
pgtable-generic.c
process_vm_access.c
quicklist.c
readahead.c
rmap.c
rodata_test.c
shmem.c	tmpfs: make lseek(SEEK_DATA/SEK_HOLE) return ENXIO with a negative offset	2018-11-18 10:15:10 -08:00
slab_common.c
slab.c
slab.h
slob.c
slub.c
sparse-vmemmap.c
sparse.c
swap_cgroup.c
swap_slots.c
swap_state.c
swap.c
swapfile.c	mm/swapfile.c: use kvzalloc for swap_info_struct allocation	2018-11-18 10:15:09 -08:00
truncate.c
usercopy.c
userfaultfd.c
util.c
vmacache.c
vmalloc.c
vmpressure.c
vmscan.c
vmstat.c	mm/vmstat.c: fix NUMA statistics updates	2018-11-18 10:15:10 -08:00
workingset.c
z3fold.c	z3fold: fix possible reclaim races	2018-11-18 10:15:09 -08:00
zbud.c
zpool.c
zsmalloc.c
zswap.c