github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-13 00:28:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

scsi: fnic: Use mempool for receive frames

Browse Source 
The receive frames are constantly replenished so we should rather use a
mempool here.

fip_frame_queue is an rxq. Deallocate it in fnic_free_rxq().

Tested-by: Karan Tilak Kumar <kartilak@cisco.com>
Reviewed-by: Sesidhar Baddela <sebaddel@cisco.com>
Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com>
Reviewed-by: Gian Carlo Boffa <gcboffa@cisco.com>
Reviewed-by: Arun Easi <aeasi@cisco.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com>
Co-developed-by: Hannes Reinecke <hare@kernel.org>
Link: https://patch.msgid.link/20260217223943.7938-1-kartilak@cisco.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Karan Tilak Kumar 2026-02-17 14:39:39 -08:00 committed by Martin K. Petersen
parent 6de23f81a5
commit 0e07baae55
4 changed files with 66 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/fnic/fnic.h
View File

@ -438,6 +438,7 @@ struct fnic {
struct list_head tx_queue;
mempool_t *frame_pool;
mempool_t *frame_elem_pool;
mempool_t *frame_recv_pool;
struct work_struct tport_work;
struct list_head tport_event_list;
@ -541,7 +542,8 @@ fnic_chk_state_flags_locked(struct fnic *fnic, unsigned long st_flags)
}
void __fnic_set_state_flags(struct fnic *, unsigned long, unsigned long);
void fnic_dump_fchost_stats(struct Scsi_Host *, struct fc_host_statistics *);
void fnic_free_txq(struct list_head *head);
void fnic_free_txq(struct fnic *fnic);
void fnic_free_rxq(struct fnic *fnic);
int fnic_get_desc_by_devid(struct pci_dev *pdev, char **desc,
char **subsys_desc);
void fnic_fdls_link_status_change(struct fnic *fnic, int linkup);

54
drivers/scsi/fnic/fnic_fcs.c
View File

@ -291,7 +291,7 @@ void fnic_handle_frame(struct work_struct *work)
if (fnic->stop_rx_link_events) {
list_del(&cur_frame->links);
spin_unlock_irqrestore(&fnic->fnic_lock, fnic->lock_flags);
kfree(cur_frame->fp);
mempool_free(cur_frame->fp, fnic->frame_recv_pool);
mempool_free(cur_frame, fnic->frame_elem_pool);
return;
}
@ -317,7 +317,7 @@ void fnic_handle_frame(struct work_struct *work)
fnic_fdls_recv_frame(&fnic->iport, cur_frame->fp,
cur_frame->frame_len, fchdr_offset);
kfree(cur_frame->fp);
mempool_free(cur_frame->fp, fnic->frame_recv_pool);
mempool_free(cur_frame, fnic->frame_elem_pool);
}
spin_unlock_irqrestore(&fnic->fnic_lock, fnic->lock_flags);
@ -337,8 +337,8 @@ void fnic_handle_fip_frame(struct work_struct *work)
if (fnic->stop_rx_link_events) {
list_del(&cur_frame->links);
spin_unlock_irqrestore(&fnic->fnic_lock, fnic->lock_flags);
kfree(cur_frame->fp);
kfree(cur_frame);
mempool_free(cur_frame->fp, fnic->frame_recv_pool);
mempool_free(cur_frame, fnic->frame_elem_pool);
return;
}
@ -355,8 +355,8 @@ void fnic_handle_fip_frame(struct work_struct *work)
list_del(&cur_frame->links);
if (fdls_fip_recv_frame(fnic, cur_frame->fp)) {
kfree(cur_frame->fp);
kfree(cur_frame);
mempool_free(cur_frame->fp, fnic->frame_recv_pool);
mempool_free(cur_frame, fnic->frame_elem_pool);
}
}
spin_unlock_irqrestore(&fnic->fnic_lock, fnic->lock_flags);
@ -375,10 +375,10 @@ static inline int fnic_import_rq_eth_pkt(struct fnic *fnic, void *fp)
eh = (struct ethhdr *) fp;
if ((eh->h_proto == cpu_to_be16(ETH_P_FIP)) && (fnic->iport.usefip)) {
fip_fr_elem = (struct fnic_frame_list *)
kzalloc_obj(struct fnic_frame_list, GFP_ATOMIC);
fip_fr_elem = mempool_alloc(fnic->frame_elem_pool, GFP_ATOMIC);
if (!fip_fr_elem)
return 0;
memset(fip_fr_elem, 0, sizeof(struct fnic_frame_list));
fip_fr_elem->fp = fp;
spin_lock_irqsave(&fnic->fnic_lock, flags);
list_add_tail(&fip_fr_elem->links, &fnic->fip_frame_queue);
@ -538,7 +538,7 @@ static void fnic_rq_cmpl_frame_recv(struct vnic_rq *rq, struct cq_desc
return;
drop:
kfree(fp);
mempool_free(fp, fnic->frame_recv_pool);
}
static int fnic_rq_cmpl_handler_cont(struct vnic_dev *vdev,
@ -591,7 +591,7 @@ int fnic_alloc_rq_frame(struct vnic_rq *rq)
int ret;
len = FNIC_FRAME_HT_ROOM;
buf = kmalloc(len, GFP_ATOMIC);
buf = mempool_alloc(fnic->frame_recv_pool, GFP_ATOMIC);
if (!buf) {
FNIC_FCS_DBG(KERN_INFO, fnic->host, fnic->fnic_num,
"Unable to allocate RQ buffer of size: %d\n", len);
@ -609,7 +609,7 @@ int fnic_alloc_rq_frame(struct vnic_rq *rq)
fnic_queue_rq_desc(rq, buf, pa, len);
return 0;
free_buf:
kfree(buf);
mempool_free(buf, fnic->frame_recv_pool);
return ret;
}
@ -621,7 +621,7 @@ void fnic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)
dma_unmap_single(&fnic->pdev->dev, buf->dma_addr, buf->len,
DMA_FROM_DEVICE);
kfree(rq_buf);
mempool_free(rq_buf, fnic->frame_recv_pool);
buf->os_buf = NULL;
}
@ -836,14 +836,34 @@ fnic_fdls_register_portid(struct fnic_iport_s *iport, u32 port_id,
return 0;
}
void fnic_free_txq(struct list_head *head)
void fnic_free_txq(struct fnic *fnic)
{
struct fnic_frame_list *cur_frame, *next;
list_for_each_entry_safe(cur_frame, next, head, links) {
list_for_each_entry_safe(cur_frame, next, &fnic->tx_queue, links) {
list_del(&cur_frame->links);
kfree(cur_frame->fp);
kfree(cur_frame);
mempool_free(cur_frame->fp, fnic->frame_pool);
mempool_free(cur_frame, fnic->frame_elem_pool);
}
}
void fnic_free_rxq(struct fnic *fnic)
{
struct fnic_frame_list *cur_frame, *next;
list_for_each_entry_safe(cur_frame, next, &fnic->frame_queue, links) {
list_del(&cur_frame->links);
mempool_free(cur_frame->fp, fnic->frame_recv_pool);
mempool_free(cur_frame, fnic->frame_elem_pool);
}
if (fnic->config.flags & VFCF_FIP_CAPABLE) {
list_for_each_entry_safe(cur_frame, next,
&fnic->fip_frame_queue, links) {
list_del(&cur_frame->links);
mempool_free(cur_frame->fp, fnic->frame_recv_pool);
mempool_free(cur_frame, fnic->frame_elem_pool);
}
}
}
@ -898,7 +918,7 @@ void fnic_free_wq_buf(struct vnic_wq *wq, struct vnic_wq_buf *buf)
dma_unmap_single(&fnic->pdev->dev, buf->dma_addr, buf->len,
DMA_TO_DEVICE);
kfree(buf->os_buf);
mempool_free(buf->os_buf, fnic->frame_pool);
buf->os_buf = NULL;
}

28
drivers/scsi/fnic/fnic_main.c
View File

@ -40,6 +40,7 @@ static struct kmem_cache *fnic_sgl_cache[FNIC_SGL_NUM_CACHES];
static struct kmem_cache *fnic_io_req_cache;
static struct kmem_cache *fdls_frame_cache;
static struct kmem_cache *fdls_frame_elem_cache;
static struct kmem_cache *fdls_frame_recv_cache;
static LIST_HEAD(fnic_list);
static DEFINE_SPINLOCK(fnic_list_lock);
static DEFINE_IDA(fnic_ida);
@ -554,6 +555,7 @@ static int fnic_cleanup(struct fnic *fnic)
mempool_destroy(fnic->io_req_pool);
mempool_destroy(fnic->frame_pool);
mempool_destroy(fnic->frame_elem_pool);
mempool_destroy(fnic->frame_recv_pool);
for (i = 0; i < FNIC_SGL_NUM_CACHES; i++)
mempool_destroy(fnic->io_sgl_pool[i]);
@ -928,6 +930,14 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
}
fnic->frame_elem_pool = pool;
pool = mempool_create_slab_pool(FDLS_MIN_FRAMES,
fdls_frame_recv_cache);
if (!pool) {
err = -ENOMEM;
goto err_out_fdls_frame_recv_pool;
}
fnic->frame_recv_pool = pool;
/* setup vlan config, hw inserts vlan header */
fnic->vlan_hw_insert = 1;
fnic->vlan_id = 0;
@ -1085,6 +1095,8 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
}
vnic_dev_notify_unset(fnic->vdev);
err_out_fnic_notify_set:
mempool_destroy(fnic->frame_recv_pool);
err_out_fdls_frame_recv_pool:
mempool_destroy(fnic->frame_elem_pool);
err_out_fdls_frame_elem_pool:
mempool_destroy(fnic->frame_pool);
@ -1157,7 +1169,6 @@ static void fnic_remove(struct pci_dev *pdev)
timer_delete_sync(&fnic->enode_ka_timer);
timer_delete_sync(&fnic->vn_ka_timer);
fnic_free_txq(&fnic->fip_frame_queue);
fnic_fcoe_reset_vlans(fnic);
}
@ -1177,8 +1188,8 @@ static void fnic_remove(struct pci_dev *pdev)
list_del(&fnic->list);
spin_unlock_irqrestore(&fnic_list_lock, flags);
fnic_free_txq(&fnic->frame_queue);
fnic_free_txq(&fnic->tx_queue);
fnic_free_rxq(fnic);
fnic_free_txq(fnic);
vnic_dev_notify_unset(fnic->vdev);
fnic_free_intr(fnic);
@ -1287,6 +1298,15 @@ static int __init fnic_init_module(void)
goto err_create_fdls_frame_cache_elem;
}
fdls_frame_recv_cache = kmem_cache_create("fdls_frame_recv",
FNIC_FRAME_HT_ROOM,
0, SLAB_HWCACHE_ALIGN, NULL);
if (!fdls_frame_recv_cache) {
pr_err("fnic fdls frame recv cach create failed\n");
err = -ENOMEM;
goto err_create_fdls_frame_recv_cache;
}
fnic_event_queue =
alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM, "fnic_event_wq");
if (!fnic_event_queue) {
@ -1339,6 +1359,8 @@ static int __init fnic_init_module(void)
if (pc_rscn_handling_feature_flag == PC_RSCN_HANDLING_FEATURE_ON)
destroy_workqueue(reset_fnic_work_queue);
err_create_reset_fnic_workq:
kmem_cache_destroy(fdls_frame_recv_cache);
err_create_fdls_frame_recv_cache:
destroy_workqueue(fnic_event_queue);
err_create_fnic_workq:
kmem_cache_destroy(fdls_frame_elem_cache);

2
drivers/scsi/fnic/fnic_scsi.c
View File

@ -777,7 +777,7 @@ static int fnic_fcpio_fw_reset_cmpl_handler(struct fnic *fnic,
*/
if (ret) {
spin_unlock_irqrestore(&fnic->fnic_lock, flags);
fnic_free_txq(&fnic->tx_queue);
fnic_free_txq(fnic);
goto reset_cmpl_handler_end;
}