bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

iomap: share iomap_unshare_iter predicate code with fsdax

Browse source 
[ Upstream commit 6ef6a0e821d3dad6bf8a5d5508762dba9042c84b ]

The predicate code that iomap_unshare_iter uses to decide if it's really
needs to unshare a file range mapping should be shared with the fsdax
version, because right now they're opencoded and inconsistent.

Note that we simplify the predicate logic a bit -- we no longer allow
unsharing of inline data mappings, but there aren't any filesystems that
allow shared inline data currently.

This is a fix in the sense that it should have been ported to fsdax.

Fixes: b53fdb215d13 ("iomap: improve shared block detection in iomap_unshare_iter")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/172796813294.1131942.15762084021076932620.stgit@frogsfrogsfrogs
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Stable-dep-of: 50793801fc7f ("fsdax: dax_unshare_iter needs to copy entire blocks")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Darrick J. Wong 2024-10-03 08:09:16 -07:00 • committed by Greg Kroah-Hartman
parent 3c06d13ec8
commit 451b0a27ca
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fs/dax.c
View file

@ -1268,8 +1268,7 @@ static s64 dax_unshare_iter(struct iomap_iter *iter)
s64 ret = 0; s64 ret = 0;
void *daddr = NULL, *saddr = NULL; void *daddr = NULL, *saddr = NULL;
/* don't bother with blocks that are not shared to start with */ if (!iomap_want_unshare_iter(iter))
if (!(iomap->flags & IOMAP_F_SHARED))
return length; return length;
id = dax_read_lock(); id = dax_read_lock();

30
fs/iomap/buffered-io.c
View file

@ -1270,19 +1270,12 @@ int iomap_file_buffered_write_punch_delalloc(struct inode *inode,
} }
EXPORT_SYMBOL_GPL(iomap_file_buffered_write_punch_delalloc); EXPORT_SYMBOL_GPL(iomap_file_buffered_write_punch_delalloc);
static loff_t iomap_unshare_iter(struct iomap_iter *iter) bool iomap_want_unshare_iter(const struct iomap_iter *iter)
{ {
struct iomap *iomap = &iter->iomap;
loff_t pos = iter->pos;
loff_t length = iomap_length(iter);
loff_t written = 0;
/* Don't bother with blocks that are not shared to start with. */
if (!(iomap->flags & IOMAP_F_SHARED))
return length;
/* /*
* Don't bother with delalloc reservations, holes or unwritten extents. * Don't bother with blocks that are not shared to start with; or
* mappings that cannot be shared, such as inline data, delalloc
* reservations, holes or unwritten extents.
* *
* Note that we use srcmap directly instead of iomap_iter_srcmap as * Note that we use srcmap directly instead of iomap_iter_srcmap as
* unsharing requires providing a separate source map, and the presence * unsharing requires providing a separate source map, and the presence
@ -1290,9 +1283,18 @@ static loff_t iomap_unshare_iter(struct iomap_iter *iter)
* IOMAP_F_SHARED which can be set for any data that goes into the COW * IOMAP_F_SHARED which can be set for any data that goes into the COW
* fork for XFS. * fork for XFS.
*/ */
if (iter->srcmap.type == IOMAP_HOLE || return (iter->iomap.flags & IOMAP_F_SHARED) &&
iter->srcmap.type == IOMAP_DELALLOC || iter->srcmap.type == IOMAP_MAPPED;
iter->srcmap.type == IOMAP_UNWRITTEN) }
static loff_t iomap_unshare_iter(struct iomap_iter *iter)
{
struct iomap *iomap = &iter->iomap;
loff_t pos = iter->pos;
loff_t length = iomap_length(iter);
loff_t written = 0;
if (!iomap_want_unshare_iter(iter))
return length; return length;
do { do {

1
include/linux/iomap.h
View file

@ -271,6 +271,7 @@ void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len);
bool iomap_dirty_folio(struct address_space *mapping, struct folio *folio); bool iomap_dirty_folio(struct address_space *mapping, struct folio *folio);
int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,
const struct iomap_ops *ops); const struct iomap_ops *ops);
bool iomap_want_unshare_iter(const struct iomap_iter *iter);
int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,
bool *did_zero, const struct iomap_ops *ops); bool *did_zero, const struct iomap_ops *ops);
int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero, int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,