shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

scsi: ibmvscsis: Synchronize cmds at remove time

Browse Source 
[ Upstream commit 8bf11557d4 ]

This patch adds code to disconnect from the client, which will make sure
any outstanding commands have been completed, before continuing on with
the remove operation.

Signed-off-by: Michael Cyr <mikecyr@us.ibm.com>
Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
Tested-by: Steven Royer <seroyer@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Cyr
2017-03-17 00:48:22 +00:00
committed by Greg Kroah-Hartman
parent 94700877c2
commit 456be98b4e
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
View File

@@ -470,6 +470,18 @@ static void ibmvscsis_disconnect(struct work_struct *work)
case WAIT_ENABLED: case WAIT_ENABLED:
switch (new_state) { switch (new_state) {
case UNCONFIGURING:
vscsi->state = new_state;
vscsi->flags |= RESPONSE_Q_DOWN;
vscsi->flags &= ~(SCHEDULE_DISCONNECT |
DISCONNECT_SCHEDULED);
dma_rmb();
if (vscsi->flags & CFG_SLEEPING) {
vscsi->flags &= ~CFG_SLEEPING;
complete(&vscsi->unconfig);
}
break;
/* should never happen */ /* should never happen */
case ERR_DISCONNECT: case ERR_DISCONNECT:
case ERR_DISCONNECT_RECONNECT: case ERR_DISCONNECT_RECONNECT:
@@ -482,6 +494,13 @@ static void ibmvscsis_disconnect(struct work_struct *work)
case WAIT_IDLE: case WAIT_IDLE:
switch (new_state) { switch (new_state) {
case UNCONFIGURING:
vscsi->flags |= RESPONSE_Q_DOWN;
vscsi->state = new_state;
vscsi->flags &= ~(SCHEDULE_DISCONNECT |
DISCONNECT_SCHEDULED);
ibmvscsis_free_command_q(vscsi);
break;
case ERR_DISCONNECT: case ERR_DISCONNECT:
case ERR_DISCONNECT_RECONNECT: case ERR_DISCONNECT_RECONNECT:
vscsi->state = new_state; vscsi->state = new_state;
@@ -1187,6 +1206,15 @@ static void ibmvscsis_adapter_idle(struct scsi_info *vscsi)
free_qs = true; free_qs = true;
switch (vscsi->state) { switch (vscsi->state) {
case UNCONFIGURING:
ibmvscsis_free_command_q(vscsi);
dma_rmb();
isync();
if (vscsi->flags & CFG_SLEEPING) {
vscsi->flags &= ~CFG_SLEEPING;
complete(&vscsi->unconfig);
}
break;
case ERR_DISCONNECT_RECONNECT: case ERR_DISCONNECT_RECONNECT:
ibmvscsis_reset_queue(vscsi); ibmvscsis_reset_queue(vscsi);
pr_debug("adapter_idle, disc_rec: flags 0x%x\n", vscsi->flags); pr_debug("adapter_idle, disc_rec: flags 0x%x\n", vscsi->flags);
@@ -3342,6 +3370,7 @@ static int ibmvscsis_probe(struct vio_dev *vdev,
(unsigned long)vscsi); (unsigned long)vscsi);
init_completion(&vscsi->wait_idle); init_completion(&vscsi->wait_idle);
init_completion(&vscsi->unconfig);
snprintf(wq_name, 24, "ibmvscsis%s", dev_name(&vdev->dev)); snprintf(wq_name, 24, "ibmvscsis%s", dev_name(&vdev->dev));
vscsi->work_q = create_workqueue(wq_name); vscsi->work_q = create_workqueue(wq_name);
@@ -3397,10 +3426,11 @@ static int ibmvscsis_remove(struct vio_dev *vdev)
pr_debug("remove (%s)\n", dev_name(&vscsi->dma_dev->dev)); pr_debug("remove (%s)\n", dev_name(&vscsi->dma_dev->dev));
/* spin_lock_bh(&vscsi->intr_lock);
* TBD: Need to handle if there are commands on the waiting_rsp q ibmvscsis_post_disconnect(vscsi, UNCONFIGURING, 0);
* Actually, can there still be cmds outstanding to tcm? vscsi->flags |= CFG_SLEEPING;
*/ spin_unlock_bh(&vscsi->intr_lock);
wait_for_completion(&vscsi->unconfig);
vio_disable_interrupts(vdev); vio_disable_interrupts(vdev);
free_irq(vdev->irq, vscsi); free_irq(vdev->irq, vscsi);
@@ -3409,7 +3439,6 @@ static int ibmvscsis_remove(struct vio_dev *vdev)
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
kfree(vscsi->map_buf); kfree(vscsi->map_buf);
tasklet_kill(&vscsi->work_task); tasklet_kill(&vscsi->work_task);
ibmvscsis_unregister_command_q(vscsi);
ibmvscsis_destroy_command_q(vscsi); ibmvscsis_destroy_command_q(vscsi);
ibmvscsis_freetimer(vscsi); ibmvscsis_freetimer(vscsi);
ibmvscsis_free_cmds(vscsi); ibmvscsis_free_cmds(vscsi);

3
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h
View File

@@ -257,6 +257,8 @@ struct scsi_info {
#define SCHEDULE_DISCONNECT 0x00400 #define SCHEDULE_DISCONNECT 0x00400
/* disconnect handler is scheduled */ /* disconnect handler is scheduled */
#define DISCONNECT_SCHEDULED 0x00800 #define DISCONNECT_SCHEDULED 0x00800
/* remove function is sleeping */
#define CFG_SLEEPING 0x01000
u32 flags; u32 flags;
/* adapter lock */ /* adapter lock */
spinlock_t intr_lock; spinlock_t intr_lock;
@@ -285,6 +287,7 @@ struct scsi_info {
struct workqueue_struct *work_q; struct workqueue_struct *work_q;
struct completion wait_idle; struct completion wait_idle;
struct completion unconfig;
struct device dev; struct device dev;
struct vio_dev *dma_dev; struct vio_dev *dma_dev;
struct srp_target target; struct srp_target target;