Commit c81df08c authored by Karan Tilak Kumar's avatar Karan Tilak Kumar Committed by Martin K. Petersen
Browse files

scsi: fnic: Add support for multiqueue (MQ) in fnic driver 



Implement support for MQ in fnic driver:

The block multiqueue layer issues IO to the fnic driver with an MQ tag. Use
the mqtag and derive a tag from it.  Derive the hardware queue from the
mqtag and use it in all paths. Modify queuecommand to handle mqtag.

Replace wq and cq indices to support MQ. Replace the zeroth queue with a
hardware queue.  Implement spin locks on a per hardware queue basis.
Replace io_lock with per hardware queue spinlock.  Implement out of range
tag checks.

Allocate an io_req_table to track status of the io_req.

Test the driver by building it, loading it, and configuring 64 queues in
UCSM. Issue IOs using Medusa on multiple fnics. Enable/disable links to
exercise the abort and clean up path.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202310300032.2awCqkfn-lkp@intel.com/


Reviewed-by: default avatarSesidhar Baddela <sebaddel@cisco.com>
Reviewed-by: default avatarArulprabhu Ponnusamy <arulponn@cisco.com>
Tested-by: default avatarKaran Tilak Kumar <kartilak@cisco.com>
Signed-off-by: default avatarKaran Tilak Kumar <kartilak@cisco.com>
Link: https://lore.kernel.org/r/20231211173617.932990-12-kartilak@cisco.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 52f6e196

drivers/scsi/fnic/fnic.h

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#define FNIC_MIN_IO_REQ			256 /* Min IO throttle count */

#define FNIC_MAX_IO_REQ		1024 /* scsi_cmnd tag map entries */

#define FNIC_DFLT_IO_REQ        256 /* Default scsi_cmnd tag map entries */

#define	FNIC_IO_LOCKS		64 /* IO locks: power of 2 */

#define FNIC_DFLT_QUEUE_DEPTH	256

#define	FNIC_STATS_RATE_LIMIT	4 /* limit rate at which stats are pulled up */
@@ -300,7 +299,6 @@ struct fnic { 
	struct fnic_host_tag *tags;

	mempool_t *io_req_pool;

	mempool_t *io_sgl_pool[FNIC_SGL_NUM_CACHES];

	spinlock_t io_req_lock[FNIC_IO_LOCKS];	/* locks for scsi cmnds */



	unsigned int copy_wq_base;

	struct work_struct link_work;

drivers/scsi/fnic/fnic_main.c

+0 −5
Original line number Diff line number Diff line
@@ -794,11 +794,6 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		fnic->fw_ack_index[i] = -1;

	}



	for (i = 0; i < FNIC_IO_LOCKS; i++)

		spin_lock_init(&fnic->io_req_lock[i]);



	spin_lock_init(&fnic->sgreset_lock);



	err = -ENOMEM;

	fnic->io_req_pool = mempool_create_slab_pool(2, fnic_io_req_cache);

	if (!fnic->io_req_pool)

drivers/scsi/fnic/fnic_scsi.c

+328 −247

File changed.

Preview size limit exceeded, changes collapsed.