Received: by 2002:a05:6a10:6006:0:0:0:0 with SMTP id w6csp891530pxa; Thu, 27 Aug 2020 19:58:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9SUhqEgckJ1HS7IaNJzBPR2a48EZCOG0UHyEX3heRqDZDZi5gosApbPi2mz3p6bUMhOvq X-Received: by 2002:aa7:df0f:: with SMTP id c15mr19843775edy.293.1598583501919; Thu, 27 Aug 2020 19:58:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598583501; cv=none; d=google.com; s=arc-20160816; b=lLs/Fo0GqKdLg3Kg9U5PH1EQ9pIGJrLUo73hITU4XSUMrScOOW7mzI3QpgKQ+Kdz6A l1WjOqqyeC6Kgvy3MjBcByafN8XMueR31JnpgBEysU8TN1DmFLxdcbQgEFznQJRJwcYG T/tvhf2YExg0bX9A8LNnARppiQ5e/VO6jwHLEYYdkZySoK+fScvyNv4QncSsotamDfQP 6RsZ0A8DA9MXH0eZM4/4TBkRb/7W3Mj8BmhiAdidI+bNXFn5EFapjnM3JXz01Na1bfLP Pu3Ksvb8M1HuOKjZMYVzAe/cb4WSZtUGQQkkyAllJxIuFwDpHDN3qNDgYiiT4jPY2cz8 60jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from; bh=0ZTewvtLXxARAdUQGLYPinypHIJtlVGfLof0/sik+n0=; b=cWGk3K4JUhzFFFLsyzmScHk45W6/ELVX9USBHQu7u7bjWGZY9et7rYpedeelA3+dQW PAVfEt0gJkS2f/wKigNwSN4ZNBZ3m3o/WXkQTjV8atoCmBJG6m8la4rMAll/xy7Dz//5 0oBKQlAmC1pfx8tLbz1DlAJGH2NrjzCe4g55Y2r5x5lmG1TjqdBgyGo9Ftpz1HmnXRiE mfMcfNIRf98IVbCaKwEdrJ1gPn4C1491Nb9GWPV6VG5k4YWBIUz36OOxIr6wbWvhdoxZ sYpdaTTUCqssoOd5V+FXVFkg331hPVea51hP9skxHOH6ihab1Kfi4ldmru3oVYuXmoqJ BrZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v6si2784081ejc.37.2020.08.27.19.57.59; Thu, 27 Aug 2020 19:58:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728233AbgH1CyO (ORCPT + 99 others); Thu, 27 Aug 2020 22:54:14 -0400 Received: from out30-54.freemail.mail.aliyun.com ([115.124.30.54]:57789 "EHLO out30-54.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726854AbgH1CyN (ORCPT ); Thu, 27 Aug 2020 22:54:13 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e01358;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0U73Jfo7_1598583197; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0U73Jfo7_1598583197) by smtp.aliyun-inc.com(127.0.0.1); Fri, 28 Aug 2020 10:53:17 +0800 From: Baolin Wang To: axboe@kernel.dk Cc: ming.lei@redhat.com, hch@lst.de, baolin.wang@linux.alibaba.com, baolin.wang7@gmail.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/4] block: Remove blk_mq_attempt_merge() function Date: Fri, 28 Aug 2020 10:52:57 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The small blk_mq_attempt_merge() function is only called by __blk_mq_sched_bio_merge(), just open code it. Signed-off-by: Baolin Wang Reviewed-by: Christoph Hellwig --- block/blk-mq-sched.c | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 94db0c9..205d971 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -391,28 +391,6 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, } EXPORT_SYMBOL_GPL(blk_mq_sched_try_merge); -/* - * Reverse check our software queue for entries that we could potentially - * merge with. Currently includes a hand-wavy stop count of 8, to not spend - * too much time checking for merges. - */ -static bool blk_mq_attempt_merge(struct request_queue *q, - struct blk_mq_hw_ctx *hctx, - struct blk_mq_ctx *ctx, struct bio *bio, - unsigned int nr_segs) -{ - enum hctx_type type = hctx->type; - - lockdep_assert_held(&ctx->lock); - - if (blk_bio_list_merge(q, &ctx->rq_lists[type], bio, nr_segs)) { - ctx->rq_merged++; - return true; - } - - return false; -} - bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio, unsigned int nr_segs) { @@ -426,14 +404,24 @@ bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio, return e->type->ops.bio_merge(hctx, bio, nr_segs); type = hctx->type; - if ((hctx->flags & BLK_MQ_F_SHOULD_MERGE) && - !list_empty_careful(&ctx->rq_lists[type])) { - /* default per sw-queue merge */ - spin_lock(&ctx->lock); - ret = blk_mq_attempt_merge(q, hctx, ctx, bio, nr_segs); - spin_unlock(&ctx->lock); + if (!(hctx->flags & BLK_MQ_F_SHOULD_MERGE) || + list_empty_careful(&ctx->rq_lists[type])) + return false; + + /* default per sw-queue merge */ + spin_lock(&ctx->lock); + /* + * Reverse check our software queue for entries that we could + * potentially merge with. Currently includes a hand-wavy stop + * count of 8, to not spend too much time checking for merges. + */ + if (blk_bio_list_merge(q, &ctx->rq_lists[type], bio, nr_segs)) { + ctx->rq_merged++; + ret = true; } + spin_unlock(&ctx->lock); + return ret; } -- 1.8.3.1