Skip to content

Commit efed9a3

Browse files
osandovaxboe
authored andcommitted
kyber: fix out of bounds access when preempted
__blk_mq_sched_bio_merge() gets the ctx and hctx for the current CPU and passes the hctx to ->bio_merge(). kyber_bio_merge() then gets the ctx for the current CPU again and uses that to get the corresponding Kyber context in the passed hctx. However, the thread may be preempted between the two calls to blk_mq_get_ctx(), and the ctx returned the second time may no longer correspond to the passed hctx. This "works" accidentally most of the time, but it can cause us to read garbage if the second ctx came from an hctx with more ctx's than the first one (i.e., if ctx->index_hw[hctx->type] > hctx->nr_ctx). This manifested as this UBSAN array index out of bounds error reported by Jakub: UBSAN: array-index-out-of-bounds in ../kernel/locking/qspinlock.c:130:9 index 13106 is out of range for type 'long unsigned int [128]' Call Trace: dump_stack+0xa4/0xe5 ubsan_epilogue+0x5/0x40 __ubsan_handle_out_of_bounds.cold.13+0x2a/0x34 queued_spin_lock_slowpath+0x476/0x480 do_raw_spin_lock+0x1c2/0x1d0 kyber_bio_merge+0x112/0x180 blk_mq_submit_bio+0x1f5/0x1100 submit_bio_noacct+0x7b0/0x870 submit_bio+0xc2/0x3a0 btrfs_map_bio+0x4f0/0x9d0 btrfs_submit_data_bio+0x24e/0x310 submit_one_bio+0x7f/0xb0 submit_extent_page+0xc4/0x440 __extent_writepage_io+0x2b8/0x5e0 __extent_writepage+0x28d/0x6e0 extent_write_cache_pages+0x4d7/0x7a0 extent_writepages+0xa2/0x110 do_writepages+0x8f/0x180 __writeback_single_inode+0x99/0x7f0 writeback_sb_inodes+0x34e/0x790 __writeback_inodes_wb+0x9e/0x120 wb_writeback+0x4d2/0x660 wb_workfn+0x64d/0xa10 process_one_work+0x53a/0xa80 worker_thread+0x69/0x5b0 kthread+0x20b/0x240 ret_from_fork+0x1f/0x30 Only Kyber uses the hctx, so fix it by passing the request_queue to ->bio_merge() instead. BFQ and mq-deadline just use that, and Kyber can map the queues itself to avoid the mismatch. Fixes: a608884 ("block: kyber: make kyber more friendly with merging") Reported-by: Jakub Kicinski <[email protected]> Signed-off-by: Omar Sandoval <[email protected]> Link: https://lore.kernel.org/r/c7598605401a48d5cfeadebb678abd10af22b83f.1620691329.git.osandov@fb.com Signed-off-by: Jens Axboe <[email protected]>
1 parent 63c8af5 commit efed9a3

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

block/bfq-iosched.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2263,10 +2263,9 @@ static void bfq_remove_request(struct request_queue *q,
22632263

22642264
}
22652265

2266-
static bool bfq_bio_merge(struct blk_mq_hw_ctx *hctx, struct bio *bio,
2266+
static bool bfq_bio_merge(struct request_queue *q, struct bio *bio,
22672267
unsigned int nr_segs)
22682268
{
2269-
struct request_queue *q = hctx->queue;
22702269
struct bfq_data *bfqd = q->elevator->elevator_data;
22712270
struct request *free = NULL;
22722271
/*

block/blk-mq-sched.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,14 +358,16 @@ bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio,
358358
unsigned int nr_segs)
359359
{
360360
struct elevator_queue *e = q->elevator;
361-
struct blk_mq_ctx *ctx = blk_mq_get_ctx(q);
362-
struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, bio->bi_opf, ctx);
361+
struct blk_mq_ctx *ctx;
362+
struct blk_mq_hw_ctx *hctx;
363363
bool ret = false;
364364
enum hctx_type type;
365365

366366
if (e && e->type->ops.bio_merge)
367-
return e->type->ops.bio_merge(hctx, bio, nr_segs);
367+
return e->type->ops.bio_merge(q, bio, nr_segs);
368368

369+
ctx = blk_mq_get_ctx(q);
370+
hctx = blk_mq_map_queue(q, bio->bi_opf, ctx);
369371
type = hctx->type;
370372
if (!(hctx->flags & BLK_MQ_F_SHOULD_MERGE) ||
371373
list_empty_careful(&ctx->rq_lists[type]))

block/kyber-iosched.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,11 +561,12 @@ static void kyber_limit_depth(unsigned int op, struct blk_mq_alloc_data *data)
561561
}
562562
}
563563

564-
static bool kyber_bio_merge(struct blk_mq_hw_ctx *hctx, struct bio *bio,
564+
static bool kyber_bio_merge(struct request_queue *q, struct bio *bio,
565565
unsigned int nr_segs)
566566
{
567+
struct blk_mq_ctx *ctx = blk_mq_get_ctx(q);
568+
struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, bio->bi_opf, ctx);
567569
struct kyber_hctx_data *khd = hctx->sched_data;
568-
struct blk_mq_ctx *ctx = blk_mq_get_ctx(hctx->queue);
569570
struct kyber_ctx_queue *kcq = &khd->kcqs[ctx->index_hw[hctx->type]];
570571
unsigned int sched_domain = kyber_sched_domain(bio->bi_opf);
571572
struct list_head *rq_list = &kcq->rq_list[sched_domain];

block/mq-deadline.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,10 +461,9 @@ static int dd_request_merge(struct request_queue *q, struct request **rq,
461461
return ELEVATOR_NO_MERGE;
462462
}
463463

464-
static bool dd_bio_merge(struct blk_mq_hw_ctx *hctx, struct bio *bio,
464+
static bool dd_bio_merge(struct request_queue *q, struct bio *bio,
465465
unsigned int nr_segs)
466466
{
467-
struct request_queue *q = hctx->queue;
468467
struct deadline_data *dd = q->elevator->elevator_data;
469468
struct request *free = NULL;
470469
bool ret;

include/linux/elevator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct elevator_mq_ops {
3434
void (*depth_updated)(struct blk_mq_hw_ctx *);
3535

3636
bool (*allow_merge)(struct request_queue *, struct request *, struct bio *);
37-
bool (*bio_merge)(struct blk_mq_hw_ctx *, struct bio *, unsigned int);
37+
bool (*bio_merge)(struct request_queue *, struct bio *, unsigned int);
3838
int (*request_merge)(struct request_queue *q, struct request **, struct bio *);
3939
void (*request_merged)(struct request_queue *, struct request *, enum elv_merge);
4040
void (*requests_merged)(struct request_queue *, struct request *, struct request *);

0 commit comments

Comments
 (0)