| Message ID | 20220806080330.3823644-5-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/11] btrfs: don't call bioset_integrity_create for btrfs_bioset | expand |
On 8/6/22 16:03, Christoph Hellwig wrote: > Stop grabbing an extra bio_counter reference for each clone bio in a > mirrored write and instead just release the one original reference in > btrfs_end_bioc once all the bios for a single btfs_bio have completed > instead of at the end of btrfs_submit_bio once all bios have been > submitted. > > This means the reference is now carried by the "upper" btrfs_bio only > instead of each lower bio. > > Also remove the now unused btrfs_bio_counter_inc_noblocked helper. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Nikolay Borisov <nborisov@suse.com> > Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> > --- > fs/btrfs/ctree.h | 1 - > fs/btrfs/dev-replace.c | 5 ----- > fs/btrfs/volumes.c | 6 ++---- > 3 files changed, 2 insertions(+), 10 deletions(-) > > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h > index 51c4804392637..e9a1d0016804a 100644 > --- a/fs/btrfs/ctree.h > +++ b/fs/btrfs/ctree.h > @@ -4079,7 +4079,6 @@ static inline void btrfs_init_full_stripe_locks_tree( > > /* dev-replace.c */ > void btrfs_bio_counter_inc_blocked(struct btrfs_fs_info *fs_info); > -void btrfs_bio_counter_inc_noblocked(struct btrfs_fs_info *fs_info); > void btrfs_bio_counter_sub(struct btrfs_fs_info *fs_info, s64 amount); > > static inline void btrfs_bio_counter_dec(struct btrfs_fs_info *fs_info) > diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c > index 488f2105c5d0d..c26b3196a3f17 100644 > --- a/fs/btrfs/dev-replace.c > +++ b/fs/btrfs/dev-replace.c > @@ -1284,11 +1284,6 @@ int __pure btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace) > return 1; > } > > -void btrfs_bio_counter_inc_noblocked(struct btrfs_fs_info *fs_info) > -{ > - percpu_counter_inc(&fs_info->dev_replace.bio_counter); > -} > - > void btrfs_bio_counter_sub(struct btrfs_fs_info *fs_info, s64 amount) > { > percpu_counter_sub(&fs_info->dev_replace.bio_counter, amount); > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > index a73bac7f42624..014df2e64e67b 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -6670,6 +6670,8 @@ static void btrfs_end_bioc(struct btrfs_io_context *bioc, bool async) > struct bio *orig_bio = bioc->orig_bio; > struct btrfs_bio *bbio = btrfs_bio(orig_bio); > > + btrfs_bio_counter_dec(bioc->fs_info); > + > bbio->mirror_num = bioc->mirror_num; > orig_bio->bi_private = bioc->private; > orig_bio->bi_end_io = bioc->end_io; > @@ -6717,7 +6719,6 @@ static void btrfs_end_bio(struct bio *bio) > if (bio != bioc->orig_bio) > bio_put(bio); > > - btrfs_bio_counter_dec(bioc->fs_info); > if (atomic_dec_and_test(&bioc->stripes_pending)) > btrfs_end_bioc(bioc, true); > } > @@ -6772,8 +6773,6 @@ static void submit_stripe_bio(struct btrfs_io_context *bioc, > (unsigned long)dev->bdev->bd_dev, rcu_str_deref(dev->name), > dev->devid, bio->bi_iter.bi_size); > > - btrfs_bio_counter_inc_noblocked(fs_info); > - > btrfsic_check_bio(bio); > submit_bio(bio); > } > @@ -6825,7 +6824,6 @@ void btrfs_submit_bio(struct btrfs_fs_info *fs_info, struct bio *bio, int mirror > > submit_stripe_bio(bioc, bio, dev_nr, should_clone); > } > - btrfs_bio_counter_dec(fs_info); > } > > static bool dev_args_match_fs_devices(const struct btrfs_dev_lookup_args *args,
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 51c4804392637..e9a1d0016804a 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -4079,7 +4079,6 @@ static inline void btrfs_init_full_stripe_locks_tree( /* dev-replace.c */ void btrfs_bio_counter_inc_blocked(struct btrfs_fs_info *fs_info); -void btrfs_bio_counter_inc_noblocked(struct btrfs_fs_info *fs_info); void btrfs_bio_counter_sub(struct btrfs_fs_info *fs_info, s64 amount); static inline void btrfs_bio_counter_dec(struct btrfs_fs_info *fs_info) diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 488f2105c5d0d..c26b3196a3f17 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -1284,11 +1284,6 @@ int __pure btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace) return 1; } -void btrfs_bio_counter_inc_noblocked(struct btrfs_fs_info *fs_info) -{ - percpu_counter_inc(&fs_info->dev_replace.bio_counter); -} - void btrfs_bio_counter_sub(struct btrfs_fs_info *fs_info, s64 amount) { percpu_counter_sub(&fs_info->dev_replace.bio_counter, amount); diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index a73bac7f42624..014df2e64e67b 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -6670,6 +6670,8 @@ static void btrfs_end_bioc(struct btrfs_io_context *bioc, bool async) struct bio *orig_bio = bioc->orig_bio; struct btrfs_bio *bbio = btrfs_bio(orig_bio); + btrfs_bio_counter_dec(bioc->fs_info); + bbio->mirror_num = bioc->mirror_num; orig_bio->bi_private = bioc->private; orig_bio->bi_end_io = bioc->end_io; @@ -6717,7 +6719,6 @@ static void btrfs_end_bio(struct bio *bio) if (bio != bioc->orig_bio) bio_put(bio); - btrfs_bio_counter_dec(bioc->fs_info); if (atomic_dec_and_test(&bioc->stripes_pending)) btrfs_end_bioc(bioc, true); } @@ -6772,8 +6773,6 @@ static void submit_stripe_bio(struct btrfs_io_context *bioc, (unsigned long)dev->bdev->bd_dev, rcu_str_deref(dev->name), dev->devid, bio->bi_iter.bi_size); - btrfs_bio_counter_inc_noblocked(fs_info); - btrfsic_check_bio(bio); submit_bio(bio); } @@ -6825,7 +6824,6 @@ void btrfs_submit_bio(struct btrfs_fs_info *fs_info, struct bio *bio, int mirror submit_stripe_bio(bioc, bio, dev_nr, should_clone); } - btrfs_bio_counter_dec(fs_info); } static bool dev_args_match_fs_devices(const struct btrfs_dev_lookup_args *args,