Commit d2cecf0d authored by Jayamohan Kallickal's avatar Jayamohan Kallickal Committed by James Bottomley
Browse files

[SCSI] be2iscsi: Maintain same ITT across login 



This patch ensures that the same ITT is maintained across
all login pdu's

Signed-off-by: default avatarJayamohan Kallickal <jayamohank@serverengines.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent e9b91193

drivers/scsi/be2iscsi/be_main.c

+36 −5
Original line number Diff line number Diff line
@@ -3452,14 +3452,12 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
		return -ENOMEM;

	io_task->bhs_pa.u.a64.address = paddr;

	io_task->libiscsi_itt = (itt_t)task->itt;

	io_task->pwrb_handle = alloc_wrb_handle(phba,

						beiscsi_conn->beiscsi_conn_cid -

						phba->fw_config.iscsi_cid_start

						);

	io_task->conn = beiscsi_conn;



	task->hdr = (struct iscsi_hdr *)&io_task->cmd_bhs->iscsi_hdr;

	task->hdr_max = sizeof(struct be_cmd_bhs);

	io_task->psgl_handle = NULL;

	io_task->psgl_handle = NULL;



	if (task->sc) {

		spin_lock(&phba->io_sgl_lock);
@@ -3467,6 +3465,11 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
		spin_unlock(&phba->io_sgl_lock);

		if (!io_task->psgl_handle)

			goto free_hndls;

		io_task->pwrb_handle = alloc_wrb_handle(phba,

					beiscsi_conn->beiscsi_conn_cid -

					phba->fw_config.iscsi_cid_start);

		if (!io_task->pwrb_handle)

			goto free_io_hndls;

	} else {

		io_task->scsi_cmnd = NULL;

		if ((opcode & ISCSI_OPCODE_MASK) == ISCSI_OP_LOGIN) {
@@ -3481,9 +3484,20 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
				beiscsi_conn->login_in_progress = 1;

				beiscsi_conn->plogin_sgl_handle =

							io_task->psgl_handle;

				io_task->pwrb_handle =

					alloc_wrb_handle(phba,

					beiscsi_conn->beiscsi_conn_cid -

					phba->fw_config.iscsi_cid_start);

				if (!io_task->pwrb_handle)

					goto free_io_hndls;

				beiscsi_conn->plogin_wrb_handle =

							io_task->pwrb_handle;



			} else {

				io_task->psgl_handle =

						beiscsi_conn->plogin_sgl_handle;

				io_task->pwrb_handle =

						beiscsi_conn->plogin_wrb_handle;

			}

		} else {

			spin_lock(&phba->mgmt_sgl_lock);
@@ -3491,6 +3505,13 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
			spin_unlock(&phba->mgmt_sgl_lock);

			if (!io_task->psgl_handle)

				goto free_hndls;

			io_task->pwrb_handle =

					alloc_wrb_handle(phba,

					beiscsi_conn->beiscsi_conn_cid -

					phba->fw_config.iscsi_cid_start);

			if (!io_task->pwrb_handle)

				goto free_mgmt_hndls;



		}

	}

	itt = (itt_t) cpu_to_be32(((unsigned int)io_task->pwrb_handle->
@@ -3501,11 +3522,21 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
	io_task->cmd_bhs->iscsi_hdr.itt = itt;

	return 0;



free_io_hndls:

	spin_lock(&phba->io_sgl_lock);

	free_io_sgl_handle(phba, io_task->psgl_handle);

	spin_unlock(&phba->io_sgl_lock);

	goto free_hndls;

free_mgmt_hndls:

	spin_lock(&phba->mgmt_sgl_lock);

	free_mgmt_sgl_handle(phba, io_task->psgl_handle);

	spin_unlock(&phba->mgmt_sgl_lock);

free_hndls:

	phwi_ctrlr = phba->phwi_ctrlr;

	pwrb_context = &phwi_ctrlr->wrb_context[

			beiscsi_conn->beiscsi_conn_cid -

			phba->fw_config.iscsi_cid_start];

	if (io_task->pwrb_handle)

		free_wrb_handle(phba, pwrb_context, io_task->pwrb_handle);

	io_task->pwrb_handle = NULL;

	pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,

drivers/scsi/be2iscsi/be_main.h

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ struct beiscsi_conn { 
	u32 beiscsi_conn_cid;

	struct beiscsi_endpoint *ep;

	unsigned short login_in_progress;

	struct wrb_handle *plogin_wrb_handle;

	struct sgl_handle *plogin_sgl_handle;

	struct beiscsi_session *beiscsi_sess;

	struct iscsi_task *task;