Skip to contentSkip to conversation

nouveau: fix page fault on device private memory

PATCH Superseded Ralph Campbell 3 participants 3 messages Jun 26, 2020

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nouveau: fix page fault on device private memory

If system memory is migrated to device private memory and no GPU MMU page table entry exists, the GPU will fault and call hmm_range_fault() to get the PFN for the page. Since the .dev_private_owner pointer in struct hmm_range is not set, hmm_range_fault returns an error which results in the GPU program stopping with a fatal fault.
Fix this by setting .dev_private_owner appropriately.

Fixes 08ddddda667b ("mm/hmm: check the device private page owner in hmm_range_fault()")

---

This is based on Linux-5.8.0-rc2 and is for Ben Skeggs nouveau tree. It doesn't depend on any of the other nouveau/HMM changes I have recently posted.

 drivers/gpu/drm/nouveau/nouveau_svm.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/nouveau/nouveau_svm.c +1 -0
index ba9f9359c30e..6586d9d39874 100644
@@ -562,6 +562,7 @@ static int nouveau_range_fault(struct nouveau_svmm *svmm,
 		.end = notifier->notifier.interval_tree.last + 1,
 		.pfn_flags_mask = HMM_PFN_REQ_FAULT | HMM_PFN_REQ_WRITE,
 		.hmm_pfns = hmm_pfns,
+		.dev_private_owner = drm->dev,
 	};
 	struct mm_struct *mm = notifier->notifier.mm;
 	int ret;
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Ralph Campbell

If system memory is migrated to device private memory and no GPU MMU page table entry exists, the GPU will fault and call hmm_range_fault() to get the PFN for the page. Since the .dev_private_owner pointer in struct hmm_range is not set, hmm_range_fault returns an error which results in the GPU program stopping with a fatal fault.
Fix this by setting .dev_private_owner appropriately.

Quoted 7 lines
Fixes 08ddddda667b ("mm/hmm: check the device private page owner in hmm_range_fault()")

---

This is based on Linux-5.8.0-rc2 and is for Ben Skeggs nouveau tree. It doesn't depend on any of the other nouveau/HMM changes I have recently posted.

Makes sense to me

Jason

#2 lore raw
In reply to Ralph Campbell
Quoted 7 lines · Ralph Campbell

If system memory is migrated to device private memory and no GPU MMU page table entry exists, the GPU will fault and call hmm_range_fault() to get the PFN for the page. Since the .dev_private_owner pointer in struct hmm_range is not set, hmm_range_fault returns an error which results in the GPU program stopping with a fatal fault.
Fix this by setting .dev_private_owner appropriately.

Quoted 7 lines
Fixes 08ddddda667b ("mm/hmm: check the device private page owner in hmm_range_fault()")

---

This is based on Linux-5.8.0-rc2 and is for Ben Skeggs nouveau tree. It doesn't depend on any of the other nouveau/HMM changes I have recently posted.

Maybe cc stable, seeing as how the problem affect Linux 5.7?

thanks,

Signature · 2 lines
John Hubbard
NVIDIA
Quoted 17 lines
  drivers/gpu/drm/nouveau/nouveau_svm.c | 1 +
  1 file changed, 1 insertion(+)
drivers/gpu/drm/nouveau/nouveau_svm.c +1 -0
index ba9f9359c30e..6586d9d39874 100644
@@ -562,6 +562,7 @@ static int nouveau_range_fault(struct nouveau_svmm *svmm,
  		.end = notifier->notifier.interval_tree.last + 1,
  		.pfn_flags_mask = HMM_PFN_REQ_FAULT | HMM_PFN_REQ_WRITE,
  		.hmm_pfns = hmm_pfns,
+		.dev_private_owner = drm->dev,
  	};
  	struct mm_struct *mm = notifier->notifier.mm;
  	int ret;