Skip to content

Commit 7205981

Browse files
Tyrel Datwylermartinkpetersen
authored andcommitted
scsi: ibmvscsi: Protect ibmvscsi_head from concurrent modificaiton
For each ibmvscsi host created during a probe or destroyed during a remove we either add or remove that host to/from the global ibmvscsi_head list. This runs the risk of concurrent modification. This patch adds a simple spinlock around the list modification calls to prevent concurrent updates as is done similarly in the ibmvfc driver and ipr driver. Fixes: 32d6e4b ("scsi: ibmvscsi: add vscsi hosts to global list_head") Cc: <stable@vger.kernel.org> # v4.10+ Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 0e83fc6 commit 7205981

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/scsi/ibmvscsi/ibmvscsi.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ static int client_reserve = 1;
9696
static char partition_name[96] = "UNKNOWN";
9797
static unsigned int partition_number = -1;
9898
static LIST_HEAD(ibmvscsi_head);
99+
static DEFINE_SPINLOCK(ibmvscsi_driver_lock);
99100

100101
static struct scsi_transport_template *ibmvscsi_transport_template;
101102

@@ -2270,7 +2271,9 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)
22702271
}
22712272

22722273
dev_set_drvdata(&vdev->dev, hostdata);
2274+
spin_lock(&ibmvscsi_driver_lock);
22732275
list_add_tail(&hostdata->host_list, &ibmvscsi_head);
2276+
spin_unlock(&ibmvscsi_driver_lock);
22742277
return 0;
22752278

22762279
add_srp_port_failed:
@@ -2292,7 +2295,9 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)
22922295
static int ibmvscsi_remove(struct vio_dev *vdev)
22932296
{
22942297
struct ibmvscsi_host_data *hostdata = dev_get_drvdata(&vdev->dev);
2298+
spin_lock(&ibmvscsi_driver_lock);
22952299
list_del(&hostdata->host_list);
2300+
spin_unlock(&ibmvscsi_driver_lock);
22962301
unmap_persist_bufs(hostdata);
22972302
release_event_pool(&hostdata->pool, hostdata);
22982303
ibmvscsi_release_crq_queue(&hostdata->queue, hostdata,

0 commit comments

Comments
 (0)