Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89d3cf6a authored by Jeff Skirvin's avatar Jeff Skirvin Committed by James Bottomley
Browse files

[SCSI] libsas: add mutex for SMP task execution 



SAS does not tag SMP requests, and at least one lldd (isci) does not permit
more than one in-flight request at a time.

[jejb: fix sas_init_dev tab issues while we're at it]
Signed-off-by: default avatarJeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 1f4fe89c

drivers/scsi/libsas/sas_discover.c

+16 −15
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ void sas_init_dev(struct domain_device *dev) 
	case EDGE_DEV:

	case FANOUT_DEV:

		INIT_LIST_HEAD(&dev->ex_dev.children);

		mutex_init(&dev->ex_dev.cmd_mutex);

		break;

	case SATA_DEV:

	case SATA_PM:

drivers/scsi/libsas/sas_expander.c

+16 −13
Original line number Diff line number Diff line
@@ -72,11 +72,13 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size, 
	struct sas_internal *i =

		to_sas_internal(dev->port->ha->core.shost->transportt);



	mutex_lock(&dev->ex_dev.cmd_mutex);

	for (retry = 0; retry < 3; retry++) {

		task = sas_alloc_task(GFP_KERNEL);

		if (!task)

			return -ENOMEM;



		if (!task) {

			res = -ENOMEM;

			break;

		}

		task->dev = dev;

		task->task_proto = dev->tproto;

		sg_init_one(&task->smp_task.smp_req, req, req_size);
@@ -94,7 +96,7 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size, 
		if (res) {

			del_timer(&task->timer);

			SAS_DPRINTK("executing SMP task failed:%d\n", res);

			goto ex_err;

			break;

		}



		wait_for_completion(&task->completion);
@@ -104,20 +106,22 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size, 
			i->dft->lldd_abort_task(task);

			if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {

				SAS_DPRINTK("SMP task aborted and not done\n");

				goto ex_err;

				break;

			}

		}

		if (task->task_status.resp == SAS_TASK_COMPLETE &&

		    task->task_status.stat == SAM_STAT_GOOD) {

			res = 0;

			break;

		} if (task->task_status.resp == SAS_TASK_COMPLETE &&

		}

		if (task->task_status.resp == SAS_TASK_COMPLETE &&

		    task->task_status.stat == SAS_DATA_UNDERRUN) {

			/* no error, but return the number of bytes of

			 * underrun */

			res = task->task_status.residual;

			break;

		} if (task->task_status.resp == SAS_TASK_COMPLETE &&

		}

		if (task->task_status.resp == SAS_TASK_COMPLETE &&

		    task->task_status.stat == SAS_DATA_OVERRUN) {

			res = -EMSGSIZE;

			break;
@@ -131,11 +135,10 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size, 
			task = NULL;

		}

	}

ex_err:

	mutex_unlock(&dev->ex_dev.cmd_mutex);



	BUG_ON(retry == 3 && task != NULL);

	if (task != NULL) {

	sas_free_task(task);

	}

	return res;

}

include/scsi/libsas.h

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ struct expander_device { 


	struct ex_phy *ex_phy;

	struct sas_port *parent_port;



	struct mutex cmd_mutex;

};



/* ---------- SATA device ---------- */