scsi: qla2xxx: Skip IRQ affinity for Target QPairs

Quinn Tran · martinkpetersen · commit d68b850e1bfb · 2017-12-07T21:07:01.000-05:00
Fix co-existence between Block MQ and Target Mode. Block MQ and initiator mode requires midlayer queue mapping to check for IRQ to be affinitized. For target mode, it's not the case. Fixes: 09620ee ("scsi: qla2xxx: Add debug knob for user control workload") Cc: <stable@vger.kernel.org> # 4.12+ Signed-off-by: Quinn Tran <quinn.tran@cavium.com> Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
@@ -6609,9 +6609,14 @@ qla83xx_disable_laser(scsi_qla_host_t *vha)
 
 static int qla2xxx_map_queues(struct Scsi_Host *shost)
 {
+	int rc;
 	scsi_qla_host_t *vha = (scsi_qla_host_t *)shost->hostdata;
 
-	return blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev);
+	if (USER_CTRL_IRQ(vha->hw))
+		rc = blk_mq_map_queues(&shost->tag_set);
+	else
+		rc = blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev);
+	return rc;
 }
 
 static const struct pci_error_handlers qla2xxx_err_handler = {

Original file line number	Diff line number	Diff line change
`@@ -6609,9 +6609,14 @@ qla83xx_disable_laser(scsi_qla_host_t *vha)`
`6609`	`6609`
`6610`	`6610`	`static int qla2xxx_map_queues(struct Scsi_Host *shost)`
`6611`	`6611`	`{`
	`6612`	`+ int rc;`
`6612`	`6613`	`scsi_qla_host_t vha = (scsi_qla_host_t )shost->hostdata;`
`6613`	`6614`
`6614`		`- return blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev);`
	`6615`	`+ if (USER_CTRL_IRQ(vha->hw))`
	`6616`	`+ rc = blk_mq_map_queues(&shost->tag_set);`
	`6617`	`+ else`
	`6618`	`+ rc = blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev);`
	`6619`	`+ return rc;`
`6615`	`6620`	`}`
`6616`	`6621`
`6617`	`6622`	`static const struct pci_error_handlers qla2xxx_err_handler = {`