Commit 59f10a05 authored by Nilesh Javali's avatar Nilesh Javali Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Use raw_smp_processor_id() instead of smp_processor_id() 



The following call trace was observed:

localhost kernel: nvme nvme0: NVME-FC{0}: controller connect complete
localhost kernel: BUG: using smp_processor_id() in preemptible [00000000] code: kworker/u129:4/75092
localhost kernel: nvme nvme0: NVME-FC{0}: new ctrl: NQN "nqn.1992-08.com.netapp:sn.b42d198afb4d11ecad6d00a098d6abfa:subsystem.PR_Channel2022_RH84_subsystem_291"
localhost kernel: caller is qla_nvme_post_cmd+0x216/0x1380 [qla2xxx]
localhost kernel: CPU: 6 PID: 75092 Comm: kworker/u129:4 Kdump: loaded Tainted: G    B   W  OE    --------- ---  5.14.0-70.22.1.el9_0.x86_64+debug #1
localhost kernel: Hardware name: HPE ProLiant XL420 Gen10/ProLiant XL420 Gen10, BIOS U39 01/13/2022
localhost kernel: Workqueue: nvme-wq nvme_async_event_work [nvme_core]
localhost kernel: Call Trace:
localhost kernel: dump_stack_lvl+0x57/0x7d
localhost kernel: check_preemption_disabled+0xc8/0xd0
localhost kernel: qla_nvme_post_cmd+0x216/0x1380 [qla2xxx]

Use raw_smp_processor_id() instead of smp_processor_id().

Also use queue_work() across the driver instead of queue_work_on() thus
avoiding usage of smp_processor_id() when CONFIG_DEBUG_PREEMPT is enabled.

Cc: stable@vger.kernel.org
Suggested-by: default avatarJohn Garry <john.g.garry@oracle.com>
Signed-off-by: default avatarNilesh Javali <njavali@marvell.com>
Link: https://lore.kernel.org/r/20230831112146.32595-2-njavali@marvell.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0be75928

drivers/scsi/qla2xxx/qla_inline.h

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ fcport_is_bigger(fc_port_t *fcport) 
static inline struct qla_qpair *

qla_mapq_nvme_select_qpair(struct qla_hw_data *ha, struct qla_qpair *qpair)

{

	int cpuid = smp_processor_id();

	int cpuid = raw_smp_processor_id();



	if (qpair->cpuid != cpuid &&

	    ha->qp_cpu_map[cpuid]) {

drivers/scsi/qla2xxx/qla_isr.c

+3 −3
Original line number Diff line number Diff line
@@ -3965,7 +3965,7 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha, 
	if (!ha->flags.fw_started)

		return;



	if (rsp->qpair->cpuid != smp_processor_id() || !rsp->qpair->rcv_intr) {

	if (rsp->qpair->cpuid != raw_smp_processor_id() || !rsp->qpair->rcv_intr) {

		rsp->qpair->rcv_intr = 1;



		if (!rsp->qpair->cpu_mapped)
@@ -4468,7 +4468,7 @@ qla2xxx_msix_rsp_q(int irq, void *dev_id) 
	}

	ha = qpair->hw;



	queue_work_on(smp_processor_id(), ha->wq, &qpair->q_work);

	queue_work(ha->wq, &qpair->q_work);



	return IRQ_HANDLED;

}
@@ -4494,7 +4494,7 @@ qla2xxx_msix_rsp_q_hs(int irq, void *dev_id) 
	wrt_reg_dword(&reg->hccr, HCCRX_CLR_RISC_INT);

	spin_unlock_irqrestore(&ha->hardware_lock, flags);



	queue_work_on(smp_processor_id(), ha->wq, &qpair->q_work);

	queue_work(ha->wq, &qpair->q_work);



	return IRQ_HANDLED;

}

drivers/scsi/qla2xxx/qla_target.c

+1 −2
Original line number Diff line number Diff line
@@ -4425,8 +4425,7 @@ static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha, 
		queue_work_on(cmd->se_cmd.cpuid, qla_tgt_wq, &cmd->work);

	} else if (ha->msix_count) {

		if (cmd->atio.u.isp24.fcp_cmnd.rddata)

			queue_work_on(smp_processor_id(), qla_tgt_wq,

			    &cmd->work);

			queue_work(qla_tgt_wq, &cmd->work);

		else

			queue_work_on(cmd->se_cmd.cpuid, qla_tgt_wq,

			    &cmd->work);

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+2 −2
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static void tcm_qla2xxx_free_cmd(struct qla_tgt_cmd *cmd) 
	cmd->trc_flags |= TRC_CMD_DONE;



	INIT_WORK(&cmd->work, tcm_qla2xxx_complete_free);

	queue_work_on(smp_processor_id(), tcm_qla2xxx_free_wq, &cmd->work);

	queue_work(tcm_qla2xxx_free_wq, &cmd->work);

}



/*
@@ -547,7 +547,7 @@ static void tcm_qla2xxx_handle_data(struct qla_tgt_cmd *cmd) 
	cmd->trc_flags |= TRC_DATA_IN;

	cmd->cmd_in_wq = 1;

	INIT_WORK(&cmd->work, tcm_qla2xxx_handle_data_work);

	queue_work_on(smp_processor_id(), tcm_qla2xxx_free_wq, &cmd->work);

	queue_work(tcm_qla2xxx_free_wq, &cmd->work);

}



static int tcm_qla2xxx_chk_dif_tags(uint32_t tag)