From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 862EE225A35; Thu, 17 Jul 2025 20:58:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752785937; cv=none; b=UvjJtluzhX6zxOHr2+vU86JLv3byatD0N611faVVJ5WjlyGH0c8QXDdGHTEPI7yK7Iz7gYAhorL70uPDv1ZbUBIAXK5bDHZaC8jLAt5l7xG2jN7r9+9+smUQ/Ve8ic6MgPVsBtIbsQBwVrc1RMxQjXuyJQCmaVFkMm3JgpKYbEI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752785937; c=relaxed/simple; bh=AIifo+qyQw9zGuBxtRsm96dnw5E77vxdaaE9kfP0t7w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qkltMgYoYSL0n4bFA8T5jnI02GvMc0pbbm5QmSdp7jropoEl6jrsldV4yOv35lN8WoLraKxuEC6Y3HLc4jAJjIsOhTPsXB2Cz84uFUmC0YJz3EvGJe7WbWcqWXdWSx2sy1tUGeBUC4SyVCKL9H8Q3ypH8cPAg7wCxjzBepz33VA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org; spf=pass smtp.mailfrom=acm.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b=vgqIA6Ex; arc=none smtp.client-ip=199.89.3.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=acm.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b="vgqIA6Ex" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4bjldp4Z4qzm1748; Thu, 17 Jul 2025 20:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=acm.org; h= content-transfer-encoding:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received; s=mr01; t=1752785933; x=1755377934; bh=aSuYK WRtGtggHqTx8TDLjeA9b7hV/kwEt3nyLfDh808=; b=vgqIA6ExCiDV1EQTOUl1J SyHkiXB1i8nhX+OMZLKcgindXeHmOe4NDBP2Wk5p3pMsp7FW+CAEZk14tCo1Ea+Y wSF+SbeX3mT+EY71f7Fx3UtasBYzfu/aBFE5Pc2gGQQrPt5+9kcO1+ndzUoJWO+p aRemDtQQpzBqfgDNt6oQb+AVrb5lvZgywUGSVfuiD8FguSmuSEMz3H9SwMKJ1VLS HXzknwp3QMe94fAwS4bTi+ywe0vr4nHlp8ZZeZqpBkspIYoBIHALadq+KbrVgBET EJu30eaHXQQZwt5jDhFdoeyl7OZu+WYNGaXlXG6vgYL1EpFFcoZ02btJsfYz3sD7 g== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id Tc3e1PlE4Ub5; Thu, 17 Jul 2025 20:58:53 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bvanassche@acm.org) by 004.mia.mailroute.net (Postfix) with ESMTPSA id 4bjldj4995zm0yst; Thu, 17 Jul 2025 20:58:48 +0000 (UTC) From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, Christoph Hellwig , Damien Le Moal , Bart Van Assche Subject: [PATCH v21 05/12] blk-zoned: Move code from disk_zone_wplug_add_bio() into its caller Date: Thu, 17 Jul 2025 13:58:01 -0700 Message-ID: <20250717205808.3292926-6-bvanassche@acm.org> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog In-Reply-To: <20250717205808.3292926-1-bvanassche@acm.org> References: <20250717205808.3292926-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Move the following code into the only caller of disk_zone_wplug_add_bio()= : - The code for clearing the REQ_NOWAIT flag. - The code that sets the BLK_ZONE_WPLUG_PLUGGED flag. - The disk_zone_wplug_schedule_bio_work() call. No functionality has been changed. This patch prepares for zoned write pipelining by removing the code from disk_zone_wplug_add_bio() that does not apply to all zoned write pipelini= ng bio processing cases. Signed-off-by: Bart Van Assche --- block/blk-zoned.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/block/blk-zoned.c b/block/blk-zoned.c index d7bdc92bedae..8fe6e545f300 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -782,8 +782,6 @@ static inline void disk_zone_wplug_add_bio(struct gen= disk *disk, struct blk_zone_wplug *zwplug, struct bio *bio, unsigned int nr_segs) { - bool schedule_bio_work =3D false; - /* * Grab an extra reference on the BIO request queue usage counter. * This reference will be reused to submit a request for the BIO for @@ -799,16 +797,6 @@ static inline void disk_zone_wplug_add_bio(struct ge= ndisk *disk, */ bio_clear_polled(bio); =20 - /* - * REQ_NOWAIT BIOs are always handled using the zone write plug BIO - * work, which can block. So clear the REQ_NOWAIT flag and schedule the - * work if this is the first BIO we are plugging. - */ - if (bio->bi_opf & REQ_NOWAIT) { - schedule_bio_work =3D !(zwplug->flags & BLK_ZONE_WPLUG_PLUGGED); - bio->bi_opf &=3D ~REQ_NOWAIT; - } - /* * Reuse the poll cookie field to store the number of segments when * split to the hardware limits. @@ -824,11 +812,6 @@ static inline void disk_zone_wplug_add_bio(struct ge= ndisk *disk, bio_list_add(&zwplug->bio_list, bio); trace_disk_zone_wplug_add_bio(zwplug->disk->queue, zwplug->zone_no, bio->bi_iter.bi_sector, bio_sectors(bio)); - - zwplug->flags |=3D BLK_ZONE_WPLUG_PLUGGED; - - if (schedule_bio_work) - disk_zone_wplug_schedule_bio_work(disk, zwplug); } =20 /* @@ -993,6 +976,7 @@ static bool blk_zone_wplug_handle_write(struct bio *b= io, unsigned int nr_segs) { struct gendisk *disk =3D bio->bi_bdev->bd_disk; sector_t sector =3D bio->bi_iter.bi_sector; + bool schedule_bio_work =3D false; struct blk_zone_wplug *zwplug; gfp_t gfp_mask =3D GFP_NOIO; unsigned long flags; @@ -1039,12 +1023,16 @@ static bool blk_zone_wplug_handle_write(struct bi= o *bio, unsigned int nr_segs) * Add REQ_NOWAIT BIOs to the plug list to ensure that we will not see = a * BLK_STS_AGAIN failure if we let the BIO execute. */ - if (bio->bi_opf & REQ_NOWAIT) - goto plug; + if (bio->bi_opf & REQ_NOWAIT) { + bio->bi_opf &=3D ~REQ_NOWAIT; + if (!(zwplug->flags & BLK_ZONE_WPLUG_PLUGGED)) + goto plug; + goto add_to_bio_list; + } =20 /* If the zone is already plugged, add the BIO to the plug BIO list. */ if (zwplug->flags & BLK_ZONE_WPLUG_PLUGGED) - goto plug; + goto add_to_bio_list; =20 if (!blk_zone_wplug_prepare_bio(zwplug, bio)) { spin_unlock_irqrestore(&zwplug->lock, flags); @@ -1060,7 +1048,13 @@ static bool blk_zone_wplug_handle_write(struct bio= *bio, unsigned int nr_segs) return false; =20 plug: + zwplug->flags |=3D BLK_ZONE_WPLUG_PLUGGED; + schedule_bio_work =3D true; + +add_to_bio_list: disk_zone_wplug_add_bio(disk, zwplug, bio, nr_segs); + if (schedule_bio_work) + disk_zone_wplug_schedule_bio_work(disk, zwplug); =20 spin_unlock_irqrestore(&zwplug->lock, flags); =20