From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mail19.linbit.com (LINBIT Mail Daemon) with ESMTP id 0D82B4206CD for ; Mon, 12 Oct 2020 17:43:07 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id z22so14020686wmi.0 for ; Mon, 12 Oct 2020 08:43:07 -0700 (PDT) Received: from soda.linbit (62-99-137-214.static.upcbusiness.at. [62.99.137.214]) by smtp.gmail.com with ESMTPSA id q4sm24846569wru.65.2020.10.12.08.43.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Oct 2020 08:43:07 -0700 (PDT) Resent-Message-ID: <20201012154305.GW2116@soda.linbit> Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by mail19.linbit.com (LINBIT Mail Daemon) with ESMTP id 8855E4203EE for ; Wed, 8 Jul 2020 09:59:29 +0200 (CEST) Received: by mail-ej1-f65.google.com with SMTP id p20so49309210ejd.13 for ; Wed, 08 Jul 2020 00:59:29 -0700 (PDT) From: Guoqing Jiang To: axboe@kernel.dk Message-Id: <20200708075819.4531-4-guoqing.jiang@cloud.ionos.com> In-Reply-To: <20200708075819.4531-1-guoqing.jiang@cloud.ionos.com> References: <20200708075819.4531-1-guoqing.jiang@cloud.ionos.com> Cc: linux-block@vger.kernel.org, Guoqing Jiang , Philipp Reisner , Lars Ellenberg , drbd-dev@lists.linbit.com Subject: [Drbd-dev] [PATCH RFC 3/5] drbd: rename start_jif to start_ns List-Id: "*Coordination* of development, patches, contributions -- *Questions* \(even to developers\) go to drbd-user, please." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Mon, 12 Oct 2020 15:43:45 -0000 Let's rename start_jif to start_ns to reflect that bio_start_io_acct returns ns presicion now. Cc: Philipp Reisner Cc: Lars Ellenberg Cc: drbd-dev@lists.linbit.com Signed-off-by: Guoqing Jiang --- drivers/block/drbd/drbd_debugfs.c | 8 ++++---- drivers/block/drbd/drbd_int.h | 2 +- drivers/block/drbd/drbd_req.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/block/drbd/drbd_debugfs.c b/drivers/block/drbd/drbd_debugfs.c index b3b9cd5628fd..672fd7e6587d 100644 --- a/drivers/block/drbd/drbd_debugfs.c +++ b/drivers/block/drbd/drbd_debugfs.c @@ -105,7 +105,7 @@ static void seq_print_one_request(struct seq_file *m, struct drbd_request *req, (s & RQ_WRITE) ? "W" : "R"); #define RQ_HDR_2 "\tstart\tin AL\tsubmit" - seq_printf(m, "\t%d", jiffies_to_msecs(now - req->start_jif)); + seq_printf(m, "\t%llu", (ktime_get_ns() - req->start_ns) / NSEC_PER_MSEC); seq_print_age_or_dash(m, s & RQ_IN_ACT_LOG, now - req->in_actlog_jif); seq_print_age_or_dash(m, s & RQ_LOCAL_PENDING, now - req->pre_submit_jif); @@ -161,7 +161,7 @@ static void seq_print_waiting_for_AL(struct seq_file *m, struct drbd_resource *r seq_puts(m, "minor\tvnr\tage\t#waiting\n"); rcu_read_lock(); idr_for_each_entry(&resource->devices, device, i) { - unsigned long jif; + unsigned long ns; struct drbd_request *req; int n = atomic_read(&device->ap_actlog_cnt); if (n) { @@ -171,7 +171,7 @@ static void seq_print_waiting_for_AL(struct seq_file *m, struct drbd_resource *r /* if the oldest request does not wait for the activity log * it is not interesting for us here */ if (req && !(req->rq_state & RQ_IN_ACT_LOG)) - jif = req->start_jif; + ns = req->start_ns; else req = NULL; spin_unlock_irq(&device->resource->req_lock); @@ -179,7 +179,7 @@ static void seq_print_waiting_for_AL(struct seq_file *m, struct drbd_resource *r if (n) { seq_printf(m, "%u\t%u\t", device->minor, device->vnr); if (req) - seq_printf(m, "%u\t", jiffies_to_msecs(now - jif)); + seq_printf(m, "%llu\t", (ktime_get_ns() - ns) / NSEC_PER_MSEC); else seq_puts(m, "-\t"); seq_printf(m, "%u\n", n); diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index aacd2010b555..467d96316230 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -301,7 +301,7 @@ struct drbd_request { struct list_head req_pending_local; /* for generic IO accounting */ - unsigned long start_jif; + unsigned long start_ns; /* for DRBD internal statistics */ diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index f705128b4f27..6ad6b4470ebd 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -245,7 +245,7 @@ void drbd_req_complete(struct drbd_request *req, struct bio_and_error *m) start_new_tl_epoch(first_peer_device(device)->connection); /* Update disk stats */ - bio_end_io_acct(req->master_bio, req->start_jif); + bio_end_io_acct(req->master_bio, req->start_ns); /* If READ failed, * have it be pushed back to the retry work queue, @@ -1206,7 +1206,7 @@ drbd_request_prepare(struct drbd_device *device, struct bio *bio) } /* Update disk stats */ - req->start_jif = bio_start_io_acct(req->master_bio); + req->start_ns = bio_start_io_acct(req->master_bio); if (!get_ldev(device)) { bio_put(req->private_bio); -- 2.17.1