Commit 40550627 authored by Jason Gunthorpe's avatar Jason Gunthorpe

mm/hmm: add missing call to hmm_pte_need_fault in HMM_PFN_SPECIAL handling

Currently if a special PTE is encountered hmm_range_fault() immediately
returns EFAULT and sets the HMM_PFN_SPECIAL error output (which nothing
uses).

EFAULT should only be returned after testing with hmm_pte_need_fault().

Also pte_devmap() and pte_special() are exclusive, and there is no need to
check IS_ENABLED, pte_special() is stubbed out to return false on
unsupported architectures.

Fixes: 992de9a8 ("mm/hmm: allow to mirror vma of a file on a DAX backed filesystem")
Reviewed-by: default avatarRalph Campbell <rcampbell@nvidia.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 2288a9a6
...@@ -339,16 +339,21 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, unsigned long addr, ...@@ -339,16 +339,21 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, unsigned long addr,
pte_unmap(ptep); pte_unmap(ptep);
return -EBUSY; return -EBUSY;
} }
} else if (IS_ENABLED(CONFIG_ARCH_HAS_PTE_SPECIAL) && pte_special(pte)) {
if (!is_zero_pfn(pte_pfn(pte))) {
pte_unmap(ptep);
*pfn = range->values[HMM_PFN_SPECIAL];
return -EFAULT;
} }
/* /*
* Since each architecture defines a struct page for the zero * Since each architecture defines a struct page for the zero page, just
* page, just fall through and treat it like a normal page. * fall through and treat it like a normal page.
*/ */
if (pte_special(pte) && !is_zero_pfn(pte_pfn(pte))) {
hmm_pte_need_fault(hmm_vma_walk, orig_pfn, 0, &fault,
&write_fault);
if (fault || write_fault) {
pte_unmap(ptep);
return -EFAULT;
}
*pfn = range->values[HMM_PFN_SPECIAL];
return 0;
} }
*pfn = hmm_device_entry_from_pfn(range, pte_pfn(pte)) | cpu_flags; *pfn = hmm_device_entry_from_pfn(range, pte_pfn(pte)) | cpu_flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment