From: Song Liu <song@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Jaegeuk Kim <jaegeuk@kernel.org>,
Chao Yu <chao@kernel.org>,
Philipp Reisner <philipp.reisner@linbit.com>,
Lars Ellenberg <lars.ellenberg@linbit.com>,
Coly Li <colyli@suse.de>, Mike Snitzer <snitzer@redhat.com>,
Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>,
Damien Le Moal <damien.lemoal@wdc.com>,
Naohiro Aota <naohiro.aota@wdc.com>,
Andrew Morton <akpm@linux-foundation.org>,
Ryusuke Konishi <konishi.ryusuke@gmail.com>,
linux-nilfs@vger.kernel.org, dm-devel@redhat.com,
linux-f2fs-devel@lists.sourceforge.net,
linux-block@vger.kernel.org, drbd-dev@lists.linbit.com,
linux-bcache@vger.kernel.org,
linux-raid <linux-raid@vger.kernel.org>,
Linux-Fsdevel <linux-fsdevel@vger.kernel.org>,
linux-btrfs@vger.kernel.org, linux-nfs@vger.kernel.org,
Linux-MM <linux-mm@kvack.org>
Subject: Re: [PATCH 14/17] md/raid6: refactor raid5_read_one_chunk
Date: Tue, 26 Jan 2021 23:15:52 -0800 [thread overview]
Message-ID: <CAPhsuW599kbe-YFX0FOOGJy30gy3V2_hMYW3jg3sK_VwaayEBQ@mail.gmail.com> (raw)
In-Reply-To: <20210126145247.1964410-15-hch@lst.de>
On Tue, Jan 26, 2021 at 7:19 AM Christoph Hellwig <hch@lst.de> wrote:
>
> Refactor raid5_read_one_chunk so that all simple checks are done
> before allocating the bio.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Song Liu <song@kernel.org>
Thanks for the clean-up!
> ---
> drivers/md/raid5.c | 108 +++++++++++++++++++--------------------------
> 1 file changed, 45 insertions(+), 63 deletions(-)
>
> diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
> index f411b9e5c332f4..a348b2adf2a9f9 100644
> --- a/drivers/md/raid5.c
> +++ b/drivers/md/raid5.c
> @@ -5393,90 +5393,72 @@ static void raid5_align_endio(struct bio *bi)
> static int raid5_read_one_chunk(struct mddev *mddev, struct bio *raid_bio)
> {
> struct r5conf *conf = mddev->private;
> - int dd_idx;
> - struct bio* align_bi;
> + struct bio *align_bio;
> struct md_rdev *rdev;
> - sector_t end_sector;
> + sector_t sector, end_sector, first_bad;
> + int bad_sectors, dd_idx;
>
> if (!in_chunk_boundary(mddev, raid_bio)) {
> pr_debug("%s: non aligned\n", __func__);
> return 0;
> }
> - /*
> - * use bio_clone_fast to make a copy of the bio
> - */
> - align_bi = bio_clone_fast(raid_bio, GFP_NOIO, &mddev->bio_set);
> - if (!align_bi)
> - return 0;
> - /*
> - * set bi_end_io to a new function, and set bi_private to the
> - * original bio.
> - */
> - align_bi->bi_end_io = raid5_align_endio;
> - align_bi->bi_private = raid_bio;
> - /*
> - * compute position
> - */
> - align_bi->bi_iter.bi_sector =
> - raid5_compute_sector(conf, raid_bio->bi_iter.bi_sector,
> - 0, &dd_idx, NULL);
>
> - end_sector = bio_end_sector(align_bi);
> + sector = raid5_compute_sector(conf, raid_bio->bi_iter.bi_sector, 0,
> + &dd_idx, NULL);
> + end_sector = bio_end_sector(raid_bio);
> +
> rcu_read_lock();
> + if (r5c_big_stripe_cached(conf, sector))
> + goto out_rcu_unlock;
> +
> rdev = rcu_dereference(conf->disks[dd_idx].replacement);
> if (!rdev || test_bit(Faulty, &rdev->flags) ||
> rdev->recovery_offset < end_sector) {
> rdev = rcu_dereference(conf->disks[dd_idx].rdev);
> - if (rdev &&
> - (test_bit(Faulty, &rdev->flags) ||
> + if (!rdev)
> + goto out_rcu_unlock;
> + if (test_bit(Faulty, &rdev->flags) ||
> !(test_bit(In_sync, &rdev->flags) ||
> - rdev->recovery_offset >= end_sector)))
> - rdev = NULL;
> + rdev->recovery_offset >= end_sector))
> + goto out_rcu_unlock;
> }
>
> - if (r5c_big_stripe_cached(conf, align_bi->bi_iter.bi_sector)) {
> - rcu_read_unlock();
> - bio_put(align_bi);
> + atomic_inc(&rdev->nr_pending);
> + rcu_read_unlock();
> +
> + align_bio = bio_clone_fast(raid_bio, GFP_NOIO, &mddev->bio_set);
> + bio_set_dev(align_bio, rdev->bdev);
> + align_bio->bi_end_io = raid5_align_endio;
> + align_bio->bi_private = raid_bio;
> + align_bio->bi_iter.bi_sector = sector;
> +
> + raid_bio->bi_next = (void *)rdev;
> +
> + if (is_badblock(rdev, sector, bio_sectors(align_bio), &first_bad,
> + &bad_sectors)) {
> + bio_put(align_bio);
> + rdev_dec_pending(rdev, mddev);
> return 0;
> }
>
> - if (rdev) {
> - sector_t first_bad;
> - int bad_sectors;
> -
> - atomic_inc(&rdev->nr_pending);
> - rcu_read_unlock();
> - raid_bio->bi_next = (void*)rdev;
> - bio_set_dev(align_bi, rdev->bdev);
> -
> - if (is_badblock(rdev, align_bi->bi_iter.bi_sector,
> - bio_sectors(align_bi),
> - &first_bad, &bad_sectors)) {
> - bio_put(align_bi);
> - rdev_dec_pending(rdev, mddev);
> - return 0;
> - }
> + /* No reshape active, so we can trust rdev->data_offset */
> + align_bio->bi_iter.bi_sector += rdev->data_offset;
>
> - /* No reshape active, so we can trust rdev->data_offset */
> - align_bi->bi_iter.bi_sector += rdev->data_offset;
> + spin_lock_irq(&conf->device_lock);
> + wait_event_lock_irq(conf->wait_for_quiescent, conf->quiesce == 0,
> + conf->device_lock);
> + atomic_inc(&conf->active_aligned_reads);
> + spin_unlock_irq(&conf->device_lock);
>
> - spin_lock_irq(&conf->device_lock);
> - wait_event_lock_irq(conf->wait_for_quiescent,
> - conf->quiesce == 0,
> - conf->device_lock);
> - atomic_inc(&conf->active_aligned_reads);
> - spin_unlock_irq(&conf->device_lock);
> + if (mddev->gendisk)
> + trace_block_bio_remap(align_bio, disk_devt(mddev->gendisk),
> + raid_bio->bi_iter.bi_sector);
> + submit_bio_noacct(align_bio);
> + return 1;
>
> - if (mddev->gendisk)
> - trace_block_bio_remap(align_bi, disk_devt(mddev->gendisk),
> - raid_bio->bi_iter.bi_sector);
> - submit_bio_noacct(align_bi);
> - return 1;
> - } else {
> - rcu_read_unlock();
> - bio_put(align_bi);
> - return 0;
> - }
> +out_rcu_unlock:
> + rcu_read_unlock();
> + return 0;
> }
>
> static struct bio *chunk_aligned_read(struct mddev *mddev, struct bio *raid_bio)
> --
> 2.29.2
>
next prev parent reply other threads:[~2021-01-27 7:21 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 14:52 misc bio allocation cleanups Christoph Hellwig
2021-01-26 14:52 ` [PATCH 01/17] zonefs: use bio_alloc in zonefs_file_dio_append Christoph Hellwig
2021-01-26 15:08 ` Johannes Thumshirn
2021-01-26 19:09 ` Chaitanya Kulkarni
2021-01-26 23:23 ` [dm-devel] " Damien Le Moal
2021-01-26 14:52 ` [PATCH 02/17] btrfs: use bio_kmalloc in __alloc_device Christoph Hellwig
2021-01-26 15:01 ` Josef Bacik
2021-01-26 19:11 ` Chaitanya Kulkarni
2021-01-26 14:52 ` [PATCH 03/17] blk-crypto: use bio_kmalloc in blk_crypto_clone_bio Christoph Hellwig
2021-01-26 21:51 ` Eric Biggers
2021-01-26 14:52 ` [PATCH 04/17] block: split bio_kmalloc from bio_alloc_bioset Christoph Hellwig
2021-01-30 3:56 ` Matthew Wilcox
2021-02-01 12:22 ` Christoph Hellwig
2021-01-26 14:52 ` [PATCH 05/17] block: use an on-stack bio in blkdev_issue_flush Christoph Hellwig
2021-01-26 19:15 ` Chaitanya Kulkarni
2021-01-26 14:52 ` [PATCH 06/17] dm-clone: use blkdev_issue_flush in commit_metadata Christoph Hellwig
2021-01-26 14:52 ` [PATCH 07/17] f2fs: use blkdev_issue_flush in __submit_flush_wait Christoph Hellwig
2021-01-29 1:03 ` [f2fs-dev] " Chao Yu
2021-01-26 14:52 ` [PATCH 08/17] f2fs: remove FAULT_ALLOC_BIO Christoph Hellwig
2021-01-28 16:11 ` Jaegeuk Kim
2021-01-29 1:04 ` [f2fs-dev] " Chao Yu
2021-01-26 14:52 ` [PATCH 09/17] drbd: remove bio_alloc_drbd Christoph Hellwig
2021-01-26 14:52 ` [PATCH 10/17] drbd: remove drbd_req_make_private_bio Christoph Hellwig
2021-01-26 14:52 ` [PATCH 11/17] md: remove bio_alloc_mddev Christoph Hellwig
2021-01-27 7:21 ` Song Liu
2021-01-26 14:52 ` [PATCH 12/17] md: simplify sync_page_io Christoph Hellwig
2021-01-27 7:22 ` Song Liu
2021-01-26 14:52 ` [PATCH 13/17] md: remove md_bio_alloc_sync Christoph Hellwig
2021-01-27 7:22 ` Song Liu
2021-01-26 14:52 ` [PATCH 14/17] md/raid6: refactor raid5_read_one_chunk Christoph Hellwig
2021-01-27 7:15 ` Song Liu [this message]
2021-01-26 14:52 ` [PATCH 15/17] nfs/blocklayout: remove cruft in bl_alloc_init_bio Christoph Hellwig
2021-01-26 14:52 ` [PATCH 16/17] nilfs2: remove cruft in nilfs_alloc_seg_bio Christoph Hellwig
2021-01-26 19:17 ` Chaitanya Kulkarni
2021-01-26 14:52 ` [PATCH 17/17] mm: remove get_swap_bio Christoph Hellwig
2021-01-27 16:52 ` misc bio allocation cleanups Jens Axboe
2021-02-01 1:16 ` Guoqing Jiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPhsuW599kbe-YFX0FOOGJy30gy3V2_hMYW3jg3sK_VwaayEBQ@mail.gmail.com \
--to=song@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=chao@kernel.org \
--cc=colyli@suse.de \
--cc=damien.lemoal@wdc.com \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=dsterba@suse.com \
--cc=hch@lst.de \
--cc=jaegeuk@kernel.org \
--cc=josef@toxicpanda.com \
--cc=konishi.ryusuke@gmail.com \
--cc=lars.ellenberg@linbit.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=naohiro.aota@wdc.com \
--cc=philipp.reisner@linbit.com \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).