2024-04-03 15:06:09

by John Meneghini

Subject: [PATCH] scsi: qedf: make qedf_execute_tmf non-preemptible

Stop calling smp_processor_id from preemptible code in qedf_execute_tmf.
This results in BUGON 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 <[email protected]>
Cc: Saurav Kashyap <[email protected]>
Cc: Nilesh Javali <[email protected]>
Signed-off-by: John Meneghini <[email protected]>
---
drivers/scsi/qedf/qedf_io.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c
index bf921caaf6ae..054a51713d55 100644
--- a/drivers/scsi/qedf/qedf_io.c
+++ b/drivers/scsi/qedf/qedf_io.c
@@ -2324,9 +2324,6 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, u64 tm_lun,
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;
@@ -2349,6 +2346,9 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, u64 tm_lun,

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));
--
2.39.3

2024-04-17 15:27:39

by Saurav Kashyap

Subject: RE: [EXTERNAL] [PATCH] scsi: qedf: make qedf_execute_tmf non-preemptible

Acked-by: Saurav Kashyap <[email protected]>

> -----Original Message-----
> From: John Meneghini <[email protected]>
> Sent: Wednesday, April 3, 2024 8:32 PM
> To: Saurav Kashyap <[email protected]>
> Cc: [email protected]; [email protected]; GR-QLogic-Storage-
> Upstream <[email protected]>;
> [email protected]; [email protected]; Nilesh Javali
> <[email protected]>
> Subject: [EXTERNAL] [PATCH] scsi: qedf: make qedf_execute_tmf non-
> preemptible
>
> Prioritize security for external emails: Confirm sender and content safety before
> clicking links or opening attachments
>
> ----------------------------------------------------------------------
> Stop calling smp_processor_id from preemptible code in qedf_execute_tmf.
> This results in BUGON 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 <[email protected]>
> Cc: Saurav Kashyap <[email protected]>
> Cc: Nilesh Javali <[email protected]>
> Signed-off-by: John Meneghini <[email protected]>
> ---
> drivers/scsi/qedf/qedf_io.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c
> index bf921caaf6ae..054a51713d55 100644
> --- a/drivers/scsi/qedf/qedf_io.c
> +++ b/drivers/scsi/qedf/qedf_io.c
> @@ -2324,9 +2324,6 @@ static int qedf_execute_tmf(struct qedf_rport
> *fcport, u64 tm_lun,
> 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;
> @@ -2349,6 +2346,9 @@ static int qedf_execute_tmf(struct qedf_rport
> *fcport, u64 tm_lun,
>
> 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));
> --
> 2.39.3
>

2024-04-25 01:00:50

by Martin K. Petersen

Subject: Re: [PATCH] scsi: qedf: make qedf_execute_tmf non-preemptible

John,

> Stop calling smp_processor_id from preemptible code in
> qedf_execute_tmf. This results in BUGON when running an RT kernel.

Applied to 6.10/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2024-05-07 02:01:49

by Martin K. Petersen

Subject: Re: [PATCH] scsi: qedf: make qedf_execute_tmf non-preemptible

On Wed, 03 Apr 2024 11:01:55 -0400, John Meneghini wrote:

> Stop calling smp_processor_id from preemptible code in qedf_execute_tmf.
> This results in BUGON 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]
>
>
> [...]

Applied to 6.10/scsi-queue, thanks!

[1/1] scsi: qedf: make qedf_execute_tmf non-preemptible
https://git.kernel.org/mkp/scsi/c/0d8b637c9c5e

--
Martin K. Petersen Oracle Linux Engineering