Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-28 16:53:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fs/writeback: convert wbc_account_cgroup_owner to take a folio

Browse Source 
Most of the callers of wbc_account_cgroup_owner() are converting a folio
to page before calling the function. wbc_account_cgroup_owner() is
converting the page back to a folio to call mem_cgroup_css_from_folio().

Convert wbc_account_cgroup_owner() to take a folio instead of a page,
and convert all callers to pass a folio directly except f2fs.

Convert the page to folio for all the callers from f2fs as they were the
only callers calling wbc_account_cgroup_owner() with a page. As f2fs is
already in the process of converting to folios, these call sites might
also soon be calling wbc_account_cgroup_owner() with a folio directly in
the future.

No functional changes. Only compile tested.

Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
Link: https://lore.kernel.org/r/20240926140121.203821-1-kernel@pankajraghav.com
Acked-by: David Sterba <dsterba@suse.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Pankaj Raghav 2024-09-26 16:01:21 +02:00 committed by Christian Brauner
parent 8c6e03ffed
commit 30dac24e14
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
10 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/admin-guide/cgroup-v2.rst
View File

@ -2945,7 +2945,7 @@ following two functions.
a queue (device) has been associated with the bio and a queue (device) has been associated with the bio and
before submission. before submission.
wbc_account_cgroup_owner(@wbc, @page, @bytes) wbc_account_cgroup_owner(@wbc, @folio, @bytes)
Should be called for each data segment being written out. Should be called for each data segment being written out.
While this function doesn't care exactly when it's called While this function doesn't care exactly when it's called
during the writeback session, it's the easiest and most during the writeback session, it's the easiest and most

7
fs/btrfs/extent_io.c
View File

@ -785,7 +785,7 @@ static void submit_extent_folio(struct btrfs_bio_ctrl *bio_ctrl,
} }
if (bio_ctrl->wbc) if (bio_ctrl->wbc)
wbc_account_cgroup_owner(bio_ctrl->wbc, &folio->page, wbc_account_cgroup_owner(bio_ctrl->wbc, folio,
len); len);
size -= len; size -= len;
@ -1707,7 +1707,7 @@ static noinline_for_stack void write_one_eb(struct extent_buffer *eb,
ret = bio_add_folio(&bbio->bio, folio, eb->len, ret = bio_add_folio(&bbio->bio, folio, eb->len,
eb->start - folio_pos(folio)); eb->start - folio_pos(folio));
ASSERT(ret); ASSERT(ret);
wbc_account_cgroup_owner(wbc, folio_page(folio, 0), eb->len); wbc_account_cgroup_owner(wbc, folio, eb->len);
folio_unlock(folio); folio_unlock(folio);
} else { } else {
int num_folios = num_extent_folios(eb); int num_folios = num_extent_folios(eb);
@ -1721,8 +1721,7 @@ static noinline_for_stack void write_one_eb(struct extent_buffer *eb,
folio_start_writeback(folio); folio_start_writeback(folio);
ret = bio_add_folio(&bbio->bio, folio, eb->folio_size, 0); ret = bio_add_folio(&bbio->bio, folio, eb->folio_size, 0);
ASSERT(ret); ASSERT(ret);
wbc_account_cgroup_owner(wbc, folio_page(folio, 0), wbc_account_cgroup_owner(wbc, folio, eb->folio_size);
eb->folio_size);
wbc->nr_to_write -= folio_nr_pages(folio); wbc->nr_to_write -= folio_nr_pages(folio);
folio_unlock(folio); folio_unlock(folio);
} }

2
fs/btrfs/inode.c
View File

@ -1729,7 +1729,7 @@ static bool run_delalloc_compressed(struct btrfs_inode *inode,
* need full accuracy. Just account the whole thing * need full accuracy. Just account the whole thing
* against the first page. * against the first page.
*/ */
wbc_account_cgroup_owner(wbc, &locked_folio->page, wbc_account_cgroup_owner(wbc, locked_folio,
cur_end - start); cur_end - start);
async_chunk[i].locked_folio = locked_folio; async_chunk[i].locked_folio = locked_folio;
locked_folio = NULL; locked_folio = NULL;

4
fs/buffer.c
View File

@ -2803,7 +2803,7 @@ static void submit_bh_wbc(blk_opf_t opf, struct buffer_head *bh,
bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9); bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
bio->bi_write_hint = write_hint; bio->bi_write_hint = write_hint;
__bio_add_page(bio, bh->b_page, bh->b_size, bh_offset(bh)); bio_add_folio_nofail(bio, bh->b_folio, bh->b_size, bh_offset(bh));
bio->bi_end_io = end_bio_bh_io_sync; bio->bi_end_io = end_bio_bh_io_sync;
bio->bi_private = bh; bio->bi_private = bh;
@ -2813,7 +2813,7 @@ static void submit_bh_wbc(blk_opf_t opf, struct buffer_head *bh,
if (wbc) { if (wbc) {
wbc_init_bio(wbc, bio); wbc_init_bio(wbc, bio);
wbc_account_cgroup_owner(wbc, bh->b_page, bh->b_size); wbc_account_cgroup_owner(wbc, bh->b_folio, bh->b_size);
} }
submit_bio(bio); submit_bio(bio);

2
fs/ext4/page-io.c
View File

@ -421,7 +421,7 @@ static void io_submit_add_bh(struct ext4_io_submit *io,
io_submit_init_bio(io, bh); io_submit_init_bio(io, bh);
if (!bio_add_folio(io->io_bio, io_folio, bh->b_size, bh_offset(bh))) if (!bio_add_folio(io->io_bio, io_folio, bh->b_size, bh_offset(bh)))
goto submit_and_retry; goto submit_and_retry;
wbc_account_cgroup_owner(io->io_wbc, &folio->page, bh->b_size); wbc_account_cgroup_owner(io->io_wbc, folio, bh->b_size);
io->io_next_block++; io->io_next_block++;
} }

9
fs/f2fs/data.c
View File

@ -711,7 +711,8 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
} }
if (fio->io_wbc && !is_read_io(fio->op)) if (fio->io_wbc && !is_read_io(fio->op))
wbc_account_cgroup_owner(fio->io_wbc, fio->page, PAGE_SIZE); wbc_account_cgroup_owner(fio->io_wbc, page_folio(fio->page),
PAGE_SIZE);
inc_page_count(fio->sbi, is_read_io(fio->op) ? inc_page_count(fio->sbi, is_read_io(fio->op) ?
__read_io_type(page) : WB_DATA_TYPE(fio->page, false)); __read_io_type(page) : WB_DATA_TYPE(fio->page, false));
@ -911,7 +912,8 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
} }
if (fio->io_wbc) if (fio->io_wbc)
wbc_account_cgroup_owner(fio->io_wbc, fio->page, PAGE_SIZE); wbc_account_cgroup_owner(fio->io_wbc, page_folio(fio->page),
PAGE_SIZE);
inc_page_count(fio->sbi, WB_DATA_TYPE(page, false)); inc_page_count(fio->sbi, WB_DATA_TYPE(page, false));
@ -1011,7 +1013,8 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio)
} }
if (fio->io_wbc) if (fio->io_wbc)
wbc_account_cgroup_owner(fio->io_wbc, fio->page, PAGE_SIZE); wbc_account_cgroup_owner(fio->io_wbc, page_folio(fio->page),
PAGE_SIZE);
io->last_block_in_bio = fio->new_blkaddr; io->last_block_in_bio = fio->new_blkaddr;

8
fs/fs-writeback.c
View File

@ -890,17 +890,16 @@ EXPORT_SYMBOL_GPL(wbc_detach_inode);
/** /**
* wbc_account_cgroup_owner - account writeback to update inode cgroup ownership * wbc_account_cgroup_owner - account writeback to update inode cgroup ownership
* @wbc: writeback_control of the writeback in progress * @wbc: writeback_control of the writeback in progress
* @page: page being written out * @folio: folio being written out
* @bytes: number of bytes being written out * @bytes: number of bytes being written out
* *
* @bytes from @page are about to written out during the writeback * @bytes from @folio are about to written out during the writeback
* controlled by @wbc. Keep the book for foreign inode detection. See * controlled by @wbc. Keep the book for foreign inode detection. See
* wbc_detach_inode(). * wbc_detach_inode().
*/ */
void wbc_account_cgroup_owner(struct writeback_control *wbc, struct page *page, void wbc_account_cgroup_owner(struct writeback_control *wbc, struct folio *folio,
size_t bytes) size_t bytes)
{ {
struct folio *folio;
struct cgroup_subsys_state *css; struct cgroup_subsys_state *css;
int id; int id;
@ -913,7 +912,6 @@ void wbc_account_cgroup_owner(struct writeback_control *wbc, struct page *page,
if (!wbc->wb || wbc->no_cgroup_owner) if (!wbc->wb || wbc->no_cgroup_owner)
return; return;
folio = page_folio(page);
css = mem_cgroup_css_from_folio(folio); css = mem_cgroup_css_from_folio(folio);
/* dead cgroups shouldn't contribute to inode ownership arbitration */ /* dead cgroups shouldn't contribute to inode ownership arbitration */
if (!(css->flags & CSS_ONLINE)) if (!(css->flags & CSS_ONLINE))

2
fs/iomap/buffered-io.c
View File

@ -1833,7 +1833,7 @@ static int iomap_add_to_ioend(struct iomap_writepage_ctx *wpc,
if (ifs) if (ifs)
atomic_add(len, &ifs->write_bytes_pending); atomic_add(len, &ifs->write_bytes_pending);
wpc->ioend->io_size += len; wpc->ioend->io_size += len;
wbc_account_cgroup_owner(wbc, &folio->page, len); wbc_account_cgroup_owner(wbc, folio, len);
return 0; return 0;
} }

2
fs/mpage.c
View File

@ -606,7 +606,7 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc,
* the confused fail path above (OOM) will be very confused when * the confused fail path above (OOM) will be very confused when
* it finds all bh marked clean (i.e. it will not write anything) * it finds all bh marked clean (i.e. it will not write anything)
*/ */
wbc_account_cgroup_owner(wbc, &folio->page, folio_size(folio)); wbc_account_cgroup_owner(wbc, folio, folio_size(folio));
length = first_unmapped << blkbits; length = first_unmapped << blkbits;
if (!bio_add_folio(bio, folio, length, 0)) { if (!bio_add_folio(bio, folio, length, 0)) {
bio = mpage_bio_submit_write(bio); bio = mpage_bio_submit_write(bio);

4
include/linux/writeback.h
View File

@ -217,7 +217,7 @@ void wbc_attach_and_unlock_inode(struct writeback_control *wbc,
struct inode *inode) struct inode *inode)
__releases(&inode->i_lock); __releases(&inode->i_lock);
void wbc_detach_inode(struct writeback_control *wbc); void wbc_detach_inode(struct writeback_control *wbc);
void wbc_account_cgroup_owner(struct writeback_control *wbc, struct page *page, void wbc_account_cgroup_owner(struct writeback_control *wbc, struct folio *folio,
size_t bytes); size_t bytes);
int cgroup_writeback_by_id(u64 bdi_id, int memcg_id, int cgroup_writeback_by_id(u64 bdi_id, int memcg_id,
enum wb_reason reason, struct wb_completion *done); enum wb_reason reason, struct wb_completion *done);
@ -324,7 +324,7 @@ static inline void wbc_init_bio(struct writeback_control *wbc, struct bio *bio)
} }
static inline void wbc_account_cgroup_owner(struct writeback_control *wbc, static inline void wbc_account_cgroup_owner(struct writeback_control *wbc,
struct page *page, size_t bytes) struct folio *folio, size_t bytes)
{ {
} }