2024-03-11 23:59:33

by Daeho Jeong

[permalink] [raw]
Subject: [PATCH 1/2] f2fs: prevent atomic write on pinned file

From: Daeho Jeong <[email protected]>

Since atomic write way was changed to out-place-update, we should
prevent it on pinned files.

Signed-off-by: Daeho Jeong <[email protected]>
---
fs/f2fs/file.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 1c044fb19c87..82277e95c88f 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -2085,7 +2085,8 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)

inode_lock(inode);

- if (!f2fs_disable_compressed_file(inode)) {
+ if (!f2fs_disable_compressed_file(inode) ||
+ f2fs_is_pinned_file(inode)) {
ret = -EINVAL;
goto out;
}
--
2.44.0.278.ge034bb2e1d-goog



2024-03-11 23:59:44

by Daeho Jeong

[permalink] [raw]
Subject: [PATCH 2/2] f2fs: prevent writing without fallocate() for pinned files

From: Daeho Jeong <[email protected]>

In a case writing without fallocate(), we can't guarantee it's allocated
in the conventional area for zoned stroage.

Signed-off-by: Daeho Jeong <[email protected]>
---
fs/f2fs/data.c | 7 +++++++
fs/f2fs/file.c | 4 ++++
2 files changed, 11 insertions(+)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index c21b92f18463..5e4c11a719a0 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3378,6 +3378,8 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,
f2fs_map_lock(sbi, flag);
locked = true;
} else if ((pos & PAGE_MASK) >= i_size_read(inode)) {
+ if (f2fs_is_pinned_file(inode))
+ return -EIO;
f2fs_map_lock(sbi, flag);
locked = true;
}
@@ -3407,6 +3409,11 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,

if (!f2fs_lookup_read_extent_cache_block(inode, index,
&dn.data_blkaddr)) {
+ if (f2fs_is_pinned_file(inode)) {
+ err = -EIO;
+ goto out;
+ }
+
if (locked) {
err = f2fs_reserve_block(&dn, index);
goto out;
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 82277e95c88f..f98730932fc4 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -4611,6 +4611,10 @@ static int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *iter,
return ret;
}

+ /* For pinned files, it should be fallocate()-ed in advance. */
+ if (f2fs_is_pinned_file(inode))
+ return 0;
+
/* Do not preallocate blocks that will be written partially in 4KB. */
map.m_lblk = F2FS_BLK_ALIGN(pos);
map.m_len = F2FS_BYTES_TO_BLK(pos + count);
--
2.44.0.278.ge034bb2e1d-goog


2024-03-12 01:43:49

by Chao Yu

[permalink] [raw]
Subject: Re: [f2fs-dev] [PATCH 1/2] f2fs: prevent atomic write on pinned file

On 2024/3/12 7:59, Daeho Jeong wrote:
> From: Daeho Jeong <[email protected]>
>
> Since atomic write way was changed to out-place-update, we should
> prevent it on pinned files.
>
> Signed-off-by: Daeho Jeong <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

Thanks,

2024-03-12 01:50:55

by Chao Yu

[permalink] [raw]
Subject: Re: [f2fs-dev] [PATCH 2/2] f2fs: prevent writing without fallocate() for pinned files

On 2024/3/12 7:59, Daeho Jeong wrote:
> From: Daeho Jeong <[email protected]>
>
> In a case writing without fallocate(), we can't guarantee it's allocated
> in the conventional area for zoned stroage.
>
> Signed-off-by: Daeho Jeong <[email protected]>
> ---
> fs/f2fs/data.c | 7 +++++++
> fs/f2fs/file.c | 4 ++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index c21b92f18463..5e4c11a719a0 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -3378,6 +3378,8 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,
> f2fs_map_lock(sbi, flag);
> locked = true;
> } else if ((pos & PAGE_MASK) >= i_size_read(inode)) {
> + if (f2fs_is_pinned_file(inode))
> + return -EIO;
> f2fs_map_lock(sbi, flag);
> locked = true;
> }
> @@ -3407,6 +3409,11 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,
>
> if (!f2fs_lookup_read_extent_cache_block(inode, index,
> &dn.data_blkaddr)) {
> + if (f2fs_is_pinned_file(inode)) {
> + err = -EIO;
> + goto out;
> + }

Daeho,

Do we need to check in DIO path as well?

Thanks,

> +
> if (locked) {
> err = f2fs_reserve_block(&dn, index);
> goto out;
> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
> index 82277e95c88f..f98730932fc4 100644
> --- a/fs/f2fs/file.c
> +++ b/fs/f2fs/file.c
> @@ -4611,6 +4611,10 @@ static int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *iter,
> return ret;
> }
>
> + /* For pinned files, it should be fallocate()-ed in advance. */
> + if (f2fs_is_pinned_file(inode))
> + return 0;
> +
> /* Do not preallocate blocks that will be written partially in 4KB. */
> map.m_lblk = F2FS_BLK_ALIGN(pos);
> map.m_len = F2FS_BYTES_TO_BLK(pos + count);

2024-03-13 01:31:01

by patchwork-bot+f2fs

[permalink] [raw]
Subject: Re: [f2fs-dev] [PATCH 1/2] f2fs: prevent atomic write on pinned file

Hello:

This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:

On Mon, 11 Mar 2024 16:59:19 -0700 you wrote:
> From: Daeho Jeong <[email protected]>
>
> Since atomic write way was changed to out-place-update, we should
> prevent it on pinned files.
>
> Signed-off-by: Daeho Jeong <[email protected]>
>
> [...]

Here is the summary with links:
- [f2fs-dev,1/2] f2fs: prevent atomic write on pinned file
https://git.kernel.org/jaegeuk/f2fs/c/c644af133283
- [f2fs-dev,2/2] f2fs: prevent writing without fallocate() for pinned files
(no matching commit)

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html