MIME-Version: 1.0
References: <CAPhsuW5nw0tgVmm-iB++_x2K=dBNSyHNtfpLyKBArn6YZVoteA@mail.gmail.com>
 <20230314012258.2395894-1-yukuai1@huaweicloud.com>
In-Reply-To: <20230314012258.2395894-1-yukuai1@huaweicloud.com>
From:   Song Liu <song@kernel.org>
Date:   Tue, 14 Mar 2023 13:43:26 -0700
Message-ID: <CAPhsuW7nSyhgKy8=90MEttDPRmadKaAFb5--SBOjrOb34Mp3XA@mail.gmail.com>
Subject: Re: [PATCH v3] md/raid10: don't call bio_start_io_acct twice for bio
 which experienced read error
To:     Yu Kuai <yukuai1@huaweicloud.com>
Cc:     guoqing.jiang@linux.dev, jgq516@gmail.com,
        linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org,
        yukuai3@huawei.com, yi.zhang@huawei.com, yangerkun@huawei.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Mar 13, 2023 at 6:23=E2=80=AFPM Yu Kuai <yukuai1@huaweicloud.com> w=
rote:
>
> From: Yu Kuai <yukuai3@huawei.com>
>
> handle_read_error() will resumit r10_bio by raid10_read_request(), which
> will call bio_start_io_acct() again, while bio_end_io_acct() will only
> be called once.
>
> Fix the problem by don't account io again from handle_read_error().
>
> Fixes: 528bc2cf2fcc ("md/raid10: enable io accounting")
> Suggested-by: Song Liu <song@kernel.org>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>

Applied to md-next.

Thanks!
Song

> ---
> Changes in v3:
>  - use r10_bo->start_time instead of adding a new paramater.
> Changes in v3:
>  - Change the patch title
>
>  drivers/md/raid10.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> index 6c66357f92f5..3483fdf796ec 100644
> --- a/drivers/md/raid10.c
> +++ b/drivers/md/raid10.c
> @@ -1244,7 +1244,8 @@ static void raid10_read_request(struct mddev *mddev=
, struct bio *bio,
>         }
>         slot =3D r10_bio->read_slot;
>
> -       if (blk_queue_io_stat(bio->bi_bdev->bd_disk->queue))
> +       if (!r10_bio->start_time &&
> +           blk_queue_io_stat(bio->bi_bdev->bd_disk->queue))
>                 r10_bio->start_time =3D bio_start_io_acct(bio);
>         read_bio =3D bio_alloc_clone(rdev->bdev, bio, gfp, &mddev->bio_se=
t);
>
> @@ -1574,6 +1575,7 @@ static void __make_request(struct mddev *mddev, str=
uct bio *bio, int sectors)
>         r10_bio->sector =3D bio->bi_iter.bi_sector;
>         r10_bio->state =3D 0;
>         r10_bio->read_slot =3D -1;
> +       r10_bio->start_time =3D 0;
>         memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) *
>                         conf->geo.raid_disks);
>
> --
> 2.31.1
>