block: Ignore REQ_NOWAIT for zone reset and zone finish operations

commit 5eb3317aa5a2ffe4574ab1a12cf9bc9447ca26c0 upstream.

There are currently any issuer of REQ_OP_ZONE_RESET and
REQ_OP_ZONE_FINISH operations that set REQ_NOWAIT. However, as we cannot
handle this flag correctly due to the potential request allocation
failure that may happen in blk_mq_submit_bio() after blk_zone_plug_bio()
has handled the zone write plug write pointer updates for the targeted
zones, modify blk_zone_wplug_handle_reset_or_finish() to warn if this
flag is set and ignore it.

Fixes: dd291d77cc90 ("block: Introduce zone write plugging")
Cc: stable@vger.kernel.org
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20241209122357.47838-3-dlemoal@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 185f37c72d6a72e918dace5871495ba21112d10d..6d21693f39b782546a32482e371790e9265be99d 100644 (file)
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -703,6 +703,15 @@ static bool blk_zone_wplug_handle_reset_or_finish(struct bio *bio,
                return true;
        }
 
+       /*
+        * No-wait reset or finish BIOs do not make much sense as the callers
+        * issue these as blocking operations in most cases. To avoid issues
+        * the BIO execution potentially failing with BLK_STS_AGAIN, warn about
+        * REQ_NOWAIT being set and ignore that flag.
+        */
+       if (WARN_ON_ONCE(bio->bi_opf & REQ_NOWAIT))
+               bio->bi_opf &= ~REQ_NOWAIT;
+
        /*
         * If we have a zone write plug, set its write pointer offset to 0
         * (reset case) or to the zone size (finish case). This will abort all