Hi, > [ Upstream commit 6ce59025f1182125e75c8d121daf44056b65dd1f ] > > The driver allocates queues for all the units it potentially > supports. But if we fail to detect any drives, then we fail > loading the module without cleaning up those queues. This is > now evident with the switch to blk-mq, though the bug has > been there forever as far as I can tell. > > Also fix cleanup through regular module exit. > > Reported-by: Randy Dunlap <[email protected]> > Tested-by: Randy Dunlap <[email protected]> > Signed-off-by: Jens Axboe <[email protected]> > Signed-off-by: Sasha Levin <[email protected]>
This commit causes a new problem. And the commit that made the fix is 58ccd2d31e502c37e108b285bf3d343eb00c235b. I think this commit needs to be applied together. Best regards, Nobuhiro ________________________________________ 差出人: [email protected] <[email protected]> が Greg Kroah-Hartman <[email protected]> の代理で送信 送信日時: 2019年4月19日 2:56 宛先: [email protected] CC: Greg Kroah-Hartman; [email protected]; Randy Dunlap; Jens Axboe; Sasha Levin 件名: [PATCH 5.0 18/93] paride/pf: cleanup queues when detection fails [ Upstream commit 6ce59025f1182125e75c8d121daf44056b65dd1f ] The driver allocates queues for all the units it potentially supports. But if we fail to detect any drives, then we fail loading the module without cleaning up those queues. This is now evident with the switch to blk-mq, though the bug has been there forever as far as I can tell. Also fix cleanup through regular module exit. Reported-by: Randy Dunlap <[email protected]> Tested-by: Randy Dunlap <[email protected]> Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Sasha Levin <[email protected]> --- drivers/block/paride/pf.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c index e92e7a8eeeb2..103b617cdc31 100644 --- a/drivers/block/paride/pf.c +++ b/drivers/block/paride/pf.c @@ -761,8 +761,12 @@ static int pf_detect(void) return 0; printk("%s: No ATAPI disk detected\n", name); - for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) + for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) { + blk_cleanup_queue(pf->disk->queue); + pf->disk->queue = NULL; + blk_mq_free_tag_set(&pf->tag_set); put_disk(pf->disk); + } pi_unregister_driver(par_drv); return -1; } @@ -1047,13 +1051,15 @@ static void __exit pf_exit(void) int unit; unregister_blkdev(major, name); for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) { - if (!pf->present) - continue; - del_gendisk(pf->disk); + if (pf->present) + del_gendisk(pf->disk); + blk_cleanup_queue(pf->disk->queue); blk_mq_free_tag_set(&pf->tag_set); put_disk(pf->disk); - pi_release(pf->pi); + + if (pf->present) + pi_release(pf->pi); } } -- 2.19.1
