|
@@ -592,7 +592,7 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address,
|
|
sector_t block;
|
|
sector_t block;
|
|
int result = 0;
|
|
int result = 0;
|
|
|
|
|
|
- /* dax pmd mappings are broken wrt gup and fork */
|
|
|
|
|
|
+ /* dax pmd mappings require pfn_t_devmap() */
|
|
if (!IS_ENABLED(CONFIG_FS_DAX_PMD))
|
|
if (!IS_ENABLED(CONFIG_FS_DAX_PMD))
|
|
return VM_FAULT_FALLBACK;
|
|
return VM_FAULT_FALLBACK;
|
|
|
|
|
|
@@ -717,11 +717,7 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address,
|
|
goto fallback;
|
|
goto fallback;
|
|
}
|
|
}
|
|
|
|
|
|
- /*
|
|
|
|
- * TODO: teach vmf_insert_pfn_pmd() to support
|
|
|
|
- * 'pte_special' for pmds
|
|
|
|
- */
|
|
|
|
- if (pfn_t_has_page(dax.pfn)) {
|
|
|
|
|
|
+ if (!pfn_t_devmap(dax.pfn)) {
|
|
dax_unmap_atomic(bdev, &dax);
|
|
dax_unmap_atomic(bdev, &dax);
|
|
dax_pmd_dbg(&bh, address, "pfn not in memmap");
|
|
dax_pmd_dbg(&bh, address, "pfn not in memmap");
|
|
goto fallback;
|
|
goto fallback;
|