redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

filesystem-dax for 5.1 

* Fix handling of PMD-sized entries in the Xarray that lead to a crash
   scenario.
 
 * Miscellaneous cleanups and small fixes
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJciDrAAAoJEB7SkWpmfYgCv2MQAMAnZ/FQ6HsVeqTp+/pZ3PTo
 APLU8+sL35/7cxeEysy5+CIWMlUQ1nyt6NhDeCfCVKeYbW7A4HWmm1dbptMRzCMd
 suSGGraw60oQb02iKxUdRB3NTA2voU0gHJKdmCjUljk5FwGHGYFcGXJwrRzYku9z
 ZqL15cGzfbBwA+5C50ZxDcgk/MQ+lqcHoSLCq8rJyLm/Tf81xszCMIAZylAuyH5N
 Li4jDlNABJh9EGB/WmQU0I61IyVYrTTVGHvDH3X2HAqkwpvroYBkRXhPcyqkntx2
 jtv6OP9sU0k4bej2purGoatfVGZH84AUy9NRIFBG/SNvMxdb1ZfgSu3pccan92ar
 t0cfWPSVl4nJJj8lLKiNDNruPJ+QU1IWOV+qaGp5J2ygePVgWifFfJxTDgVYTCrl
 PY+Ijl3VClZvj0CQsNiaxvikYKWSyAClODua81sEgmd9JrpYzYBYe+xcxW0Zqv+z
 adc5etbeAsponUVZRc2rgyCAD4Y97Ajbea07Oni6ZIaW0NMtvoY3qxI1Jbzp9VTi
 E8y5NWKuaqOAGIBL1hy6WnD+33OqAW26Dbpa2xE7XarzRObzwK9JRuYF/Lr0xUMj
 xXnYfHAJzU+vcunCZoXTYzrVv8i1FxJYvdOc1GbnkNUizAgFvhdpC2rqWH6bnTrl
 1i1XOxR1M8wWocG8Hjac
 =HwZT
 -----END PGP SIGNATURE-----

Merge tag 'fsdax-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull filesystem-dax updates from Dan Williams:

 - Fix handling of PMD-sized entries in the Xarray that lead to a crash
   scenario

 - Miscellaneous cleanups and small fixes

* tag 'fsdax-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dax: Flush partial PMDs correctly
  fs/dax: NIT fix comment regarding start/end vs range
  fs/dax: Convert to use vmf_error()
hifive-unleashed-5.1
Linus Torvalds 2019-03-13 09:37:09 -07:00
parent a840b56ba3 e4b3448bc3
commit 3bb0f28d84
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fs/dax.c
View File

@ -788,7 +788,7 @@ static void dax_entry_mkclean(struct address_space *mapping, pgoff_t index,
address = pgoff_address(index, vma); address = pgoff_address(index, vma);
/* /*
* Note because we provide start/end to follow_pte_pmd it will * Note because we provide range to follow_pte_pmd it will
* call mmu_notifier_invalidate_range_start() on our behalf * call mmu_notifier_invalidate_range_start() on our behalf
* before taking any lock. * before taking any lock.
*/ */
@ -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:
@ -1220,9 +1219,7 @@ static vm_fault_t dax_fault_return(int error)
{ {
if (error == 0) if (error == 0)
return VM_FAULT_NOPAGE; return VM_FAULT_NOPAGE;
if (error == -ENOMEM) return vmf_error(error);
return VM_FAULT_OOM;
return VM_FAULT_SIGBUS;
} }
/* /*