From: Eric Biggers <ebiggers@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-api@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Keith Busch <kbusch@kernel.org> Subject: [RFC PATCH v2 3/7] ext4: support STATX_IOALIGN Date: Wed, 18 May 2022 16:50:07 -0700 [thread overview] Message-ID: <20220518235011.153058-4-ebiggers@kernel.org> (raw) In-Reply-To: <20220518235011.153058-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> Add support for STATX_IOALIGN to ext4, so that I/O alignment information is exposed to userspace in a consistent and easy-to-use way. Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/ext4/ext4.h | 1 + fs/ext4/file.c | 15 ++++----------- fs/ext4/inode.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index a743b1e3b89ec..7c43428901632 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3020,6 +3020,7 @@ extern struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, extern int ext4_write_inode(struct inode *, struct writeback_control *); extern int ext4_setattr(struct user_namespace *, struct dentry *, struct iattr *); +extern u32 ext4_dio_alignment(struct inode *inode); extern int ext4_getattr(struct user_namespace *, const struct path *, struct kstat *, u32, unsigned int); extern void ext4_evict_inode(struct inode *); diff --git a/fs/ext4/file.c b/fs/ext4/file.c index de153b508b20a..ba2271e5287b2 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -39,19 +39,12 @@ static bool ext4_dio_supported(struct kiocb *iocb, struct iov_iter *iter) { struct inode *inode = file_inode(iocb->ki_filp); + u32 dio_align = ext4_dio_alignment(inode); - if (IS_ENCRYPTED(inode)) { - if (!fscrypt_dio_supported(inode)) - return false; - if (!IS_ALIGNED(iocb->ki_pos | iov_iter_alignment(iter), - i_blocksize(inode))) - return false; - } - if (fsverity_active(inode)) - return false; - if (ext4_should_journal_data(inode)) + if (!dio_align) return false; - if (ext4_has_inline_data(inode)) + if (dio_align > bdev_logical_block_size(inode->i_sb->s_bdev) && + !IS_ALIGNED(iocb->ki_pos | iov_iter_alignment(iter), dio_align)) return false; return true; } diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 646ece9b3455f..5af2598aa170d 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5533,6 +5533,22 @@ int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, return error; } +u32 ext4_dio_alignment(struct inode *inode) +{ + if (fsverity_active(inode)) + return 0; + if (ext4_should_journal_data(inode)) + return 0; + if (ext4_has_inline_data(inode)) + return 0; + if (IS_ENCRYPTED(inode)) { + if (!fscrypt_dio_supported(inode)) + return 0; + return i_blocksize(inode); + } + return bdev_logical_block_size(inode->i_sb->s_bdev); +} + int ext4_getattr(struct user_namespace *mnt_userns, const struct path *path, struct kstat *stat, u32 request_mask, unsigned int query_flags) { @@ -5548,6 +5564,21 @@ int ext4_getattr(struct user_namespace *mnt_userns, const struct path *path, stat->btime.tv_nsec = ei->i_crtime.tv_nsec; } + /* + * Return the I/O alignment information if requested. We only return + * this information when requested, since on encrypted files it might + * take a fair bit of work to get if the file wasn't opened recently. + */ + if ((request_mask & STATX_IOALIGN) && S_ISREG(inode->i_mode)) { + u32 dio_align = ext4_dio_alignment(inode); + unsigned int io_opt = bdev_io_opt(inode->i_sb->s_bdev); + + stat->result_mask |= STATX_IOALIGN; + stat->mem_align_dio = dio_align; + stat->offset_align_dio = dio_align; + stat->offset_align_optimal = max(io_opt, i_blocksize(inode)); + } + flags = ei->i_flags & EXT4_FL_USER_VISIBLE; if (flags & EXT4_APPEND_FL) stat->attributes |= STATX_ATTR_APPEND; -- 2.36.1
WARNING: multiple messages have this Message-ID (diff)
From: Eric Biggers <ebiggers@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: linux-block@vger.kernel.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-fscrypt@vger.kernel.org, Keith Busch <kbusch@kernel.org>, linux-ext4@vger.kernel.org Subject: [f2fs-dev] [RFC PATCH v2 3/7] ext4: support STATX_IOALIGN Date: Wed, 18 May 2022 16:50:07 -0700 [thread overview] Message-ID: <20220518235011.153058-4-ebiggers@kernel.org> (raw) In-Reply-To: <20220518235011.153058-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> Add support for STATX_IOALIGN to ext4, so that I/O alignment information is exposed to userspace in a consistent and easy-to-use way. Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/ext4/ext4.h | 1 + fs/ext4/file.c | 15 ++++----------- fs/ext4/inode.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index a743b1e3b89ec..7c43428901632 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3020,6 +3020,7 @@ extern struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, extern int ext4_write_inode(struct inode *, struct writeback_control *); extern int ext4_setattr(struct user_namespace *, struct dentry *, struct iattr *); +extern u32 ext4_dio_alignment(struct inode *inode); extern int ext4_getattr(struct user_namespace *, const struct path *, struct kstat *, u32, unsigned int); extern void ext4_evict_inode(struct inode *); diff --git a/fs/ext4/file.c b/fs/ext4/file.c index de153b508b20a..ba2271e5287b2 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -39,19 +39,12 @@ static bool ext4_dio_supported(struct kiocb *iocb, struct iov_iter *iter) { struct inode *inode = file_inode(iocb->ki_filp); + u32 dio_align = ext4_dio_alignment(inode); - if (IS_ENCRYPTED(inode)) { - if (!fscrypt_dio_supported(inode)) - return false; - if (!IS_ALIGNED(iocb->ki_pos | iov_iter_alignment(iter), - i_blocksize(inode))) - return false; - } - if (fsverity_active(inode)) - return false; - if (ext4_should_journal_data(inode)) + if (!dio_align) return false; - if (ext4_has_inline_data(inode)) + if (dio_align > bdev_logical_block_size(inode->i_sb->s_bdev) && + !IS_ALIGNED(iocb->ki_pos | iov_iter_alignment(iter), dio_align)) return false; return true; } diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 646ece9b3455f..5af2598aa170d 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5533,6 +5533,22 @@ int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, return error; } +u32 ext4_dio_alignment(struct inode *inode) +{ + if (fsverity_active(inode)) + return 0; + if (ext4_should_journal_data(inode)) + return 0; + if (ext4_has_inline_data(inode)) + return 0; + if (IS_ENCRYPTED(inode)) { + if (!fscrypt_dio_supported(inode)) + return 0; + return i_blocksize(inode); + } + return bdev_logical_block_size(inode->i_sb->s_bdev); +} + int ext4_getattr(struct user_namespace *mnt_userns, const struct path *path, struct kstat *stat, u32 request_mask, unsigned int query_flags) { @@ -5548,6 +5564,21 @@ int ext4_getattr(struct user_namespace *mnt_userns, const struct path *path, stat->btime.tv_nsec = ei->i_crtime.tv_nsec; } + /* + * Return the I/O alignment information if requested. We only return + * this information when requested, since on encrypted files it might + * take a fair bit of work to get if the file wasn't opened recently. + */ + if ((request_mask & STATX_IOALIGN) && S_ISREG(inode->i_mode)) { + u32 dio_align = ext4_dio_alignment(inode); + unsigned int io_opt = bdev_io_opt(inode->i_sb->s_bdev); + + stat->result_mask |= STATX_IOALIGN; + stat->mem_align_dio = dio_align; + stat->offset_align_dio = dio_align; + stat->offset_align_optimal = max(io_opt, i_blocksize(inode)); + } + flags = ei->i_flags & EXT4_FL_USER_VISIBLE; if (flags & EXT4_APPEND_FL) stat->attributes |= STATX_ATTR_APPEND; -- 2.36.1 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2022-05-18 23:53 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-18 23:50 [RFC PATCH v2 0/7] make statx() return I/O alignment information Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-18 23:50 ` [RFC PATCH v2 1/7] statx: add " Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-19 7:05 ` Christoph Hellwig 2022-05-19 7:05 ` [f2fs-dev] " Christoph Hellwig 2022-05-19 23:06 ` Darrick J. Wong 2022-05-19 23:06 ` [f2fs-dev] " Darrick J. Wong 2022-05-20 3:27 ` Dave Chinner 2022-05-20 3:27 ` [f2fs-dev] " Dave Chinner 2022-06-14 5:25 ` Eric Biggers 2022-06-14 5:25 ` [f2fs-dev] " Eric Biggers 2022-06-15 13:12 ` Christoph Hellwig 2022-06-15 13:12 ` [f2fs-dev] " Christoph Hellwig 2022-06-16 0:04 ` Eric Biggers 2022-06-16 0:04 ` [f2fs-dev] " Eric Biggers 2022-06-16 6:07 ` Christoph Hellwig 2022-06-16 6:07 ` [f2fs-dev] " Christoph Hellwig 2022-06-16 6:19 ` Eric Biggers 2022-06-16 6:19 ` [f2fs-dev] " Eric Biggers 2022-06-16 6:29 ` Christoph Hellwig 2022-06-16 6:29 ` [f2fs-dev] " Christoph Hellwig 2022-05-20 6:30 ` Eric Biggers 2022-05-20 6:30 ` [f2fs-dev] " Eric Biggers 2022-05-20 11:52 ` Christian Brauner 2022-05-20 11:52 ` [f2fs-dev] " Christian Brauner 2022-05-27 9:02 ` Florian Weimer 2022-05-27 9:02 ` Florian Weimer 2022-05-27 16:22 ` Darrick J. Wong 2022-05-27 16:22 ` [f2fs-dev] " Darrick J. Wong 2022-05-18 23:50 ` [RFC PATCH v2 2/7] fscrypt: change fscrypt_dio_supported() to prepare for STATX_IOALIGN Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-18 23:50 ` Eric Biggers [this message] 2022-05-18 23:50 ` [f2fs-dev] [RFC PATCH v2 3/7] ext4: support STATX_IOALIGN Eric Biggers 2022-05-18 23:50 ` [RFC PATCH v2 4/7] f2fs: move f2fs_force_buffered_io() into file.c Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-18 23:50 ` [RFC PATCH v2 5/7] f2fs: don't allow DIO reads but not DIO writes Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-18 23:50 ` [RFC PATCH v2 6/7] f2fs: simplify f2fs_force_buffered_io() Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-18 23:50 ` [RFC PATCH v2 7/7] f2fs: support STATX_IOALIGN Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220518235011.153058-4-ebiggers@kernel.org \ --to=ebiggers@kernel.org \ --cc=kbusch@kernel.org \ --cc=linux-api@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fscrypt@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.