diff options
author | Jinlong Chen <nickyc975@zju.edu.cn> | 2022-10-20 08:48:19 +0200 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2022-10-23 18:59:17 -0600 |
commit | 8ed40ee35d94df2fdb56bbbc07e17dffd2383625 (patch) | |
tree | a75d555f4c1dad669ad055e21136ae6e79ccfe97 /block/elevator.c | |
parent | b54c2ad9b77de846e42104ecf94eb8329d2f03a3 (diff) |
block: fix up elevator_type refcounting
The current reference management logic of io scheduler modules contains
refcnt problems. For example, blk_mq_init_sched may fail before or after
the calling of e->ops.init_sched. If it fails before the calling, it does
nothing to the reference to the io scheduler module. But if it fails after
the calling, it releases the reference by calling kobject_put(&eq->kobj).
As the callers of blk_mq_init_sched can't know exactly where the failure
happens, they can't handle the reference to the io scheduler module
properly: releasing the reference on failure results in double-release if
blk_mq_init_sched has released it, and not releasing the reference results
in ghost reference if blk_mq_init_sched did not release it either.
The same problem also exists in io schedulers' init_sched implementations.
We can address the problem by adding releasing statements to the error
handling procedures of blk_mq_init_sched and init_sched implementations.
But that is counterintuitive and requires modifications to existing io
schedulers.
Instead, We make elevator_alloc get the io scheduler module references
that will be released by elevator_release. And then, we match each
elevator_get with an elevator_put. Therefore, each reference to an io
scheduler module explicitly has its own getter and releaser, and we no
longer need to worry about the refcnt problems.
The bugs and the patch can be validated with tools here:
https://github.com/nickyc975/linux_elv_refcnt_bug.git
[hch: split out a few bits into separate patches, use a non-try
module_get in elevator_alloc]
Signed-off-by: Jinlong Chen <nickyc975@zju.edu.cn>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20221020064819.1469928-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/elevator.c')
-rw-r--r-- | block/elevator.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/block/elevator.c b/block/elevator.c index 61d5655a3819..d26aa787e29f 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -165,6 +165,7 @@ struct elevator_queue *elevator_alloc(struct request_queue *q, if (unlikely(!eq)) return NULL; + __elevator_get(e); eq->type = e; kobject_init(&eq->kobj, &elv_ktype); mutex_init(&eq->sysfs_lock); @@ -704,8 +705,9 @@ void elevator_init_mq(struct request_queue *q) if (err) { pr_warn("\"%s\" elevator initialization failed, " "falling back to \"none\"\n", e->elevator_name); - elevator_put(e); } + + elevator_put(e); } /* @@ -737,6 +739,7 @@ int elevator_switch(struct request_queue *q, struct elevator_type *new_e) static int elevator_change(struct request_queue *q, const char *elevator_name) { struct elevator_type *e; + int ret; /* Make sure queue is not in the middle of being removed */ if (!blk_queue_registered(q)) @@ -757,8 +760,9 @@ static int elevator_change(struct request_queue *q, const char *elevator_name) e = elevator_get(q, elevator_name, true); if (!e) return -EINVAL; - - return elevator_switch(q, e); + ret = elevator_switch(q, e); + elevator_put(e); + return ret; } ssize_t elv_iosched_store(struct request_queue *q, const char *buf, |