diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2018-07-13 21:49:45 -0700 |
|---|---|---|
| committer | Dave Jiang <dave.jiang@intel.com> | 2018-07-20 11:20:44 -0700 |
| commit | 35de299547d1c3300e078f9f7c6eb01dadae47f9 (patch) | |
| tree | dd0cb081bd17cdab0c2e3f119d2fac2493423e83 /drivers/dax | |
| parent | 2232c6382a453db73d2e723df1b52030066e135e (diff) | |
| download | linux-35de299547d1c3300e078f9f7c6eb01dadae47f9.tar.bz2 | |
device-dax: Set page->index
In support of enabling memory_failure() handling for device-dax
mappings, set ->index to the pgoff of the page. The rmap implementation
requires ->index to bound the search through the vma interval tree.
The ->index value is never cleared. There is no possibility for the
page to become associated with another pgoff while the device is
enabled. When the device is disabled the 'struct page' array for the
device is destroyed and ->index is reinitialized to zero.
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Diffstat (limited to 'drivers/dax')
| -rw-r--r-- | drivers/dax/device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 95cfcfd612df..361a11089591 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -416,6 +416,7 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf, if (rc == VM_FAULT_NOPAGE) { unsigned long i; + pgoff_t pgoff; /* * In the device-dax case the only possibility for a @@ -423,6 +424,8 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf, * mapped. No need to consider the zero page, or racing * conflicting mappings. */ + pgoff = linear_page_index(vmf->vma, vmf->address + & ~(fault_size - 1)); for (i = 0; i < fault_size / PAGE_SIZE; i++) { struct page *page; @@ -430,6 +433,7 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf, if (page->mapping) continue; page->mapping = filp->f_mapping; + page->index = pgoff + i; } } dax_read_unlock(id); |