From patchwork Tue Mar 14 01:22:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 69251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1519542wrd; Mon, 13 Mar 2023 19:19:57 -0700 (PDT) X-Google-Smtp-Source: AK7set8+yj8esxje7pQ7wSL68E88v3J+tlCyMlnfuo4wyKzZ1I7YKu/gmJSiM82SgmbemLFNCC4I X-Received: by 2002:a05:6102:c47:b0:41f:51dc:f145 with SMTP id y7-20020a0561020c4700b0041f51dcf145mr25893886vss.23.1678760397475; Mon, 13 Mar 2023 19:19:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678760397; cv=none; d=google.com; s=arc-20160816; b=yzkx4/pFz5qLnRbZi+S8xq941RAdIDfwvlACXWDD/GFtZTKQwDX6QM07VBQlrmhKJu 9Z2I3oDo9BN0CrL+tAbFN3iJt9jXeELtNOTMcJgtm/VRyYZ5t9QptYEv+hAWDM4zHN3q CP4pj6nS6ddAe/cD1+XaIytt4fc0cnH7glgxHz41vL2AgzI1DOMQsJo2YbG93Eo2HNZ0 0atCob4ZbnJXC/kzJP9ZFcykwvIaIEyVBcQtunWvH3cFEAfm7Blp1C70SHoIWAmDqvjS v05RiPy1cAo7z9WrvArivm4O0CBHnuXIiThJOxeaXu7zzrlK975Ubmu8aLAYUtDODNcB 4gKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Q5IKgmDHyXj7sCgn6Lzb7jFj0W4fPv34ze6CnpGsZ0o=; b=pVRB9UPA7bRHAk+ZR6L0et8ItDhDdkoUQc/UYknjLjjY0ZKcO37dAyvR4qyv/2i7S4 wyMqb/e5OvejGCVWNHYXSEsNr0ISWwIrdhk2W9tbF9u5r10n1qvoEpq3S/nxLHvBu9uS 9hXhBh/LUDvUw/iBKyqT1ilMd2eVXY7AQ+2l7WdCoJgdpk86cxWqn1rCQ23AOx0dRmc1 kE3fMZopMq7uOPw6vJ6h3Qjy9hW+/qH1oc2fT8eJyAGmtih1KbT0tBHl3UQpQdXow3P4 1I8TsKYMNHFbu2Y1eZVJ++kKeeAhRnlqsWe0tXxFcQyNWRVy1PJzuTfay/47Otiw43u8 BY1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dc34-20020a05610255a200b00424fc2f3a95si677377vsb.467.2023.03.13.19.19.42; Mon, 13 Mar 2023 19:19:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230180AbjCNBXq (ORCPT + 99 others); Mon, 13 Mar 2023 21:23:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229666AbjCNBXp (ORCPT ); Mon, 13 Mar 2023 21:23:45 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55F3822133; Mon, 13 Mar 2023 18:23:44 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PbG4r1Qjtz4f3jJ8; Tue, 14 Mar 2023 09:23:40 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP3 (Coremail) with SMTP id _Ch0CgDX0R+czA9kpWOGEw--.55929S4; Tue, 14 Mar 2023 09:23:41 +0800 (CST) From: Yu Kuai To: song@kernel.org, guoqing.jiang@linux.dev, jgq516@gmail.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH v3] md/raid10: don't call bio_start_io_acct twice for bio which experienced read error Date: Tue, 14 Mar 2023 09:22:58 +0800 Message-Id: <20230314012258.2395894-1-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgDX0R+czA9kpWOGEw--.55929S4 X-Coremail-Antispam: 1UD129KBjvJXoW7uF1kCFW8ZFWxKry7XF4fXwb_yoW8XF4Dp3 yDGF9YvFW5Jw4j9FWDtrWDWFnYyayvgrW2yrWxAw13Z3Wjvr98ta18WFWagrn8XFZ3u342 vFn09rsrGrsFyFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyK14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1l42xK82IYc2Ij64vI r41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8Gjc xK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0 cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8V AvwI8IcIk0rVWrJr0_WFyUJwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF 7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUoOJ5UUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759965751316318444?= X-GMAIL-MSGID: =?utf-8?q?1760307862561593190?= From: Yu Kuai 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 Signed-off-by: Yu Kuai --- 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 = 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 = bio_start_io_acct(bio); read_bio = bio_alloc_clone(rdev->bdev, bio, gfp, &mddev->bio_set); @@ -1574,6 +1575,7 @@ static void __make_request(struct mddev *mddev, struct bio *bio, int sectors) r10_bio->sector = bio->bi_iter.bi_sector; r10_bio->state = 0; r10_bio->read_slot = -1; + r10_bio->start_time = 0; memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * conf->geo.raid_disks);