GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

null_blk: fix memory leak on cleanup

Browse source 
Driver was not freeing the memory allocated for internal nullb queues.
This patch frees the memory during driver unload.

Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Matias Bjørling 2015-08-31 14:17:18 +02:00 • committed by Jens Axboe
parent 5014c311ba
commit de65d2d26f
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
drivers/block/null_blk.c
View file

@ -406,6 +406,22 @@ static struct blk_mq_ops null_mq_ops = {
.complete = null_softirq_done_fn, .complete = null_softirq_done_fn,
}; };
static void cleanup_queue(struct nullb_queue *nq)
{
kfree(nq->tag_map);
kfree(nq->cmds);
}
static void cleanup_queues(struct nullb *nullb)
{
int i;
for (i = 0; i < nullb->nr_queues; i++)
cleanup_queue(&nullb->queues[i]);
kfree(nullb->queues);
}
static void null_del_dev(struct nullb *nullb) static void null_del_dev(struct nullb *nullb)
{ {
list_del_init(&nullb->list); list_del_init(&nullb->list);
@ -415,6 +431,7 @@ static void null_del_dev(struct nullb *nullb)
if (queue_mode == NULL_Q_MQ) if (queue_mode == NULL_Q_MQ)
blk_mq_free_tag_set(&nullb->tag_set); blk_mq_free_tag_set(&nullb->tag_set);
put_disk(nullb->disk); put_disk(nullb->disk);
cleanup_queues(nullb);
kfree(nullb); kfree(nullb);
} }
@ -459,22 +476,6 @@ static int setup_commands(struct nullb_queue *nq)
return 0; return 0;
} }
static void cleanup_queue(struct nullb_queue *nq)
{
kfree(nq->tag_map);
kfree(nq->cmds);
}
static void cleanup_queues(struct nullb *nullb)
{
int i;
for (i = 0; i < nullb->nr_queues; i++)
cleanup_queue(&nullb->queues[i]);
kfree(nullb->queues);
}
static int setup_queues(struct nullb *nullb) static int setup_queues(struct nullb *nullb)
{ {
nullb->queues = kzalloc(submit_queues * sizeof(struct nullb_queue), nullb->queues = kzalloc(submit_queues * sizeof(struct nullb_queue),