From patchwork Thu Jun 29 11:03:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 114281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9576255vqr; Thu, 29 Jun 2023 04:49:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlH2jNVwjum+giO56QQeGqGRhSJtuBWAWNWSh0pwrrIKOKYvD7APXLbA75y8NZQ+dH+ZpIP5 X-Received: by 2002:a17:90b:3c83:b0:263:5c30:2cf8 with SMTP id pv3-20020a17090b3c8300b002635c302cf8mr1491901pjb.0.1688039384669; Thu, 29 Jun 2023 04:49:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688039384; cv=none; d=google.com; s=arc-20160816; b=IOOm6Uoi8gp8nQxYGchRSN45NPi3HvuDHkZSItI31T/dRY4Hzfh+llRluye17ySd0A 9cmwHlbouv7x79G4J+9U4ZC2A81JG4sK5W+d1DNQgDi5iwV0dn5aAHGmsYqatS2GsZ0w URMreeMQQWBs6+npAvxVrD0rImNqiT1QyT3yTm9IwNy/wDhLok45zwm3ippAOA1VuT1r 2AJ8AyvvKbOvx/siAvfceC4SiYm5zft+tAAwsrUpNxrYO9iUDh1OT9yADL42F5i6GW3M dxjxEwDb+JnEYlyphHRXlcxbOALLUuW4NwCFT/5eRMoOJBJKRsWpiPZoty9ROg9VZ8mv h2OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hdKaqogn/I3BFaAaWb1R9T3dUmGgvZb8Wo54xKMjRbQ=; fh=jVO2EC1fXvr6Bl8+7yHtFIrYqo7iQ9dvd55sFdmq7po=; b=ily0yIwQ7aAmtUG42dVeCO/ejDdcOzA7SgNjz3Yh/yXVIZ9NGvy8qazcBAxwzv++s8 SafrinYytU6Tdln83k8RnMA/SkRLHYjBeLQgHKpHTVuvP/3pgZnrPmAs9s5jW31zpUO+ Vl9xPoUCPb0PMuaV91n6KzL8jJ1u1+kb0tyRjRaD6NRj6EAh3fi053REhtdJW9Wzppwe oTj0xS+muJx/FMlDOggWfK6dDPT+wrYChJ94LYIddOAU83caAFHr+bHizTfo25E0aR2i EOwUKJ9F+2PewRYX8gSZdRKlst44dlTSiVRUyMlxmp+tYNEC8aH+yq1wEqYpGHK8hddB fjMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=Silj4Fte; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y13-20020a17090aca8d00b0025e81971635si12799290pjt.24.2023.06.29.04.49.28; Thu, 29 Jun 2023 04:49:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=Silj4Fte; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232292AbjF2LHq (ORCPT + 99 others); Thu, 29 Jun 2023 07:07:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232197AbjF2LHW (ORCPT ); Thu, 29 Jun 2023 07:07:22 -0400 Received: from out-52.mta1.migadu.com (out-52.mta1.migadu.com [95.215.58.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C0B11FCB for ; Thu, 29 Jun 2023 04:07:20 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1688036839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hdKaqogn/I3BFaAaWb1R9T3dUmGgvZb8Wo54xKMjRbQ=; b=Silj4FteQiWcNtz1G5WBCi+kTB4VQErkWfbaa7zSefq9ofMpCw2enGXVGq1vM3jhZTLgFn NEpX1/qmz+ji/HU91h7L4sqAwSCrqyD+NBNJCJer5WZU0VA0mzEShHlAz39RAbTxvuJ6UF SZ1nj4EpaWnZkhJ282cITiMpW021VZQ= From: chengming.zhou@linux.dev To: axboe@kernel.dk, ming.lei@redhat.com, hch@lst.de, tj@kernel.org Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Chengming Zhou Subject: [PATCH v2 3/4] blk-flush: reuse rq queuelist in flush state machine Date: Thu, 29 Jun 2023 19:03:58 +0800 Message-Id: <20230629110359.1111832-4-chengming.zhou@linux.dev> In-Reply-To: <20230629110359.1111832-1-chengming.zhou@linux.dev> References: <20230629110359.1111832-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770037586198173364?= X-GMAIL-MSGID: =?utf-8?q?1770037586198173364?= From: Chengming Zhou Since we don't need to maintain inflight flush_data requests list anymore, we can reuse rq->queuelist for flush pending list. This patch decrease the size of struct request by 16 bytes. Signed-off-by: Chengming Zhou Reviewed-by: Christoph Hellwig --- block/blk-flush.c | 12 +++++------- include/linux/blk-mq.h | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/block/blk-flush.c b/block/blk-flush.c index bb7adfc2a5da..81588edbe8b0 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -183,14 +183,13 @@ static void blk_flush_complete_seq(struct request *rq, /* queue for flush */ if (list_empty(pending)) fq->flush_pending_since = jiffies; - list_move_tail(&rq->flush.list, pending); + list_move_tail(&rq->queuelist, pending); break; case REQ_FSEQ_DATA: - list_del_init(&rq->flush.list); fq->flush_data_in_flight++; spin_lock(&q->requeue_lock); - list_add_tail(&rq->queuelist, &q->flush_list); + list_move_tail(&rq->queuelist, &q->flush_list); spin_unlock(&q->requeue_lock); blk_mq_kick_requeue_list(q); break; @@ -202,7 +201,7 @@ static void blk_flush_complete_seq(struct request *rq, * flush data request completion path. Restore @rq for * normal completion and end it. */ - list_del_init(&rq->flush.list); + list_del_init(&rq->queuelist); blk_flush_restore_request(rq); blk_mq_end_request(rq, error); break; @@ -258,7 +257,7 @@ static enum rq_end_io_ret flush_end_io(struct request *flush_rq, fq->flush_running_idx ^= 1; /* and push the waiting requests to the next stage */ - list_for_each_entry_safe(rq, n, running, flush.list) { + list_for_each_entry_safe(rq, n, running, queuelist) { unsigned int seq = blk_flush_cur_seq(rq); BUG_ON(seq != REQ_FSEQ_PREFLUSH && seq != REQ_FSEQ_POSTFLUSH); @@ -292,7 +291,7 @@ static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq, { struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx]; struct request *first_rq = - list_first_entry(pending, struct request, flush.list); + list_first_entry(pending, struct request, queuelist); struct request *flush_rq = fq->flush_rq; /* C1 described at the top of this file */ @@ -386,7 +385,6 @@ static enum rq_end_io_ret mq_flush_data_end_io(struct request *rq, static void blk_rq_init_flush(struct request *rq) { rq->flush.seq = 0; - INIT_LIST_HEAD(&rq->flush.list); rq->rq_flags |= RQF_FLUSH_SEQ; rq->flush.saved_end_io = rq->end_io; /* Usually NULL */ rq->end_io = mq_flush_data_end_io; diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 070551197c0e..96644d6f8d18 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -178,7 +178,6 @@ struct request { struct { unsigned int seq; - struct list_head list; rq_end_io_fn *saved_end_io; } flush;