2021-02-06 18:57:05

by James Bottomley

Subject: [GIT PULL] SCSI fixes for 5.11-rc6

One fix in drivers (lpfc) that stops an oops on resource exhaustion.

The patch is available here:

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes

The short changelog is:

James Smart (1):
scsi: lpfc: Fix EEH encountering oops with NVMe traffic

And the diffstat:

drivers/scsi/lpfc/lpfc_nvme.c | 3 +++
1 file changed, 3 insertions(+)

With full diff below

James

---

diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index 1cb82fa6a60e..39d147e251bf 100644
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -559,6 +559,9 @@ __lpfc_nvme_ls_req(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
return -ENODEV;
}

+ if (!vport->phba->sli4_hba.nvmels_wq)
+ return -ENOMEM;
+
/*
* there are two dma buf in the request, actually there is one and
* the second one is just the start address + cmd size.

2021-02-06 22:47:46

by pr-tracker-bot

Subject: Re: [GIT PULL] SCSI fixes for 5.11-rc6

The pull request you sent on Sat, 06 Feb 2021 09:40:32 -0800:

> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/964d069f93c4468b220f7e15fac7a3f7bd6d13ec

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html