On Tue 22-05-18 07:39:47, Dan Williams wrote:
> In support of enabling memory_failure() handling for device-dax
> mappings, set the ->mapping association of pages backing device-dax
> mappings. The rmap implementation requires page_mapping() to return the
> address_space hosting the vmas that map the page.
>
> The ->mapping pointer is never cleared. There is no possibility for the
> page to become associated with another address_space while the device is
> enabled. When the device is disabled the 'struct page' array for the
> device is destroyed / later reinitialized to zero.
>
> Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
...
> @@ -402,17 +401,33 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf,
> id = dax_read_lock();
> switch (pe_size) {
> case PE_SIZE_PTE:
> - rc = __dev_dax_pte_fault(dev_dax, vmf);
> + fault_size = PAGE_SIZE;
> + rc = __dev_dax_pte_fault(dev_dax, vmf, &pfn);
> break;
> case PE_SIZE_PMD:
> - rc = __dev_dax_pmd_fault(dev_dax, vmf);
> + fault_size = PMD_SIZE;
> + rc = __dev_dax_pmd_fault(dev_dax, vmf, &pfn);
> break;
> case PE_SIZE_PUD:
> - rc = __dev_dax_pud_fault(dev_dax, vmf);
> + fault_size = PUD_SIZE;
> + rc = __dev_dax_pud_fault(dev_dax, vmf, &pfn);
> break;
> default:
> rc = VM_FAULT_SIGBUS;
> }
> +
> + if (rc == VM_FAULT_NOPAGE) {
> + unsigned long i;
> +
> + for (i = 0; i < fault_size / PAGE_SIZE; i++) {
> + struct page *page;
> +
> + page = pfn_to_page(pfn_t_to_pfn(pfn) + i);
> + if (page->mapping)
> + continue;
> + page->mapping = filp->f_mapping;
> + }
> + }
> dax_read_unlock(id);
Careful here. Page fault can return VM_FAULT_NOPAGE even if we raced with
somebody modifying the PTE or if we installed a zero page. With shared DAX
mappings (and device dax does not allow anything else if I'm right) this
does not matter as given file offset is guaranteed to always map to the
same page but I think it deserves a comment.
Honza
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
