sd: Fix a race between closing an sd device and sd I/O
Subsystems (2)
PATCH 1/1 sd: Fix a race between closing an sd device and sd I/O
The scsi_end_request() function calls scsi_cmd_to_driver() indirectly and hence needs the disk->private_data pointer. Avoid that that pointer is cleared before all affected I/O requests have finished. This patch avoids that the following crash occurs:
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 Call trace: scsi_mq_uninit_cmd+0x1c/0x30 scsi_end_request+0x7c/0x1b8 scsi_io_completion+0x464/0x668 scsi_finish_command+0xbc/0x160 scsi_eh_flush_done_q+0x10c/0x170 sas_scsi_recover_host+0x84c/0xa98 [libsas] scsi_error_handler+0x140/0x5b0 kthread+0x100/0x12c ret_from_fork+0x10/0x18
--- drivers/scsi/sd.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/scsi/sd.c +13 -6
@@ -1416,11 +1416,6 @@ static void sd_release(struct gendisk *disk, fmode_t mode)scsi_set_medium_removal (sdev,SCSI_REMOVAL_ALLOW ); } -/* -* XXX and what if there are packets in flight and this close() -* XXX is followed by a "rmmod sd_mod"? -*/ -scsi_disk_put (sdkp); }
@@ -3483,9 +3478,21 @@ static void scsi_disk_release(struct device *dev) {struct scsi_disk *sdkp =to_scsi_disk (dev);struct gendisk *disk = sdkp->disk; - +struct request_queue *q = disk->queue; +ida_free (&sd_index_ida, sdkp->index); +/* +* Wait until all requests that are in progress have completed. +* This is necessary to avoid that e.g. scsi_end_request() crashes +* due to clearing the disk->private_data pointer. Wait from inside +* scsi_disk_release() instead of from sd_release() to avoid that +* freezing and unfreezing the request queue affects user space I/O +* in case multiple processes open a /dev/sd... node concurrently. +*/ +blk_mq_freeze_queue (q); +blk_mq_unfreeze_queue (q); + disk->private_data =NULL ;put_disk (disk);put_device (&sdkp->device->sdev_gendev);
Signature · 1 line
2.21.0.196.g041f5ea1cf98
Quoted 58 lines · Bart Van Assche
The
scsi_end_request()function callsscsi_cmd_to_driver()indirectly and hence needs thedisk->private_datapointer. Avoid that that pointer is cleared before all affected I/O requests have finished. This patch avoids that the following crash occurs:Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 Call trace: scsi_mq_uninit_cmd+0x1c/0x30 scsi_end_request+0x7c/0x1b8 scsi_io_completion+0x464/0x668 scsi_finish_command+0xbc/0x160 scsi_eh_flush_done_q+0x10c/0x170 sas_scsi_recover_host+0x84c/0xa98 [libsas] scsi_error_handler+0x140/0x5b0 kthread+0x100/0x12c ret_from_fork+0x10/0x18Cc Christoph Hellwig <[email protected]>Cc Ming Lei <[email protected]>Cc Hannes Reinecke <[email protected]>Cc Johannes Thumshirn <[email protected]>Cc Jason Yan <[email protected]>Cc <[email protected]>Reported-by Jason Yan <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/scsi/sd.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)drivers/scsi/sd.c +6
-6@@ -1416,11 +1416,6 @@ static void sd_release(struct gendisk *disk, fmode_t mode)scsi_set_medium_removal (sdev,SCSI_REMOVAL_ALLOW ); } -/* -* XXX and what if there are packets in flight and this close() -* XXX is followed by a "rmmod sd_mod"? -*/ -scsi_disk_put (sdkp); }@@ -3483,9 +3478,21 @@ static void scsi_disk_release(struct device *dev) {struct scsi_disk *sdkp =to_scsi_disk (dev);struct gendisk *disk = sdkp->disk; - +struct request_queue *q = disk->queue; +ida_free (&sd_index_ida, sdkp->index); +/* +* Wait until all requests that are in progress have completed. +* This is necessary to avoid that e.g. scsi_end_request() crashes +* due to clearing the disk->private_data pointer. Wait from inside
drivers/scsi/sd.c static void scsi_disk_release(struct device *dev) · line 3498
Quoted 10 lines
drivers/scsi/sd.c +7
-0+* scsi_disk_release() instead of from sd_release() to avoid that +* freezing and unfreezing the request queue affects user space I/O +* in case multiple processes open a /dev/sd... node concurrently. +*/ +blk_mq_freeze_queue (q); +blk_mq_unfreeze_queue (q); + disk->private_data =NULL ;put_disk (disk);put_device (&sdkp->device->sdev_gendev);
No, this way may cause big performance issue, see my previous comment:
https://marc.info/?l=linux-scsi&m=155321977714715&w=2
Thanks,
Ming
Quoted 72 lines · Ming Lei
Quoted 58 lines · Bart Van Assche
The
scsi_end_request()function callsscsi_cmd_to_driver()indirectly and hence needs thedisk->private_datapointer. Avoid that that pointer is cleared before all affected I/O requests have finished. This patch avoids that the following crash occurs:Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 Call trace: scsi_mq_uninit_cmd+0x1c/0x30 scsi_end_request+0x7c/0x1b8 scsi_io_completion+0x464/0x668 scsi_finish_command+0xbc/0x160 scsi_eh_flush_done_q+0x10c/0x170 sas_scsi_recover_host+0x84c/0xa98 [libsas] scsi_error_handler+0x140/0x5b0 kthread+0x100/0x12c ret_from_fork+0x10/0x18Cc Christoph Hellwig <[email protected]>Cc Ming Lei <[email protected]>Cc Hannes Reinecke <[email protected]>Cc Johannes Thumshirn <[email protected]>Cc Jason Yan <[email protected]>Cc <[email protected]>Reported-by Jason Yan <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/scsi/sd.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)drivers/scsi/sd.c +6
-6@@ -1416,11 +1416,6 @@ static void sd_release(struct gendisk *disk, fmode_t mode)scsi_set_medium_removal (sdev,SCSI_REMOVAL_ALLOW ); } -/* -* XXX and what if there are packets in flight and this close() -* XXX is followed by a "rmmod sd_mod"? -*/ -scsi_disk_put (sdkp); }@@ -3483,9 +3478,21 @@ static void scsi_disk_release(struct device *dev) {struct scsi_disk *sdkp =to_scsi_disk (dev);struct gendisk *disk = sdkp->disk; - +struct request_queue *q = disk->queue; +ida_free (&sd_index_ida, sdkp->index); +/* +* Wait until all requests that are in progress have completed. +* This is necessary to avoid that e.g. scsi_end_request() crashes +* due to clearing the disk->private_data pointer. Wait from inside drivers/scsi/sd.c static void scsi_disk_release(struct device *dev) · line 3498
Quoted 10 lines
drivers/scsi/sd.c +7
-0+* scsi_disk_release() instead of from sd_release() to avoid that +* freezing and unfreezing the request queue affects user space I/O +* in case multiple processes open a /dev/sd... node concurrently. +*/ +blk_mq_freeze_queue (q); +blk_mq_unfreeze_queue (q); + disk->private_data =NULL ;put_disk (disk);put_device (&sdkp->device->sdev_gendev);No, this way may cause big performance issue, see my previous comment:
Have you had a look at this patch? Your comment applies to the previous version of this patch. I don't think that it applies to the current version.
Bart.
Quoted 70 lines · Bart Van Assche
Quoted 69 lines · Ming Lei
Quoted 55 lines · Bart Van Assche
The
scsi_end_request()function callsscsi_cmd_to_driver()indirectly and hence needs thedisk->private_datapointer. Avoid that that pointer is cleared before all affected I/O requests have finished. This patch avoids that the following crash occurs:Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 Call trace: scsi_mq_uninit_cmd+0x1c/0x30 scsi_end_request+0x7c/0x1b8 scsi_io_completion+0x464/0x668 scsi_finish_command+0xbc/0x160 scsi_eh_flush_done_q+0x10c/0x170 sas_scsi_recover_host+0x84c/0xa98 [libsas] scsi_error_handler+0x140/0x5b0 kthread+0x100/0x12c ret_from_fork+0x10/0x18Cc Christoph Hellwig <[email protected]>Cc Ming Lei <[email protected]>Cc Hannes Reinecke <[email protected]>Cc Johannes Thumshirn <[email protected]>Cc Jason Yan <[email protected]>Cc <[email protected]>Reported-by Jason Yan <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/scsi/sd.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)drivers/scsi/sd.c +6
-6@@ -1416,11 +1416,6 @@ static void sd_release(struct gendisk *disk, fmode_t mode)scsi_set_medium_removal (sdev,SCSI_REMOVAL_ALLOW ); } -/* -* XXX and what if there are packets in flight and this close() -* XXX is followed by a "rmmod sd_mod"? -*/ -scsi_disk_put (sdkp); }@@ -3483,9 +3478,21 @@ static void scsi_disk_release(struct device *dev) {struct scsi_disk *sdkp =to_scsi_disk (dev);struct gendisk *disk = sdkp->disk; - +struct request_queue *q = disk->queue; +ida_free (&sd_index_ida, sdkp->index); +/* +* Wait until all requests that are in progress have completed. +* This is necessary to avoid that e.g. scsi_end_request() crashes +* due to clearing the disk->private_data pointer. Wait from inside drivers/scsi/sd.c static void scsi_disk_release(struct device *dev) · line 3497
Quoted 10 lines
drivers/scsi/sd.c +7
-0+* scsi_disk_release() instead of from sd_release() to avoid that +* freezing and unfreezing the request queue affects user space I/O +* in case multiple processes open a /dev/sd... node concurrently. +*/ +blk_mq_freeze_queue (q); +blk_mq_unfreeze_queue (q); + disk->private_data =NULL ;put_disk (disk);put_device (&sdkp->device->sdev_gendev);No, this way may cause big performance issue, see my previous comment:
Quoted 4 lines
Have you had a look at this patch? Your comment applies to the previous version of this patch. I don't think that it applies to the current version.
OK, sorry for missing that, then this patch looks fine.
It is still a bit over-kill for passthrough IO, but seems not a big deal.
Thanks,
Ming
Looks good,
Martin K. Petersen
AppliedBart,
Quoted 4 lines
The
scsi_end_request()function callsscsi_cmd_to_driver()indirectly and hence needs thedisk->private_datapointer. Avoid that that pointer is cleared before all affected I/O requests have finished. This patch avoids that the following crash occurs:
Applied to 5.1/scsi-fixes, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering