| Message ID | 20230615074633.12721-1-njavali@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | qla2xxx: Remove unused nvme_ls_waitq wait queue. | expand |
Nilesh, > System crash when qla2x00_start_sp(sp) returns error code EGAIN and > wake_up gets called for uninitialized wait queue > sp->nvme_ls_waitq. Applied to 6.5/scsi-staging, thanks!
On Thu, 15 Jun 2023 13:16:33 +0530, Nilesh Javali wrote: > System crash when qla2x00_start_sp(sp) returns error code EGAIN > and wake_up gets called for uninitialized wait queue > sp->nvme_ls_waitq. > > qla2xxx [0000:37:00.1]-2121:5: Returning existing qpair of ffff8ae2c0513400 for idx=0 > qla2xxx [0000:37:00.1]-700e:5: qla2x00_start_sp failed = 11 > BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 > PGD 0 P4D 0 > Oops: 0000 [#1] SMP NOPTI > Hardware name: HPE ProLiant DL360 Gen10/ProLiant DL360 Gen10, BIOS U32 09/03/2021 > Workqueue: nvme-wq nvme_fc_connect_ctrl_work [nvme_fc] > RIP: 0010:__wake_up_common+0x4c/0x190 > RSP: 0018:ffff95f3e0cb7cd0 EFLAGS: 00010086 > RAX: 0000000000000000 RBX: ffff8b08d3b26328 RCX: 0000000000000000 > RDX: 0000000000000001 RSI: 0000000000000003 RDI: ffff8b08d3b26320 > RBP: 0000000000000001 R08: 0000000000000000 R09: ffffffffffffffe8 > R10: 0000000000000000 R11: ffff95f3e0cb7a60 R12: ffff95f3e0cb7d20 > R13: 0000000000000003 R14: 0000000000000000 R15: 0000000000000000 > FS: 0000000000000000(0000) GS:ffff8b2fdf6c0000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 0000000000000000 CR3: 0000002f1e410002 CR4: 00000000007706e0 > DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 > PKRU: 55555554 > Call Trace: > __wake_up_common_lock+0x7c/0xc0 > qla_nvme_ls_req+0x355/0x4c0 [qla2xxx] > ? __nvme_fc_send_ls_req+0x260/0x380 [nvme_fc] > ? nvme_fc_send_ls_req.constprop.42+0x1a/0x45 [nvme_fc] > ? nvme_fc_connect_ctrl_work.cold.63+0x1e3/0xa7d [nvme_fc] > > [...] Applied to 6.5/scsi-queue, thanks! [1/1] qla2xxx: Remove unused nvme_ls_waitq wait queue. https://git.kernel.org/mkp/scsi/c/20fce500b232
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index c262cfcdbac8..95a12b4e0484 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -703,7 +703,6 @@ typedef struct srb { struct iocb_resource iores; struct kref cmd_kref; /* need to migrate ref_count over to this */ void *priv; - wait_queue_head_t nvme_ls_waitq; struct fc_port *fcport; struct scsi_qla_host *vha; unsigned int start_timer:1; diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c index 648e8f798606..86e85f2f4782 100644 --- a/drivers/scsi/qla2xxx/qla_nvme.c +++ b/drivers/scsi/qla2xxx/qla_nvme.c @@ -360,7 +360,6 @@ static int qla_nvme_ls_req(struct nvme_fc_local_port *lport, if (rval != QLA_SUCCESS) { ql_log(ql_log_warn, vha, 0x700e, "qla2x00_start_sp failed = %d\n", rval); - wake_up(&sp->nvme_ls_waitq); sp->priv = NULL; priv->sp = NULL; qla2x00_rel_sp(sp); @@ -652,7 +651,6 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, if (!sp) return -EBUSY; - init_waitqueue_head(&sp->nvme_ls_waitq); kref_init(&sp->cmd_kref); spin_lock_init(&priv->cmd_lock); sp->priv = priv; @@ -671,7 +669,6 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, if (rval != QLA_SUCCESS) { ql_log(ql_log_warn, vha, 0x212d, "qla2x00_start_nvme_mq failed = %d\n", rval); - wake_up(&sp->nvme_ls_waitq); sp->priv = NULL; priv->sp = NULL; qla2xxx_rel_qpair_sp(sp->qpair, sp);