From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 Aug 2020 20:28:50 +0000 (-0700)
Subject: Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
X-Git-Tag: v5.15~3200
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fffe3ae0ee84e25d2befe2ae59bc32aa2b6bc77b;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-hmm' of git://git./linux/kernel/git/rdma/rdma

Pull hmm updates from Jason Gunthorpe:
 "Ralph has been working on nouveau's use of hmm_range_fault() and
  migrate_vma() which resulted in this small series. It adds reporting
  of the page table order from hmm_range_fault() and some optimization
  of migrate_vma():

   - Report the size of the page table mapping out of hmm_range_fault().

     This makes it easier to establish a large/huge/etc mapping in the
     device's page table.

   - Allow devices to ignore the invalidations during migration in cases
     where the migration is not going to change pages.

     For instance migrating pages to a device does not require the
     device to invalidate pages already in the device.

   - Update nouveau and hmm_tests to use the above"

* tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  mm/hmm/test: use the new migration invalidation
  nouveau/svm: use the new migration invalidation
  mm/notifier: add migration invalidation type
  mm/migrate: add a flags parameter to migrate_vma
  nouveau: fix storing invalid ptes
  nouveau/hmm: support mapping large sysmem pages
  nouveau: fix mapping 2MB sysmem pages
  nouveau/hmm: fault one page at a time
  mm/hmm: add tests for hmm_pfn_to_map_order()
  mm/hmm: provide the page mapping order in hmm_range_fault()
---

fffe3ae0ee84e25d2befe2ae59bc32aa2b6bc77b
diff --cc drivers/gpu/drm/nouveau/nouveau_svm.c
index 6586d9d,67b068a..03c515e
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
@@@ -560,9 -572,8 +572,9 @@@ static int nouveau_range_fault(struct n
  		.notifier = &notifier->notifier,
  		.start = notifier->notifier.interval_tree.start,
  		.end = notifier->notifier.interval_tree.last + 1,
- 		.pfn_flags_mask = HMM_PFN_REQ_FAULT | HMM_PFN_REQ_WRITE,
+ 		.default_flags = hmm_flags,
  		.hmm_pfns = hmm_pfns,
 +		.dev_private_owner = drm->dev,
  	};
  	struct mm_struct *mm = notifier->notifier.mm;
  	int ret;