leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dax: Flush partial PMDs correctly

Browse Source 
The radix tree would rewind the index in an iterator to the lowest index
of a multi-slot entry.  The XArray iterators instead leave the index
unchanged, but I overlooked that when converting DAX from the radix tree
to the XArray.  Adjust the index that we use for flushing to the start
of the PMD range.

Fixes: c1901cd33c ("page cache: Convert find_get_entries_tag to XArray")
Cc: <stable@vger.kernel.org>
Reported-by: Piotr Balcer <piotr.balcer@intel.com>
Tested-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Matthew Wilcox 2019-03-01 11:12:41 -08:00 committed by Dan Williams
parent 0cefc36b32
commit e4b3448bc3
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/dax.c
View File

@ -843,9 +843,8 @@ unlock_pte:
static int dax_writeback_one(struct xa_state *xas, struct dax_device *dax_dev, static int dax_writeback_one(struct xa_state *xas, struct dax_device *dax_dev,
struct address_space *mapping, void *entry) struct address_space *mapping, void *entry)
{ {
unsigned long pfn; unsigned long pfn, index, count;
long ret = 0; long ret = 0;
size_t size;
/* /*
* A page got tagged dirty in DAX mapping? Something is seriously * A page got tagged dirty in DAX mapping? Something is seriously
@ -894,17 +893,18 @@ static int dax_writeback_one(struct xa_state *xas, struct dax_device *dax_dev,
xas_unlock_irq(xas); xas_unlock_irq(xas);
/* /*
* Even if dax_writeback_mapping_range() was given a wbc->range_start * If dax_writeback_mapping_range() was given a wbc->range_start
* in the middle of a PMD, the 'index' we are given will be aligned to * in the middle of a PMD, the 'index' we use needs to be
* the start index of the PMD, as will the pfn we pull from 'entry'. * aligned to the start of the PMD.
* This allows us to flush for PMD_SIZE and not have to worry about * This allows us to flush for PMD_SIZE and not have to worry about
* partial PMD writebacks. * partial PMD writebacks.
*/ */
pfn = dax_to_pfn(entry); pfn = dax_to_pfn(entry);
size = PAGE_SIZE << dax_entry_order(entry); count = 1UL << dax_entry_order(entry);
index = xas->xa_index & ~(count - 1);
dax_entry_mkclean(mapping, xas->xa_index, pfn); dax_entry_mkclean(mapping, index, pfn);
dax_flush(dax_dev, page_address(pfn_to_page(pfn)), size); dax_flush(dax_dev, page_address(pfn_to_page(pfn)), count * PAGE_SIZE);
/* /*
* After we have flushed the cache, we can clear the dirty tag. There * After we have flushed the cache, we can clear the dirty tag. There
* cannot be new dirty data in the pfn after the flush has completed as * cannot be new dirty data in the pfn after the flush has completed as
@ -917,8 +917,7 @@ static int dax_writeback_one(struct xa_state *xas, struct dax_device *dax_dev,
xas_clear_mark(xas, PAGECACHE_TAG_DIRTY); xas_clear_mark(xas, PAGECACHE_TAG_DIRTY);
dax_wake_entry(xas, entry, false); dax_wake_entry(xas, entry, false);
trace_dax_writeback_one(mapping->host, xas->xa_index, trace_dax_writeback_one(mapping->host, index, count);
size >> PAGE_SHIFT);
return ret; return ret;
put_unlocked: put_unlocked: