UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: add a sanity check for non-write flush/fua bios 

Check that the PREFUSH and FUA flags are only set on write bios,
given that the flush state machine expects that.

[Damien] The check is also extended to REQ_OP_ZONE_APPEND operations as
these are data write operations used by btrfs and zonefs and may also
have the REQ_FUA bit set.

Reported-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
This commit is contained in:
Christoph Hellwig 2022-11-02 00:09:03 -07:00 committed by Damien Le Moal
parent 002c487119
commit b4a6bb3a67
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block/blk-core.c
View File

@ -744,12 +744,16 @@ void submit_bio_noacct(struct bio *bio)
* Filter flush bio's early so that bio based drivers without flush * Filter flush bio's early so that bio based drivers without flush
* support don't have to worry about them. * support don't have to worry about them.
*/ */
if (op_is_flush(bio->bi_opf) && if (op_is_flush(bio->bi_opf)) {
!test_bit(QUEUE_FLAG_WC, &q->queue_flags)) { if (WARN_ON_ONCE(bio_op(bio) != REQ_OP_WRITE &&
bio->bi_opf &= ~(REQ_PREFLUSH | REQ_FUA); bio_op(bio) != REQ_OP_ZONE_APPEND))
if (!bio_sectors(bio)) {
status = BLK_STS_OK;
goto end_io; goto end_io;
if (!test_bit(QUEUE_FLAG_WC, &q->queue_flags)) {
bio->bi_opf &= ~(REQ_PREFLUSH | REQ_FUA);
if (!bio_sectors(bio)) {
status = BLK_STS_OK;
goto end_io;
}
} }
} }