]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'mm-stable-2022-10-13' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2022 19:28:43 +0000 (12:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2022 19:28:43 +0000 (12:28 -0700)
Pull more MM updates from Andrew Morton:

 - fix a race which causes page refcounting errors in ZONE_DEVICE pages
   (Alistair Popple)

 - fix userfaultfd test harness instability (Peter Xu)

 - various other patches in MM, mainly fixes

* tag 'mm-stable-2022-10-13' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (29 commits)
  highmem: fix kmap_to_page() for kmap_local_page() addresses
  mm/page_alloc: fix incorrect PGFREE and PGALLOC for high-order page
  mm/selftest: uffd: explain the write missing fault check
  mm/hugetlb: use hugetlb_pte_stable in migration race check
  mm/hugetlb: fix race condition of uffd missing/minor handling
  zram: always expose rw_page
  LoongArch: update local TLB if PTE entry exists
  mm: use update_mmu_tlb() on the second thread
  kasan: fix array-bounds warnings in tests
  hmm-tests: add test for migrate_device_range()
  nouveau/dmem: evict device private memory during release
  nouveau/dmem: refactor nouveau_dmem_fault_copy_one()
  mm/migrate_device.c: add migrate_device_range()
  mm/migrate_device.c: refactor migrate_vma and migrate_deivce_coherent_page()
  mm/memremap.c: take a pgmap reference on page allocation
  mm: free device private pages have zero refcount
  mm/memory.c: fix race when faulting a device private page
  mm/damon: use damon_sz_region() in appropriate place
  mm/damon: move sz_damon_region to damon_sz_region
  lib/test_meminit: add checks for the allocation functions
  ...

1  2 
drivers/block/zram/zram_drv.c
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
drivers/gpu/drm/amd/amdkfd/kfd_svm.c
fs/ext4/verity.c
fs/f2fs/verity.c
include/linux/sched.h
mm/compaction.c
mm/damon/core.c
mm/hugetlb.c
mm/page_alloc.c
tools/testing/selftests/vm/hmm-tests.c

Simple merge
index c70c026c9a935072c9c0e7d4ad7378706d3afa53,97a684568ae01e9e2f8301a1a1ca2a5313f42975..2797029bd50015f421a1ff74f03ddf37564ccc8f
@@@ -949,11 -940,11 +951,12 @@@ static vm_fault_t svm_migrate_to_ram(st
                goto out_unlock_prange;
        }
  
 -      r = svm_migrate_vram_to_ram(prange, mm, KFD_MIGRATE_TRIGGER_PAGEFAULT_CPU,
 -                              vmf->page);
 +      r = svm_migrate_vram_to_ram(prange, vmf->vma->vm_mm,
-                                   KFD_MIGRATE_TRIGGER_PAGEFAULT_CPU);
++                                  KFD_MIGRATE_TRIGGER_PAGEFAULT_CPU,
++                                  vmf->page);
        if (r)
 -              pr_debug("failed %d migrate 0x%p [0x%lx 0x%lx] to ram\n", r,
 -                       prange, prange->start, prange->last);
 +              pr_debug("failed %d migrate svms 0x%p range 0x%p [0x%lx 0x%lx]\n",
 +                       r, prange->svms, prange, prange->start, prange->last);
  
        /* xnack on, update mapping on GPUs with ACCESS_IN_PLACE */
        if (p->xnack_enabled && parent == prange)
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/compaction.c
Simple merge
diff --cc mm/damon/core.c
Simple merge
diff --cc mm/hugetlb.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge