Skip to content

Commit cac190c

Browse files
CFSworksidryomov
authored andcommitted
ceph: fix write storm on fscrypted files
CephFS stores file data across multiple RADOS objects. An object is the atomic unit of storage, so the writeback code must clean only folios that belong to the same object with each OSD request. CephFS also supports RAID0-style striping of file contents: if enabled, each object stores multiple unbroken "stripe units" covering different portions of the file; if disabled, a "stripe unit" is simply the whole object. The stripe unit is (usually) reported as the inode's block size. Though the writeback logic could, in principle, lock all dirty folios belonging to the same object, its current design is to lock only a single stripe unit at a time. Ever since this code was first written, it has determined this size by checking the inode's block size. However, the relatively-new fscrypt support needed to reduce the block size for encrypted inodes to the crypto block size (see 'fixes' commit), which causes an unnecessarily high number of write operations (~1024x as many, with 4MiB objects) and correspondingly degraded performance. Fix this (and clarify intent) by using i_layout.stripe_unit directly in ceph_define_write_size() so that encrypted inodes are written back with the same number of operations as if they were unencrypted. This patch depends on the preceding commit ("ceph: do not propagate page array emplacement errors as batch errors") for correctness. While it applies cleanly on its own, applying it alone will introduce a regression. This dependency is only relevant for kernels where ce80b76 ("ceph: introduce ceph_process_folio_batch() method") has been applied; stable kernels without that commit are unaffected. Cc: stable@vger.kernel.org Fixes: 94af047 ("ceph: add some fscrypt guardrails") Signed-off-by: Sam Edwards <CFSworks@gmail.com> Reviewed-by: Ilya Dryomov <idryomov@gmail.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
1 parent 7071046 commit cac190c

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

fs/ceph/addr.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,8 @@ unsigned int ceph_define_write_size(struct address_space *mapping)
10001000
{
10011001
struct inode *inode = mapping->host;
10021002
struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);
1003-
unsigned int wsize = i_blocksize(inode);
1003+
struct ceph_inode_info *ci = ceph_inode(inode);
1004+
unsigned int wsize = ci->i_layout.stripe_unit;
10041005

10051006
if (fsc->mount_options->wsize < wsize)
10061007
wsize = fsc->mount_options->wsize;

0 commit comments

Comments
 (0)