[PATCH 00/20] scsi: ibmvfc: Fixes and cleanup for NVMe/FC support

From: Tyrel Datwyler

Date: Wed Sep 16 2026 - 19:09:40 EST


This series addresses a collection of bugs and corner cases introduced with in
the recently merged NVMe/FC support for the ibmvfc driver.

The NVMe/FC code added a parallel target management path, a new set of
sub-CRQ channels (nvme_scrqs), and integration with the nvme-fc transport
layer alongside the existing SCSI infrastructure. Several issues crept in
during that integration: missing initialisation, incorrect locking, blocking
calls in atomic context, and logic errors in shared code paths that were not
previously exercised by the SCSI-only driver.

The fixes fall into a few broad categories:

- Correctness in the NVMe FCP/LS I/O path: initialise evt->tgt, fix trace
logging reading SCSI IU fields for NVMe events, and ensure H_CLOSED send
failures call fcp_req->done() so the transport is not silently stalled.

- Locking and context fixes: defer nvme_fc_register_localport() out of the
MAD completion handler (which runs under host_lock with IRQs disabled),
and make the FCP and LS abort callbacks fully asynchronous to eliminate
blocking wait_for_completion() calls on the same path.

- Data races and UAF: protect tgt->nvme_remote_port reads and writes with
host_lock, fix a use-after-free and stall in the LS abort timeout handler,
and handle ibmvfc_send_event() failure in ibmvfc_cancel_all_mq() to
prevent a hang and UAF on queued cancel events.

- Shared-path bugs exposed by NVMe: fix an uninitialised _done dereference
for SCSI TMF events on send failure, an uninitialised shwqs stack variable
in ibmvfc_purge_requests(), a u16 overflow of max_cmds in
ibmvfc_set_login_info() reachable with combined SCSI and NVMe queue
counts, and a wrong target action in the implicit logout NULL-evt error
path that caused an infinite reset loop.

- Lifecycle and resource management: call ibmvfc_nvme_unregister() on
adapter removal and before ibmvfc_release_sub_crqs() to close a TOCTOU
race in ibmvfc_nvme_create_queue(), guard against local port leaks on
link bounce, and fix NVMe sub-queue registration failure incorrectly
disabling SCSI multiqueue.

- Concurrency in target discovery: serialise the SCSI and NVMe
discover-targets MADs so both completions have written their target counts
before ibmvfc_alloc_targets() runs.

- Minor fixes: correct an inverted suppress-ABTS capability check in the
NVMe TMF path, fix an uninitialised status variable logged on LS abort
send failure, and honour the nr_nvme_hw_queues module parameter when
sizing NVMe queues at probe time.

Tyrel Datwyler (20):
scsi: ibmvfc: initialize evt->tgt for NVMe FCP commands
scsi: ibmvfc: fix trace logging for NVMe FCP commands
scsi: ibmvfc: complete NVMe FCP requests on H_CLOSED send failure
scsi: ibmvfc: defer NVMe local port registration out of atomic context
scsi: ibmvfc: fix uninitialized _done dereference for TMF events on
send failure
scsi: ibmvfc: fix uninitialized shwqs in ibmvfc_purge_requests()
scsi: ibmvfc: fix uninitialized status logged on LS abort send failure
scsi: ibmvfc: fix inverted suppress-ABTS capability check in NVMe TMF
path
scsi: ibmvfc: fix infinite reset loop on NULL evt in implicit logout
path
scsi: ibmvfc: fix u16 overflow of max_cmds in ibmvfc_set_login_info()
scsi: ibmvfc: fix UAF and hang in ibmvfc_cancel_all_mq() on send
failure
scsi: ibmvfc: fix data race on tgt->nvme_remote_port
scsi: ibmvfc: make NVMe FCP abort callback asynchronous
scsi: ibmvfc: fix UAF and stall in NVMe LS abort callback
scsi: ibmvfc: unregister NVMe local port on adapter removal
scsi: ibmvfc: fix NVMe local port leak on fabric link bounce
scsi: ibmvfc: fix TOCTOU race in ibmvfc_nvme_create_queue() on adapter
removal
scsi: ibmvfc: fix NVMe sub-queue registration failure disabling SCSI
multiqueue
scsi: ibmvfc: fix concurrent SCSI and NVMe discover-targets race
dropping targets
scsi: ibmvfc: fix nr_nvme_hw_queues module parameter ignored for NVMe
queue sizing

drivers/scsi/ibmvscsi/ibmvfc-core.c | 79 +++++++++++++-----
drivers/scsi/ibmvscsi/ibmvfc-nvme.c | 123 +++++++++++++++-------------
drivers/scsi/ibmvscsi/ibmvfc.h | 2 +
3 files changed, 127 insertions(+), 77 deletions(-)

--
2.55.0