]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
blk-crypto: fix missing blktrace bio split events
authorYu Kuai <yukuai3@huawei.com>
Wed, 10 Sep 2025 06:30:45 +0000 (14:30 +0800)
committerJens Axboe <axboe@kernel.dk>
Wed, 10 Sep 2025 11:23:45 +0000 (05:23 -0600)
trace_block_split() is missing, resulting in blktrace inability to catch
BIO split events and making it harder to analyze the BIO sequence.

Cc: stable@vger.kernel.org
Fixes: 488f6682c832 ("block: blk-crypto-fallback for Inline Encryption")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-crypto-fallback.c

index dbc2d8784dab936e8839b4f2d64bcdae9463b8d6..27fa1ec4b26491f3cde96f0938a2f3e961b9827d 100644 (file)
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/random.h>
 #include <linux/scatterlist.h>
+#include <trace/events/block.h>
 
 #include "blk-cgroup.h"
 #include "blk-crypto-internal.h"
@@ -230,7 +231,9 @@ static bool blk_crypto_fallback_split_bio_if_needed(struct bio **bio_ptr)
                        bio->bi_status = BLK_STS_RESOURCE;
                        return false;
                }
+
                bio_chain(split_bio, bio);
+               trace_block_split(split_bio, bio->bi_iter.bi_sector);
                submit_bio_noacct(bio);
                *bio_ptr = split_bio;
        }