]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: qedf: Make qedf_execute_tmf() non-preemptible
authorJohn Meneghini <jmeneghi@redhat.com>
Wed, 3 Apr 2024 15:01:55 +0000 (11:01 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Jul 2024 09:40:47 +0000 (11:40 +0200)
[ 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>
drivers/scsi/qedf/qedf_io.c

index d02d1ef0d01160014402f2cd45f652490160f9b2..dc1ba29c1676211b3a574229635ac45526b294a1 100644 (file)
@@ -2330,9 +2330,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;
@@ -2354,6 +2351,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));