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

Commit b71b49c2 authored by Sasikumar Chandrasekaran's avatar Sasikumar Chandrasekaran Committed by Martin K. Petersen
Browse files

scsi: megaraid_sas: ldio_outstanding variable is not decremented in completion path 



ldio outstanding variable needs to be decremented in io completion path for
iMR dual queue depth

Signed-off-by: default avatarSasikumar Chandrasekaran <sasikumar.pc@broadcom.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3e5eadb1

drivers/scsi/megaraid/megaraid_sas_fusion.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -2580,7 +2580,6 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance, 




	if (atomic_inc_return(&instance->fw_outstanding) >

	if (atomic_inc_return(&instance->fw_outstanding) >

			instance->host->can_queue) {

			instance->host->can_queue) {

		dev_err(&instance->pdev->dev, "Throttle IOs beyond Controller queue depth\n");

		atomic_dec(&instance->fw_outstanding);

		atomic_dec(&instance->fw_outstanding);

		return SCSI_MLQUEUE_HOST_BUSY;

		return SCSI_MLQUEUE_HOST_BUSY;

	}

	}
@@ -2811,6 +2810,9 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex) 
					extStatus, data_length, sense);

					extStatus, data_length, sense);

				scsi_io_req->RaidContext.raid_context.status = 0;

				scsi_io_req->RaidContext.raid_context.status = 0;

				scsi_io_req->RaidContext.raid_context.ex_status = 0;

				scsi_io_req->RaidContext.raid_context.ex_status = 0;

				if (instance->ldio_threshold

					&& megasas_cmd_type(scmd_local) == READ_WRITE_LDIO)

					atomic_dec(&instance->ldio_outstanding);

				megasas_return_cmd_fusion(instance, cmd_fusion);

				megasas_return_cmd_fusion(instance, cmd_fusion);

				scsi_dma_unmap(scmd_local);

				scsi_dma_unmap(scmd_local);

				scmd_local->scsi_done(scmd_local);

				scmd_local->scsi_done(scmd_local);
@@ -3959,7 +3961,8 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int reason) 
				scmd_local->result =

				scmd_local->result =

					megasas_check_mpio_paths(instance,

					megasas_check_mpio_paths(instance,

							scmd_local);

							scmd_local);

				if (megasas_cmd_type(scmd_local) == READ_WRITE_LDIO)

				if (instance->ldio_threshold &&

					megasas_cmd_type(scmd_local) == READ_WRITE_LDIO)

					atomic_dec(&instance->ldio_outstanding);

					atomic_dec(&instance->ldio_outstanding);

				megasas_return_cmd_fusion(instance, cmd_fusion);

				megasas_return_cmd_fusion(instance, cmd_fusion);

				scsi_dma_unmap(scmd_local);

				scsi_dma_unmap(scmd_local);