Skip to content

nilfs2: eliminate blockdev_direct_IO() call

Viacheslav Dubeyko linux-fsdevel linux-nilfs 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest2 patches 2 repliesIn review
  2. v22 patches 2 repliesSuperseded
  3. v12 patches 8 repliesApplied

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2nilfs2: add iomap operations for direct I/Ofs/nilfs2/Makefile fs/nilfs2/iomap.c fs/nilfs2/iomap.h+86 -11 reply
2/2nilfs2: switch O_DIRECT to iomap based operationsfs/nilfs2/Kconfig fs/nilfs2/file.c fs/nilfs2/inode.c+40 -171 reply

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by.

PatchRyusuke Konishi
1/2A-b
2/2A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 0/2] nilfs2: eliminate blockdev_direct_IO() call

The patchset eliminates blockdev_direct_IO() from nilfs2 entirely. It adds iomap.h with declaration of iomaps operations and iomap.c with implementation of nilfs_iomap_begin(). The nilfs_direct_IO() and the .direct_IO callback on nilfs_aops are removed. The nilfs_file_read_iter() dispatches O_DIRECT reads to iomap_dio_rw() using nilfs_iomap_ops. Everything else still goes through generic_file_read_iter(). The unnecessary "select LEGACY_DIRECT_IO" has been exchanged on "select FS_IOMAP" in Kconfig.

v2
The bug has been discovered in nilfs_iomap_begin() of patchset's first version thanks to Linmao Li.

nilfs_iomap_begin() looks up the filesystem block containing the requested offset and returns the physical address of that block. However, it sets iomap->offset to the original, possibly sub-block, offset while leaving iomap->addr at the start of the physical block.

iomap_sector() adds the difference between the I/O position and iomap->offset to iomap->addr. For an O_DIRECT read at offset 512 on a filesystem with 4 KiB blocks, the two file offsets are equal and the I/O is therefore submitted at the start of the physical block instead of 512 bytes into it. iomap direct I/O permits this alignment when the device logical block size is 512 bytes.

Describe mapped and hole extents from the filesystem-block-aligned file offset. This makes the physical and file offsets refer to the same byte. It also prevents a one-block hole mapping from extending into the following block.

v3
Ryusuke Konishi has found issues with generic/418 and generic/465 test-cases execution. Running xfstests generic/418 and generic/465 fail with a "broken bmap" error, causing the filesystem to remount read-only for the second version of the patchset. This happens because iomap_dio_rw() is called without holding the shared inode lock. Adding inode_lock_shared() for the case of calling iomap_dio_rw() in nilfs_file_read_iter() resolved the failures in both generic/418 and generic/465 test-cases.

Viacheslav Dubeyko (2):
nilfs2: add iomap operations for direct I/O
nilfs2: switch O_DIRECT to iomap based operations

 fs/nilfs2/Kconfig  |  2 +-
 fs/nilfs2/Makefile |  2 +-
 fs/nilfs2/file.c   | 42 +++++++++++++++++++++++++--
 fs/nilfs2/inode.c  | 13 ---------
 fs/nilfs2/iomap.c  | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 fs/nilfs2/iomap.h  | 13 +++++++++
 6 files changed, 126 insertions(+), 18 deletions(-)
 create mode 100644 fs/nilfs2/iomap.c
 create mode 100644 fs/nilfs2/iomap.h
Signature · 1 line
2.43.0