block: Fix handling of non-empty flush write requests to zones
authorDamien Le Moal <dlemoal@kernel.org>
Wed, 1 May 2024 11:09:02 +0000 (20:09 +0900)
committerJens Axboe <axboe@kernel.dk>
Wed, 1 May 2024 14:08:43 +0000 (08:08 -0600)
commit096bc7ea335bc5dfbaed1d005ff27f008ec9d710
tree8393c99e90fdac1e4c5102704ce956b46c0235c9
parentaf147b740f111730c2e387ee6c0ac3ada7d51117
block: Fix handling of non-empty flush write requests to zones

Zone write plugging ignores empty (no data) flush operations but handles
flush BIOs that have data to ensure that the flush machinery generated
write is processed in order. However, the call to
blk_zone_write_plug_attempt_merge() which sets a request
RQF_ZONE_WRITE_PLUGGING flag is called after blk_insert_flush(), thus
missing indicating that a non empty flush request completion needs
handling by zone write plugging.

Fix this by moving the call to blk_zone_write_plug_attempt_merge()
before blk_insert_flush(). And while at it, rename that function as
blk_zone_write_plug_init_request() to be clear that it is not just about
merging plugged BIOs in the request. While at it, also add a WARN_ONCE()
check that the zone write plug for the request is not NULL.

Fixes: dd291d77cc90 ("block: Introduce zone write plugging")
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20240501110907.96950-10-dlemoal@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-mq.c
block/blk-zoned.c
block/blk.h