On Thu, Mar 19, 2026 at 06:09:57PM -0700, Rosen Penev wrote: > Simplifies allocation by using a flexible array member > > Added __counted_by for extra runtime analysis.
This is make changes to 2 structs. For easier review, I'd split this patch up. For the wrb_context change, perhaps explain why a __counted_by is not added. -Kees > > Signed-off-by: Rosen Penev <[email protected]> > --- > drivers/scsi/be2iscsi/be_main.c | 27 ++------------------------- > drivers/scsi/be2iscsi/be_main.h | 4 ++-- > 2 files changed, 4 insertions(+), 27 deletions(-) > > diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c > index fd18d4d3d219..782a21af01a3 100644 > --- a/drivers/scsi/be2iscsi/be_main.c > +++ b/drivers/scsi/be2iscsi/be_main.c > @@ -2470,22 +2470,15 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba) > struct mem_array *mem_arr, *mem_arr_orig; > unsigned int i, j, alloc_size, curr_alloc_size; > > - phba->phwi_ctrlr = kzalloc(phba->params.hwi_ws_sz, GFP_KERNEL); > + phba->phwi_ctrlr = kzalloc_flex(*phba->phwi_ctrlr, wrb_context, > phba->params.cxns_per_ctrl); > if (!phba->phwi_ctrlr) > return -ENOMEM; > > /* Allocate memory for wrb_context */ > phwi_ctrlr = phba->phwi_ctrlr; > - phwi_ctrlr->wrb_context = kzalloc_objs(struct hwi_wrb_context, > - phba->params.cxns_per_ctrl); > - if (!phwi_ctrlr->wrb_context) { > - kfree(phba->phwi_ctrlr); > - return -ENOMEM; > - } > > phba->init_mem = kzalloc_objs(*mem_descr, SE_MEM_MAX); > if (!phba->init_mem) { > - kfree(phwi_ctrlr->wrb_context); > kfree(phba->phwi_ctrlr); > return -ENOMEM; > } > @@ -2493,7 +2486,6 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba) > mem_arr_orig = kmalloc_objs(*mem_arr_orig, BEISCSI_MAX_FRAGS_INIT); > if (!mem_arr_orig) { > kfree(phba->init_mem); > - kfree(phwi_ctrlr->wrb_context); > kfree(phba->phwi_ctrlr); > return -ENOMEM; > } > @@ -3992,25 +3984,12 @@ static int hba_setup_cid_tbls(struct beiscsi_hba > *phba) > > for (ulp_num = 0; ulp_num < BEISCSI_ULP_COUNT; ulp_num++) { > if (test_bit(ulp_num, (void *)&phba->fw_config.ulp_supported)) { > - ptr_cid_info = kzalloc_obj(struct ulp_cid_info); > - > + ptr_cid_info = kzalloc_flex(*ptr_cid_info, cid_array, > BEISCSI_GET_CID_COUNT(phba, ulp_num)); > if (!ptr_cid_info) { > ret = -ENOMEM; > goto free_memory; > } > > - /* Allocate memory for CID array */ > - ptr_cid_info->cid_array = > - kcalloc(BEISCSI_GET_CID_COUNT(phba, ulp_num), > - sizeof(*ptr_cid_info->cid_array), > - GFP_KERNEL); > - if (!ptr_cid_info->cid_array) { > - kfree(ptr_cid_info); > - ptr_cid_info = NULL; > - ret = -ENOMEM; > - > - goto free_memory; > - } > ptr_cid_info->avlbl_cids = BEISCSI_GET_CID_COUNT( > phba, ulp_num); > > @@ -4061,7 +4040,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) > ptr_cid_info = phba->cid_array_info[ulp_num]; > > if (ptr_cid_info) { > - kfree(ptr_cid_info->cid_array); > kfree(ptr_cid_info); > phba->cid_array_info[ulp_num] = NULL; > } > @@ -4175,7 +4153,6 @@ static void beiscsi_cleanup_port(struct beiscsi_hba > *phba) > ptr_cid_info = phba->cid_array_info[ulp_num]; > > if (ptr_cid_info) { > - kfree(ptr_cid_info->cid_array); > kfree(ptr_cid_info); > phba->cid_array_info[ulp_num] = NULL; > } > diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h > index 71c95d144560..77c9b1a1a488 100644 > --- a/drivers/scsi/be2iscsi/be_main.h > +++ b/drivers/scsi/be2iscsi/be_main.h > @@ -241,10 +241,10 @@ struct hwi_wrb_context { > }; > > struct ulp_cid_info { > - unsigned short *cid_array; > unsigned short avlbl_cids; > unsigned short cid_alloc; > unsigned short cid_free; > + unsigned short cid_array[] __counted_by(avlbl_cids); > }; > > #include "be.h" > @@ -968,10 +968,10 @@ struct be_ring { > }; > > struct hwi_controller { > - struct hwi_wrb_context *wrb_context; > struct be_ring default_pdu_hdr[BEISCSI_ULP_COUNT]; > struct be_ring default_pdu_data[BEISCSI_ULP_COUNT]; > struct hwi_context_memory *phwi_ctxt; > + struct hwi_wrb_context wrb_context[]; > }; > > enum hwh_type_enum { > -- > 2.53.0 > -- Kees Cook
