From patchwork Thu Aug 9 20:26:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10561899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C92AD14E2 for ; Thu, 9 Aug 2018 20:26:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B57012B9F4 for ; Thu, 9 Aug 2018 20:26:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A99182B9F7; Thu, 9 Aug 2018 20:26:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 230082B9EE for ; Thu, 9 Aug 2018 20:26:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727156AbeHIWxZ (ORCPT ); Thu, 9 Aug 2018 18:53:25 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:33854 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726890AbeHIWxZ (ORCPT ); Thu, 9 Aug 2018 18:53:25 -0400 Received: by mail-pg1-f196.google.com with SMTP id y5-v6so3278683pgv.1 for ; Thu, 09 Aug 2018 13:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Yz1xdTEm6iiPxkWjqWtovAUr4zTZSBDMxxiwCcpHkCc=; b=UwFAjD6XkLKsUYdx5RrhMYsvPrlmejc17xLgL7rrKjGDQZufBx4Nt6bI7SHjssKouK bjb354JUVUXeY2eS4hJJmztwZoQjq4CN7DkaB+iqGXM9yqYetkw2tzCqvg+o6955EAux Pf8cOgRRTPGmOQqU0Ld6ylrJHOzkYdr4E6qmIYPg+QdpDRTu4VrEdZywCjhjUZLfsm5L ZKfJpY0A8MC1OUBrmaBEnYvtOtU1y14aoYP6BWfB8rrQAP5BZQIFB8zF2JHakrOAwuFg SoBLpB3DmQ0AA72ro8xg2eEMevmED8dZ2+dp7dnerv3DF4nJ+vh0j9EOt/AtuivV7y5j UHKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Yz1xdTEm6iiPxkWjqWtovAUr4zTZSBDMxxiwCcpHkCc=; b=pFsMGTOv3pVU+M/7W+IZY+ic5Cv7/6DHW0ZOIZVScSjac8WVXDzVxY2EKw5HLXNrIs KYpYQh652fbN9GSmuZoYAursVddy4oFZ2vYw/u0FauZ+Vz9kQj8vhRgLfZ5iDbIvXzfh 8T0odIxGug86OPfjwyYo8C1uZtmkP4+o6JvEG3Dx0obrFuU3+U/BR+htHy8KQleFNEeb 3y97mAUj7k3WDrbyoX1PILmGe7ecUJVsf4eKWBGRheHvPwlq0OYvWsTwCN2UHkUVJqq2 cLbwImNClSHKYK3obdPoaw2cJb/EF7BzRDI6h5c2lKfOD31TNni3JnobSQyKSEY2MDUy 1CoQ== X-Gm-Message-State: AOUpUlFKsDJ+Mr867l95BXaVnoLmUV7y8mOy2hny6JTjN27yh2adkf70 0D55Yhscbn3JUZMn8m59F3dUoCaxCnk= X-Google-Smtp-Source: AA+uWPyFA/Z8ROYOinHrIzCwb8LwrJTHpkqZLjC8aRiplGq/Wv/vAdMRE0x1R6SCNVmvHgbXJp0jIw== X-Received: by 2002:a62:cd82:: with SMTP id o124-v6mr3852074pfg.206.1533846416214; Thu, 09 Aug 2018 13:26:56 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::4:dd24]) by smtp.gmail.com with ESMTPSA id u2-v6sm9841709pfn.59.2018.08.09.13.26.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 13:26:55 -0700 (PDT) From: Omar Sandoval To: linux-block@vger.kernel.org Cc: Jens Axboe , kernel-team@fb.com Subject: [RFC PATCH 1/5] block: move call of scheduler's ->completed_request() hook Date: Thu, 9 Aug 2018 13:26:43 -0700 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval Commit 4bc6339a583c ("block: move blk_stat_add() to __blk_mq_end_request()") consolidated some calls using ktime_get() so we'd only need to call it once. Kyber's ->completed_request() hook also calls ktime_get(), so let's move it to the same place, too. Signed-off-by: Omar Sandoval --- block/blk-mq-sched.h | 4 ++-- block/blk-mq.c | 5 +++-- block/kyber-iosched.c | 5 ++--- include/linux/elevator.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h index 0cb8f938dff9..74fb6ff9a30d 100644 --- a/block/blk-mq-sched.h +++ b/block/blk-mq-sched.h @@ -54,12 +54,12 @@ blk_mq_sched_allow_merge(struct request_queue *q, struct request *rq, return true; } -static inline void blk_mq_sched_completed_request(struct request *rq) +static inline void blk_mq_sched_completed_request(struct request *rq, u64 now) { struct elevator_queue *e = rq->q->elevator; if (e && e->type->ops.mq.completed_request) - e->type->ops.mq.completed_request(rq); + e->type->ops.mq.completed_request(rq, now); } static inline void blk_mq_sched_started_request(struct request *rq) diff --git a/block/blk-mq.c b/block/blk-mq.c index 654b0dc7e001..0c5be0001d0f 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -524,6 +524,9 @@ inline void __blk_mq_end_request(struct request *rq, blk_status_t error) blk_stat_add(rq, now); } + if (rq->internal_tag != -1) + blk_mq_sched_completed_request(rq, now); + blk_account_io_done(rq, now); if (rq->end_io) { @@ -560,8 +563,6 @@ static void __blk_mq_complete_request(struct request *rq) if (!blk_mq_mark_complete(rq)) return; - if (rq->internal_tag != -1) - blk_mq_sched_completed_request(rq); if (!test_bit(QUEUE_FLAG_SAME_COMP, &rq->q->queue_flags)) { rq->q->softirq_done_fn(rq); diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c index a1660bafc912..95d062c07c61 100644 --- a/block/kyber-iosched.c +++ b/block/kyber-iosched.c @@ -558,12 +558,12 @@ static void kyber_finish_request(struct request *rq) rq_clear_domain_token(kqd, rq); } -static void kyber_completed_request(struct request *rq) +static void kyber_completed_request(struct request *rq, u64 now) { struct request_queue *q = rq->q; struct kyber_queue_data *kqd = q->elevator->elevator_data; unsigned int sched_domain; - u64 now, latency, target; + u64 latency, target; /* * Check if this request met our latency goal. If not, quickly gather @@ -585,7 +585,6 @@ static void kyber_completed_request(struct request *rq) if (blk_stat_is_active(kqd->cb)) return; - now = ktime_get_ns(); if (now < rq->io_start_time_ns) return; diff --git a/include/linux/elevator.h b/include/linux/elevator.h index a02deea30185..015bb59c0331 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h @@ -111,7 +111,7 @@ struct elevator_mq_ops { void (*insert_requests)(struct blk_mq_hw_ctx *, struct list_head *, bool); struct request *(*dispatch_request)(struct blk_mq_hw_ctx *); bool (*has_work)(struct blk_mq_hw_ctx *); - void (*completed_request)(struct request *); + void (*completed_request)(struct request *, u64); void (*started_request)(struct request *); void (*requeue_request)(struct request *); struct request *(*former_request)(struct request_queue *, struct request *);