diff mbox series

[net,v1,1/3] bnxt_en: refactor tpa_info alloc/free into helpers

Message ID 20241125042412.2865764-2-dw@davidwei.uk (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series bnxt_en: support header page pool in queue API | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present fail Series targets non-next tree, but doesn't contain any Fixes tags
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 3 this patch: 3
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 6 of 6 maintainers
netdev/build_clang success Errors and warnings before: 3 this patch: 3
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 4 this patch: 4
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 219 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 2 this patch: 2
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-11-25--12-00 (tests: 789)

Commit Message

David Wei Nov. 25, 2024, 4:24 a.m. UTC 
Refactor bnxt_rx_ring_info->tpa_info operations into helpers that work
on a single tpa_info in prep for queue API using them.

There are 2 pairs of operations:

* bnxt_alloc_one_tpa_info()
* bnxt_free_one_tpa_info()

These alloc/free the tpa_info array itself.

* bnxt_alloc_one_tpa_info_data()
* bnxt_free_one_tpa_info_data()

These alloc/free the frags stored in tpa_info array.

Signed-off-by: David Wei <dw@davidwei.uk>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 148 ++++++++++++++--------
 1 file changed, 95 insertions(+), 53 deletions(-)

Comments

Somnath Kotur Nov. 26, 2024, 6:30 a.m. UTC | #1 
On Mon, Nov 25, 2024 at 9:54 AM David Wei <dw@davidwei.uk> wrote:
>
> Refactor bnxt_rx_ring_info->tpa_info operations into helpers that work
> on a single tpa_info in prep for queue API using them.
>
> There are 2 pairs of operations:
>
> * bnxt_alloc_one_tpa_info()
> * bnxt_free_one_tpa_info()
>
> These alloc/free the tpa_info array itself.
>
> * bnxt_alloc_one_tpa_info_data()
> * bnxt_free_one_tpa_info_data()
>
> These alloc/free the frags stored in tpa_info array.
>
> Signed-off-by: David Wei <dw@davidwei.uk>
> ---
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c | 148 ++++++++++++++--------
>  1 file changed, 95 insertions(+), 53 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> index 5f7bdafcf05d..b2cc8df22241 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> @@ -3421,15 +3421,11 @@ static void bnxt_free_one_rx_agg_ring(struct bnxt *bp, struct bnxt_rx_ring_info
>         }
>  }
>
> -static void bnxt_free_one_rx_ring_skbs(struct bnxt *bp, int ring_nr)
> +static void bnxt_free_one_tpa_info_data(struct bnxt *bp,
> +                                       struct bnxt_rx_ring_info *rxr)
>  {
> -       struct bnxt_rx_ring_info *rxr = &bp->rx_ring[ring_nr];
> -       struct bnxt_tpa_idx_map *map;
>         int i;
>
> -       if (!rxr->rx_tpa)
> -               goto skip_rx_tpa_free;
> -
>         for (i = 0; i < bp->max_tpa; i++) {
>                 struct bnxt_tpa_info *tpa_info = &rxr->rx_tpa[i];
>                 u8 *data = tpa_info->data;
> @@ -3440,6 +3436,17 @@ static void bnxt_free_one_rx_ring_skbs(struct bnxt *bp, int ring_nr)
>                 tpa_info->data = NULL;
>                 page_pool_free_va(rxr->head_pool, data, false);
>         }
> +}
> +
> +static void bnxt_free_one_rx_ring_skbs(struct bnxt *bp,
> +                                      struct bnxt_rx_ring_info *rxr)
> +{
> +       struct bnxt_tpa_idx_map *map;
> +
> +       if (!rxr->rx_tpa)
> +               goto skip_rx_tpa_free;
> +
> +       bnxt_free_one_tpa_info_data(bp, rxr);
>
>  skip_rx_tpa_free:
>         if (!rxr->rx_buf_ring)
> @@ -3461,13 +3468,17 @@ static void bnxt_free_one_rx_ring_skbs(struct bnxt *bp, int ring_nr)
>
>  static void bnxt_free_rx_skbs(struct bnxt *bp)
>  {
> +       struct bnxt_rx_ring_info *rxr;
>         int i;
>
>         if (!bp->rx_ring)
>                 return;
>
> -       for (i = 0; i < bp->rx_nr_rings; i++)
> -               bnxt_free_one_rx_ring_skbs(bp, i);
> +       for (i = 0; i < bp->rx_nr_rings; i++) {
> +               rxr = &bp->rx_ring[i];
> +
> +               bnxt_free_one_rx_ring_skbs(bp, rxr);
Minor nit; Could avoid a declaration and an assignment here by
directly calling this API with the 2nd param set to &bp->rx_ring[i] ?
> +       }
>  }
>
>  static void bnxt_free_skbs(struct bnxt *bp)
> @@ -3608,29 +3619,64 @@ static int bnxt_alloc_ring(struct bnxt *bp, struct bnxt_ring_mem_info *rmem)
>         return 0;
>  }
>
> +static void bnxt_free_one_tpa_info(struct bnxt *bp,
> +                                  struct bnxt_rx_ring_info *rxr)
> +{
> +       int i;
> +
> +       kfree(rxr->rx_tpa_idx_map);
> +       rxr->rx_tpa_idx_map = NULL;
> +       if (rxr->rx_tpa) {
> +               for (i = 0; i < bp->max_tpa; i++) {
> +                       kfree(rxr->rx_tpa[i].agg_arr);
> +                       rxr->rx_tpa[i].agg_arr = NULL;
> +               }
> +       }
> +       kfree(rxr->rx_tpa);
> +       rxr->rx_tpa = NULL;
> +}
> +
>  static void bnxt_free_tpa_info(struct bnxt *bp)
>  {
> -       int i, j;
> +       int i;
>
>         for (i = 0; i < bp->rx_nr_rings; i++) {
>                 struct bnxt_rx_ring_info *rxr = &bp->rx_ring[i];
>
> -               kfree(rxr->rx_tpa_idx_map);
> -               rxr->rx_tpa_idx_map = NULL;
> -               if (rxr->rx_tpa) {
> -                       for (j = 0; j < bp->max_tpa; j++) {
> -                               kfree(rxr->rx_tpa[j].agg_arr);
> -                               rxr->rx_tpa[j].agg_arr = NULL;
> -                       }
> -               }
> -               kfree(rxr->rx_tpa);
> -               rxr->rx_tpa = NULL;
> +               bnxt_free_one_tpa_info(bp, rxr);
> +       }
> +}
> +
> +static int bnxt_alloc_one_tpa_info(struct bnxt *bp,
> +                                  struct bnxt_rx_ring_info *rxr)
> +{
> +       struct rx_agg_cmp *agg;
> +       int i;
> +
> +       rxr->rx_tpa = kcalloc(bp->max_tpa, sizeof(struct bnxt_tpa_info),
> +                             GFP_KERNEL);
> +       if (!rxr->rx_tpa)
> +               return -ENOMEM;
> +
> +       if (!(bp->flags & BNXT_FLAG_CHIP_P5_PLUS))
> +               return 0;
> +       for (i = 0; i < bp->max_tpa; i++) {
> +               agg = kcalloc(MAX_SKB_FRAGS, sizeof(*agg), GFP_KERNEL);
> +               if (!agg)
> +                       return -ENOMEM;
> +               rxr->rx_tpa[i].agg_arr = agg;
>         }
> +       rxr->rx_tpa_idx_map = kzalloc(sizeof(*rxr->rx_tpa_idx_map),
> +                                     GFP_KERNEL);
> +       if (!rxr->rx_tpa_idx_map)
> +               return -ENOMEM;
> +
> +       return 0;
>  }
>
>  static int bnxt_alloc_tpa_info(struct bnxt *bp)
>  {
> -       int i, j;
> +       int i, rc;
>
>         bp->max_tpa = MAX_TPA;
>         if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {
> @@ -3641,25 +3687,10 @@ static int bnxt_alloc_tpa_info(struct bnxt *bp)
>
>         for (i = 0; i < bp->rx_nr_rings; i++) {
>                 struct bnxt_rx_ring_info *rxr = &bp->rx_ring[i];
> -               struct rx_agg_cmp *agg;
>
> -               rxr->rx_tpa = kcalloc(bp->max_tpa, sizeof(struct bnxt_tpa_info),
> -                                     GFP_KERNEL);
> -               if (!rxr->rx_tpa)
> -                       return -ENOMEM;
> -
> -               if (!(bp->flags & BNXT_FLAG_CHIP_P5_PLUS))
> -                       continue;
> -               for (j = 0; j < bp->max_tpa; j++) {
> -                       agg = kcalloc(MAX_SKB_FRAGS, sizeof(*agg), GFP_KERNEL);
> -                       if (!agg)
> -                               return -ENOMEM;
> -                       rxr->rx_tpa[j].agg_arr = agg;
> -               }
> -               rxr->rx_tpa_idx_map = kzalloc(sizeof(*rxr->rx_tpa_idx_map),
> -                                             GFP_KERNEL);
> -               if (!rxr->rx_tpa_idx_map)
> -                       return -ENOMEM;
> +               rc = bnxt_alloc_one_tpa_info(bp, rxr);
> +               if (rc)
> +                       return rc;
>         }
>         return 0;
>  }
> @@ -4268,10 +4299,31 @@ static void bnxt_alloc_one_rx_ring_page(struct bnxt *bp,
>         rxr->rx_agg_prod = prod;
>  }
>
> +static int bnxt_alloc_one_tpa_info_data(struct bnxt *bp,
> +                                       struct bnxt_rx_ring_info *rxr)
> +{
> +       dma_addr_t mapping;
> +       u8 *data;
> +       int i;
> +
> +       for (i = 0; i < bp->max_tpa; i++) {
> +               data = __bnxt_alloc_rx_frag(bp, &mapping, rxr,
> +                                           GFP_KERNEL);
> +               if (!data)
> +                       return -ENOMEM;
> +
> +               rxr->rx_tpa[i].data = data;
> +               rxr->rx_tpa[i].data_ptr = data + bp->rx_offset;
> +               rxr->rx_tpa[i].mapping = mapping;
> +       }
> +
> +       return 0;
> +}
> +
>  static int bnxt_alloc_one_rx_ring(struct bnxt *bp, int ring_nr)
>  {
>         struct bnxt_rx_ring_info *rxr = &bp->rx_ring[ring_nr];
> -       int i;
> +       int rc;
>
>         bnxt_alloc_one_rx_ring_skb(bp, rxr, ring_nr);
>
> @@ -4281,19 +4333,9 @@ static int bnxt_alloc_one_rx_ring(struct bnxt *bp, int ring_nr)
>         bnxt_alloc_one_rx_ring_page(bp, rxr, ring_nr);
>
>         if (rxr->rx_tpa) {
> -               dma_addr_t mapping;
> -               u8 *data;
> -
> -               for (i = 0; i < bp->max_tpa; i++) {
> -                       data = __bnxt_alloc_rx_frag(bp, &mapping, rxr,
> -                                                   GFP_KERNEL);
> -                       if (!data)
> -                               return -ENOMEM;
> -
> -                       rxr->rx_tpa[i].data = data;
> -                       rxr->rx_tpa[i].data_ptr = data + bp->rx_offset;
> -                       rxr->rx_tpa[i].mapping = mapping;
> -               }
> +               rc = bnxt_alloc_one_tpa_info_data(bp, rxr);
> +               if (rc)
> +                       return rc;
>         }
>         return 0;
>  }
> @@ -13657,7 +13699,7 @@ static void bnxt_rx_ring_reset(struct bnxt *bp)
>                         bnxt_reset_task(bp, true);
>                         break;
>                 }
> -               bnxt_free_one_rx_ring_skbs(bp, i);
> +               bnxt_free_one_rx_ring_skbs(bp, rxr);
>                 rxr->rx_prod = 0;
>                 rxr->rx_agg_prod = 0;
>                 rxr->rx_sw_agg_prod = 0;
> --
> 2.43.5
>
>
Other than the one minor suggestion, LGTM otherwise

Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
David Wei Nov. 27, 2024, 5:36 a.m. UTC | #2 
On 2024-11-25 22:30, Somnath Kotur wrote:
> On Mon, Nov 25, 2024 at 9:54 AM David Wei <dw@davidwei.uk> wrote:
>>
>> Refactor bnxt_rx_ring_info->tpa_info operations into helpers that work
>> on a single tpa_info in prep for queue API using them.
>>
>> There are 2 pairs of operations:
>>
>> * bnxt_alloc_one_tpa_info()
>> * bnxt_free_one_tpa_info()
>>
>> These alloc/free the tpa_info array itself.
>>
>> * bnxt_alloc_one_tpa_info_data()
>> * bnxt_free_one_tpa_info_data()
>>
>> These alloc/free the frags stored in tpa_info array.
>>
>> Signed-off-by: David Wei <dw@davidwei.uk>
>> ---
>>  drivers/net/ethernet/broadcom/bnxt/bnxt.c | 148 ++++++++++++++--------
>>  1 file changed, 95 insertions(+), 53 deletions(-)
>>
...
>> @@ -3461,13 +3468,17 @@ static void bnxt_free_one_rx_ring_skbs(struct bnxt *bp, int ring_nr)
>>
>>  static void bnxt_free_rx_skbs(struct bnxt *bp)
>>  {
>> +       struct bnxt_rx_ring_info *rxr;
>>         int i;
>>
>>         if (!bp->rx_ring)
>>                 return;
>>
>> -       for (i = 0; i < bp->rx_nr_rings; i++)
>> -               bnxt_free_one_rx_ring_skbs(bp, i);
>> +       for (i = 0; i < bp->rx_nr_rings; i++) {
>> +               rxr = &bp->rx_ring[i];
>> +
>> +               bnxt_free_one_rx_ring_skbs(bp, rxr);
> Minor nit; Could avoid a declaration and an assignment here by
> directly calling this API with the 2nd param set to &bp->rx_ring[i] ?

Sounds good!
diff mbox series

Patch

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 5f7bdafcf05d..b2cc8df22241 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3421,15 +3421,11 @@  static void bnxt_free_one_rx_agg_ring(struct bnxt *bp, struct bnxt_rx_ring_info
 	}
 }
 
-static void bnxt_free_one_rx_ring_skbs(struct bnxt *bp, int ring_nr)
+static void bnxt_free_one_tpa_info_data(struct bnxt *bp,
+					struct bnxt_rx_ring_info *rxr)
 {
-	struct bnxt_rx_ring_info *rxr = &bp->rx_ring[ring_nr];
-	struct bnxt_tpa_idx_map *map;
 	int i;
 
-	if (!rxr->rx_tpa)
-		goto skip_rx_tpa_free;
-
 	for (i = 0; i < bp->max_tpa; i++) {
 		struct bnxt_tpa_info *tpa_info = &rxr->rx_tpa[i];
 		u8 *data = tpa_info->data;
@@ -3440,6 +3436,17 @@  static void bnxt_free_one_rx_ring_skbs(struct bnxt *bp, int ring_nr)
 		tpa_info->data = NULL;
 		page_pool_free_va(rxr->head_pool, data, false);
 	}
+}
+
+static void bnxt_free_one_rx_ring_skbs(struct bnxt *bp,
+				       struct bnxt_rx_ring_info *rxr)
+{
+	struct bnxt_tpa_idx_map *map;
+
+	if (!rxr->rx_tpa)
+		goto skip_rx_tpa_free;
+
+	bnxt_free_one_tpa_info_data(bp, rxr);
 
 skip_rx_tpa_free:
 	if (!rxr->rx_buf_ring)
@@ -3461,13 +3468,17 @@  static void bnxt_free_one_rx_ring_skbs(struct bnxt *bp, int ring_nr)
 
 static void bnxt_free_rx_skbs(struct bnxt *bp)
 {
+	struct bnxt_rx_ring_info *rxr;
 	int i;
 
 	if (!bp->rx_ring)
 		return;
 
-	for (i = 0; i < bp->rx_nr_rings; i++)
-		bnxt_free_one_rx_ring_skbs(bp, i);
+	for (i = 0; i < bp->rx_nr_rings; i++) {
+		rxr = &bp->rx_ring[i];
+
+		bnxt_free_one_rx_ring_skbs(bp, rxr);
+	}
 }
 
 static void bnxt_free_skbs(struct bnxt *bp)
@@ -3608,29 +3619,64 @@  static int bnxt_alloc_ring(struct bnxt *bp, struct bnxt_ring_mem_info *rmem)
 	return 0;
 }
 
+static void bnxt_free_one_tpa_info(struct bnxt *bp,
+				   struct bnxt_rx_ring_info *rxr)
+{
+	int i;
+
+	kfree(rxr->rx_tpa_idx_map);
+	rxr->rx_tpa_idx_map = NULL;
+	if (rxr->rx_tpa) {
+		for (i = 0; i < bp->max_tpa; i++) {
+			kfree(rxr->rx_tpa[i].agg_arr);
+			rxr->rx_tpa[i].agg_arr = NULL;
+		}
+	}
+	kfree(rxr->rx_tpa);
+	rxr->rx_tpa = NULL;
+}
+
 static void bnxt_free_tpa_info(struct bnxt *bp)
 {
-	int i, j;
+	int i;
 
 	for (i = 0; i < bp->rx_nr_rings; i++) {
 		struct bnxt_rx_ring_info *rxr = &bp->rx_ring[i];
 
-		kfree(rxr->rx_tpa_idx_map);
-		rxr->rx_tpa_idx_map = NULL;
-		if (rxr->rx_tpa) {
-			for (j = 0; j < bp->max_tpa; j++) {
-				kfree(rxr->rx_tpa[j].agg_arr);
-				rxr->rx_tpa[j].agg_arr = NULL;
-			}
-		}
-		kfree(rxr->rx_tpa);
-		rxr->rx_tpa = NULL;
+		bnxt_free_one_tpa_info(bp, rxr);
+	}
+}
+
+static int bnxt_alloc_one_tpa_info(struct bnxt *bp,
+				   struct bnxt_rx_ring_info *rxr)
+{
+	struct rx_agg_cmp *agg;
+	int i;
+
+	rxr->rx_tpa = kcalloc(bp->max_tpa, sizeof(struct bnxt_tpa_info),
+			      GFP_KERNEL);
+	if (!rxr->rx_tpa)
+		return -ENOMEM;
+
+	if (!(bp->flags & BNXT_FLAG_CHIP_P5_PLUS))
+		return 0;
+	for (i = 0; i < bp->max_tpa; i++) {
+		agg = kcalloc(MAX_SKB_FRAGS, sizeof(*agg), GFP_KERNEL);
+		if (!agg)
+			return -ENOMEM;
+		rxr->rx_tpa[i].agg_arr = agg;
 	}
+	rxr->rx_tpa_idx_map = kzalloc(sizeof(*rxr->rx_tpa_idx_map),
+				      GFP_KERNEL);
+	if (!rxr->rx_tpa_idx_map)
+		return -ENOMEM;
+
+	return 0;
 }
 
 static int bnxt_alloc_tpa_info(struct bnxt *bp)
 {
-	int i, j;
+	int i, rc;
 
 	bp->max_tpa = MAX_TPA;
 	if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {
@@ -3641,25 +3687,10 @@  static int bnxt_alloc_tpa_info(struct bnxt *bp)
 
 	for (i = 0; i < bp->rx_nr_rings; i++) {
 		struct bnxt_rx_ring_info *rxr = &bp->rx_ring[i];
-		struct rx_agg_cmp *agg;
 
-		rxr->rx_tpa = kcalloc(bp->max_tpa, sizeof(struct bnxt_tpa_info),
-				      GFP_KERNEL);
-		if (!rxr->rx_tpa)
-			return -ENOMEM;
-
-		if (!(bp->flags & BNXT_FLAG_CHIP_P5_PLUS))
-			continue;
-		for (j = 0; j < bp->max_tpa; j++) {
-			agg = kcalloc(MAX_SKB_FRAGS, sizeof(*agg), GFP_KERNEL);
-			if (!agg)
-				return -ENOMEM;
-			rxr->rx_tpa[j].agg_arr = agg;
-		}
-		rxr->rx_tpa_idx_map = kzalloc(sizeof(*rxr->rx_tpa_idx_map),
-					      GFP_KERNEL);
-		if (!rxr->rx_tpa_idx_map)
-			return -ENOMEM;
+		rc = bnxt_alloc_one_tpa_info(bp, rxr);
+		if (rc)
+			return rc;
 	}
 	return 0;
 }
@@ -4268,10 +4299,31 @@  static void bnxt_alloc_one_rx_ring_page(struct bnxt *bp,
 	rxr->rx_agg_prod = prod;
 }
 
+static int bnxt_alloc_one_tpa_info_data(struct bnxt *bp,
+					struct bnxt_rx_ring_info *rxr)
+{
+	dma_addr_t mapping;
+	u8 *data;
+	int i;
+
+	for (i = 0; i < bp->max_tpa; i++) {
+		data = __bnxt_alloc_rx_frag(bp, &mapping, rxr,
+					    GFP_KERNEL);
+		if (!data)
+			return -ENOMEM;
+
+		rxr->rx_tpa[i].data = data;
+		rxr->rx_tpa[i].data_ptr = data + bp->rx_offset;
+		rxr->rx_tpa[i].mapping = mapping;
+	}
+
+	return 0;
+}
+
 static int bnxt_alloc_one_rx_ring(struct bnxt *bp, int ring_nr)
 {
 	struct bnxt_rx_ring_info *rxr = &bp->rx_ring[ring_nr];
-	int i;
+	int rc;
 
 	bnxt_alloc_one_rx_ring_skb(bp, rxr, ring_nr);
 
@@ -4281,19 +4333,9 @@  static int bnxt_alloc_one_rx_ring(struct bnxt *bp, int ring_nr)
 	bnxt_alloc_one_rx_ring_page(bp, rxr, ring_nr);
 
 	if (rxr->rx_tpa) {
-		dma_addr_t mapping;
-		u8 *data;
-
-		for (i = 0; i < bp->max_tpa; i++) {
-			data = __bnxt_alloc_rx_frag(bp, &mapping, rxr,
-						    GFP_KERNEL);
-			if (!data)
-				return -ENOMEM;
-
-			rxr->rx_tpa[i].data = data;
-			rxr->rx_tpa[i].data_ptr = data + bp->rx_offset;
-			rxr->rx_tpa[i].mapping = mapping;
-		}
+		rc = bnxt_alloc_one_tpa_info_data(bp, rxr);
+		if (rc)
+			return rc;
 	}
 	return 0;
 }
@@ -13657,7 +13699,7 @@  static void bnxt_rx_ring_reset(struct bnxt *bp)
 			bnxt_reset_task(bp, true);
 			break;
 		}
-		bnxt_free_one_rx_ring_skbs(bp, i);
+		bnxt_free_one_rx_ring_skbs(bp, rxr);
 		rxr->rx_prod = 0;
 		rxr->rx_agg_prod = 0;
 		rxr->rx_sw_agg_prod = 0;