scsi: bnx2fc: simplify allocation
Subsystems (2)
cover scsi: bnx2fc: simplify allocation
Use flexible array members to combine allocations and simplify freeing.
Rosen Penev (3):
scsi: bnx2fc: simplify allocation of cmgr
scsi: bnx2fc: no double pointer for io_bdt_pool
scsi: bnx2fc: tgt_ofld_list to FAM
drivers/scsi/bnx2fc/bnx2fc.h | 10 ++--- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 14 +----- drivers/scsi/bnx2fc/bnx2fc_io.c | 73 +++++-------------------------- 3 files changed, 18 insertions(+), 79 deletions(-)
--
2.54.0
PATCH 1/3 scsi: bnx2fc: simplify allocation of cmgr
Switch to flexible array member for cmds so that all members can be referenced properly instead of using + 1 hacks.
Allocate io_bdt_pool, free_list, and free_list_lock with the struct to avoid separate kfrees.
Remove mem_size variable. It's just open coding kzalloc_objs.
--- drivers/scsi/bnx2fc/bnx2fc.h | 2 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 52 +++++---------------------------- 2 files changed, 9 insertions(+), 45 deletions(-)
drivers/scsi/bnx2fc/bnx2fc.h +1 -1
@@ -281,7 +281,7 @@ struct bnx2fc_cmd_mgr {struct list_head *free_list;spinlock_t *free_list_lock;struct io_bdt **io_bdt_pool; -struct bnx2fc_cmd **cmds; +struct bnx2fc_cmd *cmds[]; };struct bnx2fc_rport {
drivers/scsi/bnx2fc/bnx2fc_io.c +8 -44
95 lines not on this page · raw message
Signature · 1 line
2.54.0
PATCH 2/3 scsi: bnx2fc: no double pointer for io_bdt_pool
In reply to Rosen PenevInstead of allocating a double pointer, allocate a single and avoid extra malloc and free. It's not needed anyway.
--- drivers/scsi/bnx2fc/bnx2fc.h | 2 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-)
drivers/scsi/bnx2fc/bnx2fc.h +1 -1
@@ -280,7 +280,7 @@ struct bnx2fc_cmd_mgr {u16 next_idx;struct list_head *free_list;spinlock_t *free_list_lock; -struct io_bdt **io_bdt_pool; +struct io_bdt *io_bdt_pool;struct bnx2fc_cmd *cmds[]; };
drivers/scsi/bnx2fc/bnx2fc_io.c +5 -20
@@ -242,7 +242,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba) } cmgr->hba = hba; - cmgr->io_bdt_pool = (struct io_bdt **)(cmgr->cmds + num_ios); + cmgr->io_bdt_pool = (struct io_bdt *)(cmgr->cmds + num_ios); cmgr->free_list = (struct list_head *)(cmgr->io_bdt_pool + num_ios); cmgr->free_list_lock = (spinlock_t *)(cmgr->free_list + arr_sz);
@@ -280,19 +280,10 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba) io_req++; } -for (i =0 ; i < num_ios; i++) { - cmgr->io_bdt_pool[i] = kmalloc_obj(struct io_bdt); -if (!cmgr->io_bdt_pool[i]) { - printk(KERN_ERR PFX "failed to alloc " - "io_bdt_pool[%d]\n", i); - goto mem_err; - } - } -/* Allocate an map fcoe_bdt_ctx structures */ bd_tbl_sz =BNX2FC_MAX_BDS_PER_CMD *sizeof (struct fcoe_bd_ctx );for (i =0 ; i < num_ios; i++) { - bdt_info = cmgr->io_bdt_pool[i]; + bdt_info = &cmgr->io_bdt_pool[i]; bdt_info->bd_tbl = dma_alloc_coherent(&hba->pcidev->dev, bd_tbl_sz, &bdt_info->bd_tbl_dma,
@@ -325,7 +316,7 @@ void bnx2fc_cmd_mgr_free(struct bnx2fc_cmd_mgr *cmgr) bd_tbl_sz =BNX2FC_MAX_BDS_PER_CMD *sizeof (struct fcoe_bd_ctx );for (i =0 ; i < num_ios; i++) { - bdt_info = cmgr->io_bdt_pool[i]; + bdt_info = &cmgr->io_bdt_pool[i];if (bdt_info->bd_tbl) { dma_free_coherent(&hba->pcidev->dev, bd_tbl_sz, bdt_info->bd_tbl,
@@ -334,12 +325,6 @@ void bnx2fc_cmd_mgr_free(struct bnx2fc_cmd_mgr *cmgr) } } -/* Destroy io_bdt pool */ -for (i =0 ; i < num_ios; i++) { -kfree (cmgr->io_bdt_pool[i]); - cmgr->io_bdt_pool[i] =NULL ; - } -for (i =0 ; i <num_possible_cpus () +1 ; i++) {struct bnx2fc_cmd *tmp, *io_req;
@@ -415,7 +400,7 @@ struct bnx2fc_cmd *bnx2fc_elstm_alloc(struct bnx2fc_rport *tgt, int type)/* Bind io_bdt for this io_req */ /* Have a static link between io_req and io_bdt_pool */ - bd_tbl = io_req->bd_tbl = cmd_mgr->io_bdt_pool[xid]; + bd_tbl = io_req->bd_tbl = &cmd_mgr->io_bdt_pool[xid]; bd_tbl->io_req = io_req;/* Hold the io_req against deletion */
@@ -468,7 +453,7 @@ struct bnx2fc_cmd *bnx2fc_cmd_alloc(struct bnx2fc_rport *tgt)/* Bind io_bdt for this io_req */ /* Have a static link between io_req and io_bdt_pool */ - bd_tbl = io_req->bd_tbl = cmd_mgr->io_bdt_pool[xid]; + bd_tbl = io_req->bd_tbl = &cmd_mgr->io_bdt_pool[xid]; bd_tbl->io_req = io_req;/* Hold the io_req against deletion */
Signature · 1 line
2.54.0
PATCH 3/3 scsi: bnx2fc: tgt_ofld_list to FAM
In reply to Rosen PenevSimplify allocation slightly by allocating tgt_ofld_list with hba. No need to kfree separately.
--- drivers/scsi/bnx2fc/bnx2fc.h | 6 +++--- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 14 ++------------ 2 files changed, 5 insertions(+), 15 deletions(-)
drivers/scsi/bnx2fc/bnx2fc.h +3 -3
@@ -224,9 +224,6 @@ struct bnx2fc_hba {char *dummy_buffer;dma_addr_t dummy_buf_dma; -/* Active list of offloaded sessions */ -struct bnx2fc_rport **tgt_ofld_list; -/* statistics */ struct bnx2fc_fw_stats bfw_stats;struct fcoe_statistics_params prev_stats;
@@ -246,6 +243,9 @@ struct bnx2fc_hba {struct list_head vports;char chip_num[BCM_CHIP_LEN ]; + +/* Active list of offloaded sessions */ +struct bnx2fc_rport *tgt_ofld_list[]; };struct bnx2fc_interface {
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +2 -12
@@ -1337,7 +1337,6 @@ static void bnx2fc_hba_destroy(struct bnx2fc_hba *hba)bnx2fc_cmd_mgr_free (hba->cmd_mgr); hba->cmd_mgr =NULL ; } -kfree (hba->tgt_ofld_list);bnx2fc_unbind_pcidev (hba);kfree (hba); }
@@ -1356,7 +1355,7 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)struct fcoe_capabilities *fcoe_cap;int rc; - hba =kzalloc_obj (*hba); + hba =kzalloc_flex (*hba, tgt_ofld_list,BNX2FC_NUM_MAX_SESS );if (!hba) { printk(KERN_ERR PFX "Unable to allocate hba structure\n");return NULL ;
@@ -1380,19 +1379,12 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic) hba->phys_dev = cnic->netdev; hba->next_conn_id =0 ; - hba->tgt_ofld_list = - kzalloc_objs(struct bnx2fc_rport *, BNX2FC_NUM_MAX_SESS); -if (!hba->tgt_ofld_list) { - printk(KERN_ERR PFX "Unable to allocate tgt offload list\n"); - goto tgtofld_err; - } - hba->num_ofld_sess =0 ; hba->cmd_mgr =bnx2fc_cmd_mgr_alloc (hba);if (!hba->cmd_mgr) { printk(KERN_ERR PFX "em_config:bnx2fc_cmd_mgr_alloc failed\n"); - goto cmgr_err; + goto tgtofld_err; } fcoe_cap = &hba->fcoe_cap;
@@ -1416,8 +1408,6 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)return hba; -cmgr_err: -kfree (hba->tgt_ofld_list); tgtofld_err:bnx2fc_unbind_pcidev (hba); bind_err:
Signature · 1 line
2.54.0