Commit e6fa3963 authored by Alistair Popple's avatar Alistair Popple Committed by Andrew Morton
Browse files

fs/dax: refactor wait for dax idle page 

A FS DAX page is considered idle when its refcount drops to one.  This is
currently open-coded in all file systems supporting FS DAX.  Move the idle
detection to a common function to make future changes easier.

Link: https://lkml.kernel.org/r/c2c9d269110b90224eeb1dc661ffbc1d82aa20c9.1740713401.git-series.apopple@nvidia.com


Signed-off-by: default avatarAlistair Popple <apopple@nvidia.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarTheodore Ts'o <tytso@mit.edu>
Tested-by: default avatarAlison Schofield <alison.schofield@intel.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Asahi Lina <lina@asahilina.net>
Cc: Balbir Singh <balbirs@nvidia.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Chunyan Zhang <zhang.lyra@gmail.com>
Cc: "Darrick J. Wong" <djwong@kernel.org>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: linmiaohe <linmiaohe@huawei.com>
Cc: Logan Gunthorpe <logang@deltatee.com>
Cc: Matthew Wilcow (Oracle) <willy@infradead.org>
Cc: Michael "Camp Drill Sergeant" Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 6be3e21d

fs/ext4/inode.c

+1 −4
Original line number Diff line number Diff line
@@ -3922,10 +3922,7 @@ int ext4_break_layouts(struct inode *inode) 
		if (!page)

			return 0;



		error = ___wait_var_event(&page->_refcount,

				atomic_read(&page->_refcount) == 1,

				TASK_INTERRUPTIBLE, 0, 0,

				ext4_wait_dax_page(inode));

		error = dax_wait_page_idle(page, ext4_wait_dax_page, inode);

	} while (error == 0);



	return error;

fs/fuse/dax.c

+1 −3
Original line number Diff line number Diff line
@@ -677,9 +677,7 @@ static int __fuse_dax_break_layouts(struct inode *inode, bool *retry, 
		return 0;



	*retry = true;

	return ___wait_var_event(&page->_refcount,

			atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE,

			0, 0, fuse_wait_dax_page(inode));

	return dax_wait_page_idle(page, fuse_wait_dax_page, inode);

}



int fuse_dax_break_layouts(struct inode *inode, u64 dmap_start,

fs/xfs/xfs_inode.c

+1 −3
Original line number Diff line number Diff line
@@ -3020,9 +3020,7 @@ xfs_break_dax_layouts( 
		return 0;



	*retry = true;

	return ___wait_var_event(&page->_refcount,

			atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE,

			0, 0, xfs_wait_dax_page(inode));

	return dax_wait_page_idle(page, xfs_wait_dax_page, inode);

}



int

include/linux/dax.h

+8 −0
Original line number Diff line number Diff line
@@ -207,6 +207,14 @@ int dax_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero, 
int dax_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,

		const struct iomap_ops *ops);



static inline int dax_wait_page_idle(struct page *page,

				void (cb)(struct inode *),

				struct inode *inode)

{

	return ___wait_var_event(page, page_ref_count(page) == 1,

				TASK_INTERRUPTIBLE, 0, 0, cb(inode));

}



#if IS_ENABLED(CONFIG_DAX)

int dax_read_lock(void);

void dax_read_unlock(int id);