Commit 310660a1 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net/mlx4_en: avoid indirect call in TX completion 



Commit 9ecc2d86 ("net/mlx4_en: add xdp forwarding and data write support")
brought another indirect call in fast path.

Use INDIRECT_CALL_2() helper to avoid the cost of the indirect call
when/if CONFIG_RETPOLINE=y

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Tariq Toukan <tariqt@mellanox.com>
Cc: Willem de Bruijn <willemb@google.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62e69776

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+13 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <linux/ip.h>

#include <linux/ipv6.h>

#include <linux/moduleparam.h>

#include <linux/indirect_call_wrapper.h>



#include "mlx4_en.h"
@@ -261,6 +262,10 @@ static void mlx4_en_stamp_wqe(struct mlx4_en_priv *priv, 
	}

}



INDIRECT_CALLABLE_DECLARE(u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,

						   struct mlx4_en_tx_ring *ring,

						   int index, u64 timestamp,

						   int napi_mode));



u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,

			 struct mlx4_en_tx_ring *ring,
@@ -329,6 +334,11 @@ u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv, 
	return tx_info->nr_txbb;

}



INDIRECT_CALLABLE_DECLARE(u32 mlx4_en_recycle_tx_desc(struct mlx4_en_priv *priv,

						      struct mlx4_en_tx_ring *ring,

						      int index, u64 timestamp,

						      int napi_mode));



u32 mlx4_en_recycle_tx_desc(struct mlx4_en_priv *priv,

			    struct mlx4_en_tx_ring *ring,

			    int index, u64 timestamp,
@@ -449,7 +459,9 @@ bool mlx4_en_process_tx_cq(struct net_device *dev, 
				timestamp = mlx4_en_get_cqe_ts(cqe);



			/* free next descriptor */

			last_nr_txbb = ring->free_tx_desc(

			last_nr_txbb = INDIRECT_CALL_2(ring->free_tx_desc,

						       mlx4_en_free_tx_desc,

						       mlx4_en_recycle_tx_desc,

					priv, ring, ring_index,

					timestamp, napi_budget);

CRA Git | Maintained and supported by SUSTech CRA and CCSE