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;