Skip to contentSkip to conversation

fs/iomap.c: get/put the page in iomap_page_create/release()

PATCH New [email protected] 1 participant 1 message Dec 14, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 8/11 fs/iomap.c: get/put the page in iomap_page_create/release()

From: Piotr Jaroszynski <[email protected]>
Subject: fs/iomap.c: get/put the page in iomap_page_create/release()

migrate_page_move_mapping() expects pages with private data set to have a page_count elevated by 1. This is what used to happen for xfs through the buffer_heads code before the switch to iomap in commit 82cb14175e7d ("xfs:
add support for sub-pagesize writeback without buffer_heads"). Not having the count elevated causes move_pages() to fail on memory mapped files coming from xfs.

Make iomap compatible with the migrate_page_move_mapping() assumption by elevating the page count as part of iomap_page_create() and lowering it in iomap_page_release().

It causes the move_pages() syscall to misbehave on memory mapped files from xfs. It does not not move any pages, which I suppose is "just" a perf issue, but it also ends up returning a positive number which is out of spec for the syscall. Talking to Michal Hocko, it sounds like returning positive numbers might be a necessary update to move_pages() anyway though
(https://lkml.kernel.org/r/[email protected]).

I only hit this in tests that verify that move_pages() actually moved the pages. The test also got confused by the positive return from move_pages() (it got treated as a success as positive numbers were not expected and not handled) making it a bit harder to track down what's going on.

Fixes 82cb14175e7d ("xfs: add support for sub-pagesize writeback without buffer_heads")
Cc William Kucharski <[email protected]>
Cc Darrick J. Wong <[email protected]>
Cc Brian Foster <[email protected]>

---

 fs/iomap.c |    7 +++++++
 1 file changed, 7 insertions(+)
fs/iomap.c renamed from fs/iomap.c~iomap-get-put-the-page-in-iomap_page_create-release +7 -0
@@ -116,6 +116,12 @@ iomap_page_create(struct inode *inode, s
 	atomic_set(&iop->read_count, 0);
 	atomic_set(&iop->write_count, 0);
 	bitmap_zero(iop->uptodate, PAGE_SIZE / SECTOR_SIZE);
+
+	/*
+	 * migrate_page_move_mapping() assumes that pages with private data have
+	 * their count elevated by 1.
+	 */
+	get_page(page);
 	set_page_private(page, (unsigned long)iop);
 	SetPagePrivate(page);
 	return iop;
@@ -132,6 +138,7 @@ iomap_page_release(struct page *page)
 	WARN_ON_ONCE(atomic_read(&iop->write_count));
 	ClearPagePrivate(page);
 	set_page_private(page, 0);
+	put_page(page);
 	kfree(iop);
 }
 

_