diff options
| author | Ralph Campbell <rcampbell@nvidia.com> | 2020-06-26 14:03:37 -0700 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-07-08 13:30:42 +1000 |
| commit | ed710a6ed797430026aa5116dd0ab22378798b69 (patch) | |
| tree | b70cc42bd6032679c783ad7bad0bc6244a1d1ba3 | |
| parent | ad61f5f5e02e0aaf667efcd0c44ba5d70ea0b356 (diff) | |
| download | linux-ed710a6ed797430026aa5116dd0ab22378798b69.tar.gz linux-ed710a6ed797430026aa5116dd0ab22378798b69.tar.bz2 linux-ed710a6ed797430026aa5116dd0ab22378798b69.zip | |
drm/nouveau/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()")
Cc: stable@vger.kernel.org
Signed-off-by: Ralph Campbell <rcampbell@nvidia.com>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_svm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c index ba9f9359c30e..6586d9d39874 100644 --- a/drivers/gpu/drm/nouveau/nouveau_svm.c +++ b/drivers/gpu/drm/nouveau/nouveau_svm.c @@ -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; |