net/mlx5e: SHAMPO, Simplify header page release in teardown

The function that releases SHAMPO header pages (mlx5e_shampo_dealloc_hd)
has some complicated logic that comes from the fact that it is called
twice during teardown:
1) To release the posted header pages that didn't get any completions.
2) To release all remaining header pages.

This flow is not necessary: all header pages can be released from the
driver side in one go. Furthermore, the above flow is buggy. Taking the
8 headers per page example:
1) Release fragments 5-7. Page will be released.
2) Release remaining fragments 0-4. The bits in the header will indicate
   that the page needs releasing. But this is incorrect: page was
   released in step 1.

This patch releases all header pages in one go. This simplifies the
header page cleanup function. For consistency, the datapath header
page release API (mlx5e_free_rx_shampo_hd_entry()) is used.

Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20240603212219.1037656-7-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index e85fb71bf0b46239c07a968eab443cef4650b4a1..ff326601d4a4b2f0bd488911f47a9f14218abc22 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -1014,7 +1014,7 @@ void mlx5e_build_ptys2ethtool_map(void);
 bool mlx5e_check_fragmented_striding_rq_cap(struct mlx5_core_dev *mdev, u8 page_shift,
                                            enum mlx5e_mpwrq_umr_mode umr_mode);
 
-void mlx5e_shampo_dealloc_hd(struct mlx5e_rq *rq, u16 len, u16 start, bool close);
+void mlx5e_shampo_dealloc_hd(struct mlx5e_rq *rq);
 void mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats);
 void mlx5e_fold_sw_stats64(struct mlx5e_priv *priv, struct rtnl_link_stats64 *s);
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index d0808dbe69d34047039af0129d41d51c6ffc4186..d21a87ddc934b330772987e435fe8898e34fd5da 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -1208,15 +1208,6 @@ void mlx5e_free_rx_missing_descs(struct mlx5e_rq *rq)
                head = mlx5_wq_ll_get_wqe_next_ix(wq, head);
        }
 
-       if (test_bit(MLX5E_RQ_STATE_SHAMPO, &rq->state)) {
-               u16 len;
-
-               len = (rq->mpwqe.shampo->pi - rq->mpwqe.shampo->ci) &
-                     (rq->mpwqe.shampo->hd_per_wq - 1);
-               mlx5e_shampo_dealloc_hd(rq, len, rq->mpwqe.shampo->ci, false);
-               rq->mpwqe.shampo->pi = rq->mpwqe.shampo->ci;
-       }
-
        rq->mpwqe.actual_wq_head = wq->head;
        rq->mpwqe.umr_in_progress = 0;
        rq->mpwqe.umr_completed = 0;
@@ -1244,8 +1235,7 @@ void mlx5e_free_rx_descs(struct mlx5e_rq *rq)
                }
 
                if (test_bit(MLX5E_RQ_STATE_SHAMPO, &rq->state))
-                       mlx5e_shampo_dealloc_hd(rq, rq->mpwqe.shampo->hd_per_wq,
-                                               0, true);
+                       mlx5e_shampo_dealloc_hd(rq);
        } else {
                struct mlx5_wq_cyc *wq = &rq->wqe.wq;
                u16 missing = mlx5_wq_cyc_missing(wq);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index a13fa760f948af4ee9225c0972c4b68a3bbc073e..bb59ee0b15673336637966d8a4da17c17ef10312 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -839,44 +839,28 @@ err:
        return err;
 }
 
-/* This function is responsible to dealloc SHAMPO header buffer.
- * close == true specifies that we are in the middle of closing RQ operation so
- * we go over all the entries and if they are not in use we free them,
- * otherwise we only go over a specific range inside the header buffer that are
- * not in use.
- */
-void mlx5e_shampo_dealloc_hd(struct mlx5e_rq *rq, u16 len, u16 start, bool close)
+static void
+mlx5e_free_rx_shampo_hd_entry(struct mlx5e_rq *rq, u16 header_index)
 {
        struct mlx5e_shampo_hd *shampo = rq->mpwqe.shampo;
-       struct mlx5e_frag_page *deleted_page = NULL;
-       int hd_per_wq = shampo->hd_per_wq;
-       struct mlx5e_dma_info *hd_info;
-       int i, index = start;
-
-       for (i = 0; i < len; i++, index++) {
-               if (index == hd_per_wq)
-                       index = 0;
-
-               if (close && !test_bit(index, shampo->bitmap))
-                       continue;
+       u64 addr = shampo->info[header_index].addr;
 
-               hd_info = &shampo->info[index];
-               hd_info->addr = ALIGN_DOWN(hd_info->addr, PAGE_SIZE);
-               if (hd_info->frag_page && hd_info->frag_page != deleted_page) {
-                       deleted_page = hd_info->frag_page;
-                       mlx5e_page_release_fragmented(rq, hd_info->frag_page);
-               }
+       if (((header_index + 1) & (MLX5E_SHAMPO_WQ_HEADER_PER_PAGE - 1)) == 0) {
+               struct mlx5e_dma_info *dma_info = &shampo->info[header_index];
 
-               hd_info->frag_page = NULL;
+               dma_info->addr = ALIGN_DOWN(addr, PAGE_SIZE);
+               mlx5e_page_release_fragmented(rq, dma_info->frag_page);
        }
+       clear_bit(header_index, shampo->bitmap);
+}
 
-       if (start + len > hd_per_wq) {
-               len -= hd_per_wq - start;
-               bitmap_clear(shampo->bitmap, start, hd_per_wq - start);
-               start = 0;
-       }
+void mlx5e_shampo_dealloc_hd(struct mlx5e_rq *rq)
+{
+       struct mlx5e_shampo_hd *shampo = rq->mpwqe.shampo;
+       int i;
 
-       bitmap_clear(shampo->bitmap, start, len);
+       for_each_set_bit(i, shampo->bitmap, rq->mpwqe.shampo->hd_per_wq)
+               mlx5e_free_rx_shampo_hd_entry(rq, i);
 }
 
 static void mlx5e_dealloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix)
@@ -2281,21 +2265,6 @@ mlx5e_hw_gro_skb_has_enough_space(struct sk_buff *skb, u16 data_bcnt)
        return PAGE_SIZE * nr_frags + data_bcnt <= GRO_LEGACY_MAX_SIZE;
 }
 
-static void
-mlx5e_free_rx_shampo_hd_entry(struct mlx5e_rq *rq, u16 header_index)
-{
-       struct mlx5e_shampo_hd *shampo = rq->mpwqe.shampo;
-       u64 addr = shampo->info[header_index].addr;
-
-       if (((header_index + 1) & (MLX5E_SHAMPO_WQ_HEADER_PER_PAGE - 1)) == 0) {
-               struct mlx5e_dma_info *dma_info = &shampo->info[header_index];
-
-               dma_info->addr = ALIGN_DOWN(addr, PAGE_SIZE);
-               mlx5e_page_release_fragmented(rq, dma_info->frag_page);
-       }
-       bitmap_clear(shampo->bitmap, header_index, 1);
-}
-
 static void mlx5e_handle_rx_cqe_mpwrq_shampo(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)
 {
        u16 data_bcnt           = mpwrq_get_cqe_byte_cnt(cqe) - cqe->shampo.header_size;