From patchwork Sat Sep 30 11:26:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9979419 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C8CBC6034B for ; Sat, 30 Sep 2017 11:32:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE7B229463 for ; Sat, 30 Sep 2017 11:32:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B27732946E; Sat, 30 Sep 2017 11:32:19 +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=-6.9 required=2.0 tests=BAYES_00,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 487B429463 for ; Sat, 30 Sep 2017 11:32:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752930AbdI3LcS (ORCPT ); Sat, 30 Sep 2017 07:32:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44782 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752872AbdI3LcR (ORCPT ); Sat, 30 Sep 2017 07:32:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7345281DFB; Sat, 30 Sep 2017 11:32:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7345281DFB Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=ming.lei@redhat.com Received: from localhost (ovpn-12-31.pek2.redhat.com [10.72.12.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B208612B1; Sat, 30 Sep 2017 11:32:05 +0000 (UTC) From: Ming Lei To: Jens Axboe , linux-block@vger.kernel.org, Christoph Hellwig , Mike Snitzer , dm-devel@redhat.com Cc: Bart Van Assche , Laurence Oberman , Paolo Valente , Oleksandr Natalenko , Tom Nguyen , linux-kernel@vger.kernel.org, Omar Sandoval , Ming Lei Subject: [PATCH V5 6/8] block: introduce .last_merge and .hash to blk_mq_ctx Date: Sat, 30 Sep 2017 19:26:53 +0800 Message-Id: <20170930112655.31451-7-ming.lei@redhat.com> In-Reply-To: <20170930112655.31451-1-ming.lei@redhat.com> References: <20170930112655.31451-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sat, 30 Sep 2017 11:32:17 +0000 (UTC) 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 Prepare for supporting bio merge to sw queue if no blk-mq io scheduler is taken. Tested-by: Oleksandr Natalenko Tested-by: Tom Nguyen Tested-by: Paolo Valente Signed-off-by: Ming Lei --- block/blk-mq.h | 4 ++++ block/blk.h | 3 +++ block/elevator.c | 22 +++++++++++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/block/blk-mq.h b/block/blk-mq.h index 5bca6ce1f01d..85ea8615fecf 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -18,6 +18,10 @@ struct blk_mq_ctx { unsigned long rq_dispatched[2]; unsigned long rq_merged; + /* bio merge via request hash table */ + struct request *last_merge; + DECLARE_HASHTABLE(hash, ELV_HASH_BITS); + /* incremented at completion time */ unsigned long ____cacheline_aligned_in_smp rq_completed[2]; diff --git a/block/blk.h b/block/blk.h index eb3436d4a73f..fa4f232afc18 100644 --- a/block/blk.h +++ b/block/blk.h @@ -198,6 +198,9 @@ static inline struct request *rqhash_find(struct hlist_head *hash, sector_t offs return NULL; } +enum elv_merge elv_merge_ctx(struct request_queue *q, struct request **req, + struct bio *bio, struct blk_mq_ctx *ctx); + void blk_insert_flush(struct request *rq); static inline struct request *__elv_next_request(struct request_queue *q) diff --git a/block/elevator.c b/block/elevator.c index 2424aea85393..0e13e5c18982 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -471,6 +471,13 @@ enum elv_merge elv_merge(struct request_queue *q, struct request **req, return __elv_merge(q, req, bio, q->elevator->hash, q->last_merge); } +enum elv_merge elv_merge_ctx(struct request_queue *q, struct request **req, + struct bio *bio, struct blk_mq_ctx *ctx) +{ + WARN_ON_ONCE(!q->mq_ops); + return __elv_merge(q, req, bio, ctx->hash, ctx->last_merge); +} + /* * Attempt to do an insertion back merge. Only check for the case where * we can append 'rq' to an existing request, so we can throw 'rq' away @@ -516,16 +523,25 @@ void elv_merged_request(struct request_queue *q, struct request *rq, enum elv_merge type) { struct elevator_queue *e = q->elevator; + struct hlist_head *hash = e->hash; + + /* we do bio merge on blk-mq sw queue */ + if (q->mq_ops && !e) { + rq->mq_ctx->last_merge = rq; + hash = rq->mq_ctx->hash; + goto reposition; + } + + q->last_merge = rq; if (e->uses_mq && e->type->ops.mq.request_merged) e->type->ops.mq.request_merged(q, rq, type); else if (!e->uses_mq && e->type->ops.sq.elevator_merged_fn) e->type->ops.sq.elevator_merged_fn(q, rq, type); + reposition: if (type == ELEVATOR_BACK_MERGE) - elv_rqhash_reposition(q, rq); - - q->last_merge = rq; + rqhash_reposition(hash, rq); } void elv_merge_requests(struct request_queue *q, struct request *rq,