Commit 96e3737c authored Aug 05, 2024 by John Meneghini Committed by Yu Liao Aug 05, 2024

scsi: qedf: Make qedf_execute_tmf() non-preemptible

stable inclusion
from stable-v5.10.222
commit 5ceb40cdee721e13cbe15a0515cacf984e11236b
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAGTJ2
CVE: CVE-2024-42124

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5ceb40cdee721e13cbe15a0515cacf984e11236b



--------------------------------

[ Upstream commit 0d8b637c9c5eeaa1a4e3dfb336f3ff918eb64fec ]

Stop calling smp_processor_id() from preemptible code in
qedf_execute_tmf90.  This results in BUG_ON() when running an RT kernel.

[ 659.343280] BUG: using smp_processor_id() in preemptible [00000000] code: sg_reset/3646
[ 659.343282] caller is qedf_execute_tmf+0x8b/0x360 [qedf]

Tested-by: Guangwu Zhang <guazhang@redhat.com>
Cc: Saurav Kashyap <skashyap@marvell.com>
Cc: Nilesh Javali <njavali@marvell.com>
Signed-off-by: John Meneghini <jmeneghi@redhat.com>
Link: https://lore.kernel.org/r/20240403150155.412954-1-jmeneghi@redhat.com


Acked-by: Saurav Kashyap <skashyap@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Yu Liao <liaoyu15@huawei.com>

parent cdac497b

drivers/scsi/qedf/qedf_io.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2351,9 +2351,6 @@ static int qedf_execute_tmf(struct qedf_rport fcport, struct scsi_cmnd sc_cmd,
		io_req->fcport = fcport;
		io_req->cmd_type = QEDF_TASK_MGMT_CMD;

		/* Record which cpu this request is associated with */
		io_req->cpu = smp_processor_id();

		/* Set TM flags */
		io_req->io_req_flags = QEDF_READ;
		io_req->data_xfer_len = 0;
		@@ -2375,6 +2372,9 @@ static int qedf_execute_tmf(struct qedf_rport fcport, struct scsi_cmnd sc_cmd,

		spin_lock_irqsave(&fcport->rport_lock, flags);

		/* Record which cpu this request is associated with */
		io_req->cpu = smp_processor_id();

		sqe_idx = qedf_get_sqe_idx(fcport);
		sqe = &fcport->sq[sqe_idx];
		memset(sqe, 0, sizeof(struct fcoe_wqe));