[PATCH v3 5/8] ibmvfc: allocate asynchronous sub-queue
From: Dave Marquardt via B4 Relay <devnull+davemarq.linux.ibm.com@kernel.org>
Date: 2026-07-02 17:59:39
Also in:
b4-sent, linux-scsi, lkml
Subsystem:
ibm power virtual fc device drivers, linux for powerpc (32-bit and 64-bit), scsi subsystem, the rest · Maintainers:
Tyrel Datwyler, Madhavan Srinivasan, Michael Ellerman, "James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
From: Dave Marquardt <redacted> Allocate and set up the asynchronous sub-queue for asynchronous events, as required for full and extended FPIN support. Signed-off-by: Dave Marquardt <redacted> --- drivers/scsi/ibmvscsi/ibmvfc.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 6dd1e726d9b9..804887fb5635 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c@@ -5371,6 +5371,8 @@ static void ibmvfc_channel_setup_done(struct ibmvfc_event *evt) for (i = 0; i < active_queues; i++) scrqs->scrqs[i].vios_cookie = be64_to_cpu(setup->channel_handles[i]); + scrqs->async_scrq->vios_cookie = + be64_to_cpu(setup->async_subq_handle); ibmvfc_dbg(vhost, "Using %u channels\n", vhost->scsi_scrqs.active_queues);
@@ -5421,6 +5423,7 @@ static void ibmvfc_channel_setup(struct ibmvfc_host *vhost) setup_buf->num_scsi_subq_channels = cpu_to_be32(num_channels); for (i = 0; i < num_channels; i++) setup_buf->channel_handles[i] = cpu_to_be64(scrqs->scrqs[i].cookie); + setup_buf->async_subq_handle = cpu_to_be64(scrqs->async_scrq->cookie); } ibmvfc_init_event(evt, ibmvfc_channel_setup_done, IBMVFC_MAD_FORMAT);
@@ -6388,6 +6391,17 @@ static int ibmvfc_alloc_channels(struct ibmvfc_host *vhost, if (!channels->scrqs) return -ENOMEM; + channels->async_scrq = kzalloc_obj(*channels->async_scrq, GFP_KERNEL); + if (!channels->async_scrq) { + rc = -ENOMEM; + goto free_scrqs; + } + + rc = ibmvfc_alloc_queue(vhost, channels->async_scrq, + IBMVFC_SUB_CRQ_FMT); + if (rc) + goto free_async; + for (i = 0; i < channels->max_queues; i++) { scrq = &channels->scrqs[i]; rc = ibmvfc_alloc_queue(vhost, scrq, IBMVFC_SUB_CRQ_FMT);
@@ -6396,13 +6410,21 @@ static int ibmvfc_alloc_channels(struct ibmvfc_host *vhost, scrq = &channels->scrqs[j - 1]; ibmvfc_free_queue(vhost, scrq); } - kfree(channels->scrqs); - channels->scrqs = NULL; + ibmvfc_free_queue(vhost, channels->async_scrq); channels->active_queues = 0; - return rc; + goto free_async; } } + return rc; + +free_async: + kfree(channels->async_scrq); + channels->async_scrq = NULL; +free_scrqs: + kfree(channels->scrqs); + channels->scrqs = NULL; + return rc; }
@@ -6437,6 +6459,10 @@ static void ibmvfc_release_channels(struct ibmvfc_host *vhost, kfree(channels->scrqs); channels->scrqs = NULL; + + ibmvfc_free_queue(vhost, channels->async_scrq); + channels->async_scrq = NULL; + channels->active_queues = 0; } }
--
2.54.0