net/mlx5e: RX, Change wqe last_in_page field from bool to bit flags

Change the bool flag to a bitfield as we'll use it in a downstream patch
in the series to add signaling about skipping a fragment release.

Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 566ddf7a7aa916b5465a0d39d207f6f844a1ca47..9ef4b7163e5ad481fb00fe3532737f056fc6db2b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -605,13 +605,17 @@ struct mlx5e_frag_page {
        u16 frags;
 };
 
+enum mlx5e_wqe_frag_flag {
+       MLX5E_WQE_FRAG_LAST_IN_PAGE,
+};
+
 struct mlx5e_wqe_frag_info {
        union {
                struct mlx5e_frag_page *frag_page;
                struct xdp_buff **xskp;
        };
        u32 offset;
-       bool last_in_page;
+       u8 flags;
 };
 
 union mlx5e_alloc_units {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 53eef689f2258aa6b8891c1ffb819ffba99e9fd9..bb1cbf0088767770e04e3620070307e8de544bd5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -532,7 +532,7 @@ static void mlx5e_init_frags_partition(struct mlx5e_rq *rq)
                                next_frag.frag_page++;
                                next_frag.offset = 0;
                                if (prev)
-                                       prev->last_in_page = true;
+                                       prev->flags |= BIT(MLX5E_WQE_FRAG_LAST_IN_PAGE);
                        }
                        *frag = next_frag;
 
@@ -543,7 +543,7 @@ static void mlx5e_init_frags_partition(struct mlx5e_rq *rq)
        }
 
        if (prev)
-               prev->last_in_page = true;
+               prev->flags |= BIT(MLX5E_WQE_FRAG_LAST_IN_PAGE);
 }
 
 static void mlx5e_init_xsk_buffs(struct mlx5e_rq *rq)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 73bc373bf27d1103690526d2efc340d6c5cb2430..f98212596c1eada485462be7febd217316cf331f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -323,7 +323,7 @@ static inline void mlx5e_put_rx_frag(struct mlx5e_rq *rq,
                                     struct mlx5e_wqe_frag_info *frag,
                                     bool recycle)
 {
-       if (frag->last_in_page)
+       if (frag->flags & BIT(MLX5E_WQE_FRAG_LAST_IN_PAGE))
                mlx5e_page_release_fragmented(rq, frag->frag_page, recycle);
 }