* [PATCH 4.19] f2fs: fix cgroup writeback accounting with fs-layer encryption
@ 2023-03-08 6:17 Eric Biggers
2023-03-10 12:57 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Eric Biggers @ 2023-03-08 6:17 UTC (permalink / raw)
To: stable
Cc: linux-f2fs-devel, linux-fscrypt, Matthew Wilcox (Oracle),
Tejun Heo, Chao Yu, Jaegeuk Kim
From: Eric Biggers <ebiggers@google.com>
commit 844545c51a5b2a524b22a2fe9d0b353b827d24b4 upstream.
When writing a page from an encrypted file that is using
filesystem-layer encryption (not inline encryption), f2fs encrypts the
pagecache page into a bounce page, then writes the bounce page.
It also passes the bounce page to wbc_account_cgroup_owner(). That's
incorrect, because the bounce page is a newly allocated temporary page
that doesn't have the memory cgroup of the original pagecache page.
This makes wbc_account_cgroup_owner() not account the I/O to the owner
of the pagecache page as it should.
Fix this by always passing the pagecache page to
wbc_account_cgroup_owner().
Fixes: 578c647879f7 ("f2fs: implement cgroup writeback support")
Cc: stable@vger.kernel.org
Reported-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/data.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index c63f5e32630ee..56b2dadd623b2 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -464,7 +464,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
}
if (fio->io_wbc && !is_read_io(fio->op))
- wbc_account_io(fio->io_wbc, page, PAGE_SIZE);
+ wbc_account_io(fio->io_wbc, fio->page, PAGE_SIZE);
bio_set_op_attrs(bio, fio->op, fio->op_flags);
@@ -533,7 +533,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio)
}
if (fio->io_wbc)
- wbc_account_io(fio->io_wbc, bio_page, PAGE_SIZE);
+ wbc_account_io(fio->io_wbc, fio->page, PAGE_SIZE);
io->last_block_in_bio = fio->new_blkaddr;
f2fs_trace_ios(fio, 0);
--
2.39.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4.19] f2fs: fix cgroup writeback accounting with fs-layer encryption
2023-03-08 6:17 [PATCH 4.19] f2fs: fix cgroup writeback accounting with fs-layer encryption Eric Biggers
@ 2023-03-10 12:57 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2023-03-10 12:57 UTC (permalink / raw)
To: Eric Biggers
Cc: stable, linux-f2fs-devel, linux-fscrypt, Matthew Wilcox (Oracle),
Tejun Heo, Chao Yu, Jaegeuk Kim
On Tue, Mar 07, 2023 at 10:17:46PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> commit 844545c51a5b2a524b22a2fe9d0b353b827d24b4 upstream.
>
> When writing a page from an encrypted file that is using
> filesystem-layer encryption (not inline encryption), f2fs encrypts the
> pagecache page into a bounce page, then writes the bounce page.
>
> It also passes the bounce page to wbc_account_cgroup_owner(). That's
> incorrect, because the bounce page is a newly allocated temporary page
> that doesn't have the memory cgroup of the original pagecache page.
> This makes wbc_account_cgroup_owner() not account the I/O to the owner
> of the pagecache page as it should.
>
> Fix this by always passing the pagecache page to
> wbc_account_cgroup_owner().
>
> Fixes: 578c647879f7 ("f2fs: implement cgroup writeback support")
> Cc: stable@vger.kernel.org
> Reported-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> Acked-by: Tejun Heo <tj@kernel.org>
> Reviewed-by: Chao Yu <chao@kernel.org>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fs/f2fs/data.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-10 12:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-08 6:17 [PATCH 4.19] f2fs: fix cgroup writeback accounting with fs-layer encryption Eric Biggers
2023-03-10 12:57 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).