mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

blkcg: associate writeback bios with a blkg

Browse source 
One of the goals of this series is to remove a separate reference to
the css of the bio. This can and should be accessed via bio_blkcg. In
this patch, the wbc_init_bio call is changed such that it must be called
after a queue has been associated with the bio.

Signed-off-by: Dennis Zhou <dennisszhou@gmail.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Dennis Zhou (Facebook) 2018-09-11 14:41:32 -04:00 committed by Jens Axboe
parent 74b7c02a9b
commit bdc2491708
4 changed files with 14 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
Documentation/admin-guide/cgroup-v2.rst
View file

@ -1857,8 +1857,10 @@ following two functions.
wbc_init_bio(@wbc, @bio) wbc_init_bio(@wbc, @bio)
Should be called for each bio carrying writeback data and Should be called for each bio carrying writeback data and
associates the bio with the inode's owner cgroup. Can be associates the bio with the inode's owner cgroup and the
called anytime between bio allocation and submission. corresponding request queue. This must be called after
a queue (device) has been associated with the bio and
before submission.
wbc_account_io(@wbc, @page, @bytes) wbc_account_io(@wbc, @page, @bytes)
Should be called for each data segment being written out. Should be called for each data segment being written out.
@ -1877,7 +1879,7 @@ the configuration, the bio may be executed at a lower priority and if
the writeback session is holding shared resources, e.g. a journal the writeback session is holding shared resources, e.g. a journal
entry, may lead to priority inversion. There is no one easy solution entry, may lead to priority inversion. There is no one easy solution
for the problem. Filesystems can try to work around specific problem for the problem. Filesystems can try to work around specific problem
cases by skipping wbc_init_bio() or using bio_associate_blkcg() cases by skipping wbc_init_bio() or using bio_associate_create_blkg()
directly. directly.

10
fs/buffer.c
View file

@ -3060,11 +3060,6 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
*/ */
bio = bio_alloc(GFP_NOIO, 1); bio = bio_alloc(GFP_NOIO, 1);
if (wbc) {
wbc_init_bio(wbc, bio);
wbc_account_io(wbc, bh->b_page, bh->b_size);
}
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_set_dev(bio, bh->b_bdev); bio_set_dev(bio, bh->b_bdev);
bio->bi_write_hint = write_hint; bio->bi_write_hint = write_hint;
@ -3084,6 +3079,11 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
op_flags |= REQ_PRIO; op_flags |= REQ_PRIO;
bio_set_op_attrs(bio, op, op_flags); bio_set_op_attrs(bio, op, op_flags);
if (wbc) {
wbc_init_bio(wbc, bio);
wbc_account_io(wbc, bh->b_page, bh->b_size);
}
submit_bio(bio); submit_bio(bio);
return 0; return 0;
} }

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

@ -374,13 +374,13 @@ static int io_submit_init_bio(struct ext4_io_submit *io,
bio = bio_alloc(GFP_NOIO, BIO_MAX_PAGES); bio = bio_alloc(GFP_NOIO, BIO_MAX_PAGES);
if (!bio) if (!bio)
return -ENOMEM; return -ENOMEM;
wbc_init_bio(io->io_wbc, bio);
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_set_dev(bio, bh->b_bdev); bio_set_dev(bio, bh->b_bdev);
bio->bi_end_io = ext4_end_bio; bio->bi_end_io = ext4_end_bio;
bio->bi_private = ext4_get_io_end(io->io_end); bio->bi_private = ext4_get_io_end(io->io_end);
io->io_bio = bio; io->io_bio = bio;
io->io_next_block = bh->b_blocknr; io->io_next_block = bh->b_blocknr;
wbc_init_bio(io->io_wbc, bio);
return 0; return 0;
} }

5
include/linux/writeback.h
View file

@ -246,7 +246,8 @@ static inline void wbc_attach_fdatawrite_inode(struct writeback_control *wbc,
* *
* @bio is a part of the writeback in progress controlled by @wbc. Perform * @bio is a part of the writeback in progress controlled by @wbc. Perform
* writeback specific initialization. This is used to apply the cgroup * writeback specific initialization. This is used to apply the cgroup
* writeback context. * writeback context. Must be called after the bio has been associated with
* a device.
*/ */
static inline void wbc_init_bio(struct writeback_control *wbc, struct bio *bio) static inline void wbc_init_bio(struct writeback_control *wbc, struct bio *bio)
{ {
@ -257,7 +258,7 @@ static inline void wbc_init_bio(struct writeback_control *wbc, struct bio *bio)
* regular writeback instead of writing things out itself. * regular writeback instead of writing things out itself.
*/ */
if (wbc->wb) if (wbc->wb)
bio_associate_blkcg(bio, wbc->wb->blkcg_css); bio_associate_blkg_from_css(bio, wbc->wb->blkcg_css);
} }
#else /* CONFIG_CGROUP_WRITEBACK */ #else /* CONFIG_CGROUP_WRITEBACK */