From patchwork Tue Aug 18 07:02:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 11720103 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 280ED1575 for ; Tue, 18 Aug 2020 07:03:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0F53420658 for ; Tue, 18 Aug 2020 07:03:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="LlgflM9X" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726228AbgHRHDe (ORCPT ); Tue, 18 Aug 2020 03:03:34 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:7796 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726353AbgHRHDe (ORCPT ); Tue, 18 Aug 2020 03:03:34 -0400 Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07I73Q0E023501 for ; Tue, 18 Aug 2020 00:03:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=rvea/9K2FjSVrAXUbPe6D5ihbqBBSEoKRQiQoNpsaBc=; b=LlgflM9XIjeHpIR44XJTmY5Rzkj5Ch/8rf3dR+csVpuz08pZ45z7kxcjrLvQhTlm6Wyo 6HDJHWU8aQJXyoPSmJISR7vXTByaCN2spT+5B3dQmmxToyVAJDq7J1tA3qUjRmwXuTvm iPv0U1cxiO5PmWVtZGe8XVIxPDpkf5t+c3w= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 3304kph6gw-9 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 18 Aug 2020 00:03:32 -0700 Received: from intmgw005.03.ash8.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:11d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 18 Aug 2020 00:02:54 -0700 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 9194962E54B8; Tue, 18 Aug 2020 00:02:48 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Song Liu Smtp-Origin-Hostname: devbig006.ftw2.facebook.com To: , , CC: , , , , Song Liu Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH 1/4] block: expose disk_map_sector_rcu() and hd_struct_put in genhd.h Date: Tue, 18 Aug 2020 00:02:35 -0700 Message-ID: <20200818070238.1323126-2-songliubraving@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200818070238.1323126-1-songliubraving@fb.com> References: <20200818070238.1323126-1-songliubraving@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-08-18_04:2020-08-18,2020-08-18 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 clxscore=1015 spamscore=0 impostorscore=0 mlxscore=0 adultscore=0 malwarescore=0 mlxlogscore=983 lowpriorityscore=0 suspectscore=2 phishscore=0 bulkscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008180049 X-FB-Internal: deliver Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org So they can be used in drivers. Signed-off-by: Song Liu --- block/blk.h | 8 -------- block/genhd.c | 1 + include/linux/genhd.h | 8 ++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/block/blk.h b/block/blk.h index 94f7c084f68fc..a6bc909480111 100644 --- a/block/blk.h +++ b/block/blk.h @@ -332,8 +332,6 @@ void blk_queue_free_zone_bitmaps(struct request_queue *q); static inline void blk_queue_free_zone_bitmaps(struct request_queue *q) {} #endif -struct hd_struct *disk_map_sector_rcu(struct gendisk *disk, sector_t sector); - int blk_alloc_devt(struct hd_struct *part, dev_t *devt); void blk_free_devt(dev_t devt); void blk_invalidate_devt(dev_t devt); @@ -358,12 +356,6 @@ static inline int hd_struct_try_get(struct hd_struct *part) return 1; } -static inline void hd_struct_put(struct hd_struct *part) -{ - if (part->partno) - percpu_ref_put(&part->ref); -} - static inline void hd_free_part(struct hd_struct *part) { free_percpu(part->dkstats); diff --git a/block/genhd.c b/block/genhd.c index 60ae4e1b4d387..5b9333317dcb4 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -349,6 +349,7 @@ struct hd_struct *disk_map_sector_rcu(struct gendisk *disk, sector_t sector) rcu_read_unlock(); return part; } +EXPORT_SYMBOL_GPL(disk_map_sector_rcu); /** * disk_has_partitions diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 31a54072ffd65..b47c64f9f26b4 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -380,6 +380,14 @@ void bd_set_size(struct block_device *bdev, loff_t size); int blkdev_ioctl(struct block_device *, fmode_t, unsigned, unsigned long); long compat_blkdev_ioctl(struct file *, unsigned, unsigned long); +struct hd_struct *disk_map_sector_rcu(struct gendisk *disk, sector_t sector); + +static inline void hd_struct_put(struct hd_struct *part) +{ + if (part->partno) + percpu_ref_put(&part->ref); +} + #ifdef CONFIG_SYSFS int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk); void bd_unlink_disk_holder(struct block_device *bdev, struct gendisk *disk); From patchwork Tue Aug 18 07:02:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 11720097 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8EEE7138C for ; Tue, 18 Aug 2020 07:03:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7607D20738 for ; Tue, 18 Aug 2020 07:03:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="aeC7DZuS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726476AbgHRHDU (ORCPT ); Tue, 18 Aug 2020 03:03:20 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:5210 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726539AbgHRHDT (ORCPT ); Tue, 18 Aug 2020 03:03:19 -0400 Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07I73Isv005887 for ; Tue, 18 Aug 2020 00:03:19 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=Npk3GdRY9AeNBQyLoAMZ/zo8qHiGbF7qwAivLfb+2ww=; b=aeC7DZuSPWUVSZmImFKzowN+LWCUxCgjNPX3WHobm7GUY8bnz24Xo4mKxtjBR4pdoKNM rgjdy6giV79xFjSAEORnM9PpnwsxZn1TaA+Y0aOJ40hYtbkOJReMUWIUweCnnfhhxEJR DDF6KNzmFUUpkwWfJXBfd+RmVGJ7yEnLUv0= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 3304m2s70f-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 18 Aug 2020 00:03:19 -0700 Received: from intmgw005.03.ash8.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 18 Aug 2020 00:02:57 -0700 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id C9EEC62E54B8; Tue, 18 Aug 2020 00:02:50 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Song Liu Smtp-Origin-Hostname: devbig006.ftw2.facebook.com To: , , CC: , , , , Song Liu Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH 2/4] block: introduce part_[begin|end]_io_acct Date: Tue, 18 Aug 2020 00:02:36 -0700 Message-ID: <20200818070238.1323126-3-songliubraving@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200818070238.1323126-1-songliubraving@fb.com> References: <20200818070238.1323126-1-songliubraving@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-08-18_04:2020-08-18,2020-08-18 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxlogscore=748 impostorscore=0 mlxscore=0 bulkscore=0 suspectscore=0 spamscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 adultscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008180049 X-FB-Internal: deliver Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org These functions can be used to enable iostat for partitions on devices like md, bcache. Signed-off-by: Song Liu --- block/blk-core.c | 20 ++++++++++++++++---- include/linux/blkdev.h | 5 +++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 93104c7470e8a..6603f56804f41 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1455,10 +1455,9 @@ void blk_account_io_start(struct request *rq) part_stat_unlock(); } -unsigned long disk_start_io_acct(struct gendisk *disk, unsigned int sectors, +unsigned long part_start_io_acct(struct hd_struct *part, unsigned int sectors, unsigned int op) { - struct hd_struct *part = &disk->part0; const int sgrp = op_stat_group(op); unsigned long now = READ_ONCE(jiffies); @@ -1471,12 +1470,18 @@ unsigned long disk_start_io_acct(struct gendisk *disk, unsigned int sectors, return now; } +EXPORT_SYMBOL(part_start_io_acct); + +unsigned long disk_start_io_acct(struct gendisk *disk, unsigned int sectors, + unsigned int op) +{ + return part_start_io_acct(&disk->part0, sectors, op); +} EXPORT_SYMBOL(disk_start_io_acct); -void disk_end_io_acct(struct gendisk *disk, unsigned int op, +void part_end_io_acct(struct hd_struct *part, unsigned int op, unsigned long start_time) { - struct hd_struct *part = &disk->part0; const int sgrp = op_stat_group(op); unsigned long now = READ_ONCE(jiffies); unsigned long duration = now - start_time; @@ -1487,6 +1492,13 @@ void disk_end_io_acct(struct gendisk *disk, unsigned int op, part_stat_local_dec(part, in_flight[op_is_write(op)]); part_stat_unlock(); } +EXPORT_SYMBOL(part_end_io_acct); + +void disk_end_io_acct(struct gendisk *disk, unsigned int op, + unsigned long start_time) +{ + part_end_io_acct(&disk->part0, op, start_time); +} EXPORT_SYMBOL(disk_end_io_acct); /* diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 285b59cfc0646..894e55c91e1d8 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1931,6 +1931,11 @@ unsigned long disk_start_io_acct(struct gendisk *disk, unsigned int sectors, void disk_end_io_acct(struct gendisk *disk, unsigned int op, unsigned long start_time); +unsigned long part_start_io_acct(struct hd_struct *part, unsigned int sectors, + unsigned int op); +void part_end_io_acct(struct hd_struct *part, unsigned int op, + unsigned long start_time); + /** * bio_start_io_acct - start I/O accounting for bio based drivers * @bio: bio to start account for From patchwork Tue Aug 18 07:02:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 11720095 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 43D111575 for ; Tue, 18 Aug 2020 07:03:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C63E20658 for ; Tue, 18 Aug 2020 07:03:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="AoNwg+se" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726545AbgHRHDU (ORCPT ); Tue, 18 Aug 2020 03:03:20 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:4010 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726365AbgHRHDT (ORCPT ); Tue, 18 Aug 2020 03:03:19 -0400 Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07I73G6T029730 for ; Tue, 18 Aug 2020 00:03:19 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=Yy34D/NbA5LPKQ3e5rZPbBOItonCgnGr+j0WvmLVOwY=; b=AoNwg+se8uLbny9aeLy4XcddDBFQWfhZCzevuD8ByDTDTwL3hEQCgDV4HYKylE2CemXK Mdri/vIvo1+Fs9I88qkVwtKYZO6sF/ITbgyNkdo7vyfPEcuRACe9lUzMZMCFHTNEk1tN R1HO2PhHgL668Zg8hYb7hibxbY70L0I72WE= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 3304p7s6cj-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 18 Aug 2020 00:03:18 -0700 Received: from intmgw002.03.ash8.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 18 Aug 2020 00:02:57 -0700 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 76D5262E54B8; Tue, 18 Aug 2020 00:02:53 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Song Liu Smtp-Origin-Hostname: devbig006.ftw2.facebook.com To: , , CC: , , , , Song Liu Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH 3/4] md: use part_[begin|end]_io_acct instead of disk_[begin|end]_io_acct Date: Tue, 18 Aug 2020 00:02:37 -0700 Message-ID: <20200818070238.1323126-4-songliubraving@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200818070238.1323126-1-songliubraving@fb.com> References: <20200818070238.1323126-1-songliubraving@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-08-18_04:2020-08-18,2020-08-18 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 mlxlogscore=838 clxscore=1011 spamscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008180049 X-FB-Internal: deliver Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org This enables proper statistics in /proc/diskstats for md partitions. Signed-off-by: Song Liu --- drivers/md/md.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 6b511c9007d38..00ca65b206d13 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -470,6 +470,7 @@ struct md_io { bio_end_io_t *orig_bi_end_io; void *orig_bi_private; unsigned long start_time; + struct hd_struct *part; }; static void md_end_io(struct bio *bio) @@ -477,7 +478,8 @@ static void md_end_io(struct bio *bio) struct md_io *md_io = bio->bi_private; struct mddev *mddev = md_io->mddev; - disk_end_io_acct(mddev->gendisk, bio_op(bio), md_io->start_time); + part_end_io_acct(md_io->part, bio_op(bio), md_io->start_time); + hd_struct_put(md_io->part); bio->bi_end_io = md_io->orig_bi_end_io; bio->bi_private = md_io->orig_bi_private; @@ -523,7 +525,9 @@ static blk_qc_t md_submit_bio(struct bio *bio) bio->bi_end_io = md_end_io; bio->bi_private = md_io; - md_io->start_time = disk_start_io_acct(mddev->gendisk, + md_io->part = disk_map_sector_rcu(mddev->gendisk, + bio->bi_iter.bi_sector); + md_io->start_time = part_start_io_acct(md_io->part, bio_sectors(bio), bio_op(bio)); } From patchwork Tue Aug 18 07:02:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 11720101 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D9F7138C for ; Tue, 18 Aug 2020 07:03:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44CC820738 for ; Tue, 18 Aug 2020 07:03:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="MUWvJna4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726539AbgHRHDV (ORCPT ); Tue, 18 Aug 2020 03:03:21 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:10370 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726365AbgHRHDU (ORCPT ); Tue, 18 Aug 2020 03:03:20 -0400 Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07I73G6Z029730 for ; Tue, 18 Aug 2020 00:03:20 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=6svwYmWVS6qlnjaQ0Uq/91ijPhvKSVtvlS3GWpi/Kok=; b=MUWvJna4TJTRSklOK0gL5m47m/pYu/KjYbj84Wf5FG182DkXGQv1FmfeHSwTsaWKLz9s au2hwCzxa7gcLulCaj4gGnCgdyH3A68M1YAeeshekPHOsDW+BFC05SuAGNin6XfmkfIW oMQ8LD3X0xze+RWX7NF+BG8gFqvD9SW2Jk4= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 3304p7s6cj-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 18 Aug 2020 00:03:20 -0700 Received: from intmgw001.03.ash8.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 18 Aug 2020 00:03:04 -0700 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 89ACB62E54B8; Tue, 18 Aug 2020 00:02:56 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Song Liu Smtp-Origin-Hostname: devbig006.ftw2.facebook.com To: , , CC: , , , , Song Liu Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH 4/4] bcache: use part_[begin|end]_io_acct instead of disk_[begin|end]_io_acct Date: Tue, 18 Aug 2020 00:02:38 -0700 Message-ID: <20200818070238.1323126-5-songliubraving@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200818070238.1323126-1-songliubraving@fb.com> References: <20200818070238.1323126-1-songliubraving@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-08-18_04:2020-08-18,2020-08-18 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 mlxlogscore=851 clxscore=1015 spamscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008180049 X-FB-Internal: deliver Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org This enables proper statistics in /proc/diskstats for bcache partitions. Cc: Coly Li Signed-off-by: Song Liu Reviewed-by: Coly Li --- drivers/md/bcache/request.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 7de82c67597ce..1d946f601f7eb 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -475,6 +475,7 @@ struct search { unsigned int read_dirty_data:1; unsigned int cache_missed:1; + struct hd_struct *part; unsigned long start_time; struct btree_op op; @@ -669,7 +670,8 @@ static void bio_complete(struct search *s) { if (s->orig_bio) { /* Count on bcache device */ - disk_end_io_acct(s->d->disk, bio_op(s->orig_bio), s->start_time); + part_end_io_acct(s->part, bio_op(s->orig_bio), s->start_time); + hd_struct_put(s->part); trace_bcache_request_end(s->d, s->orig_bio); s->orig_bio->bi_status = s->iop.status; @@ -731,7 +733,8 @@ static inline struct search *search_alloc(struct bio *bio, s->write = op_is_write(bio_op(bio)); s->read_dirty_data = 0; /* Count on the bcache device */ - s->start_time = disk_start_io_acct(d->disk, bio_sectors(bio), bio_op(bio)); + s->part = disk_map_sector_rcu(d->disk, bio->bi_iter.bi_sector); + s->start_time = part_start_io_acct(s->part, bio_sectors(bio), bio_op(bio)); s->iop.c = d->c; s->iop.bio = NULL; s->iop.inode = d->id; @@ -1072,6 +1075,7 @@ struct detached_dev_io_private { unsigned long start_time; bio_end_io_t *bi_end_io; void *bi_private; + struct hd_struct *part; }; static void detached_dev_end_io(struct bio *bio) @@ -1083,7 +1087,8 @@ static void detached_dev_end_io(struct bio *bio) bio->bi_private = ddip->bi_private; /* Count on the bcache device */ - disk_end_io_acct(ddip->d->disk, bio_op(bio), ddip->start_time); + part_end_io_acct(ddip->part, bio_op(bio), ddip->start_time); + hd_struct_put(ddip->part); if (bio->bi_status) { struct cached_dev *dc = container_of(ddip->d, @@ -1109,7 +1114,8 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio) ddip = kzalloc(sizeof(struct detached_dev_io_private), GFP_NOIO); ddip->d = d; /* Count on the bcache device */ - ddip->start_time = disk_start_io_acct(d->disk, bio_sectors(bio), bio_op(bio)); + ddip->part = disk_map_sector_rcu(d->disk, bio->bi_iter.bi_sector); + ddip->start_time = part_start_io_acct(ddip->part, bio_sectors(bio), bio_op(bio)); ddip->bi_end_io = bio->bi_end_io; ddip->bi_private = bio->bi_private; bio->bi_end_io = detached_dev_end_io;