diff options
| author | Tariq Toukan | 2018-11-21 13:04:45 +0100 |
|---|---|---|
| committer | Saeed Mahameed | 2018-12-21 07:54:18 +0100 |
| commit | feb2ff9d74f76a174e284255b7e537b6c090c13c (patch) | |
| tree | 7a9907384e6f097daf7c6f84e2c469945bdadc89 /drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | |
| parent | net/mlx5e: XDP, Precede XDP-related operations in RQ poll by a loaded program... (diff) | |
| download | kernel-qcow2-linux-feb2ff9d74f76a174e284255b7e537b6c090c13c.tar.gz kernel-qcow2-linux-feb2ff9d74f76a174e284255b7e537b6c090c13c.tar.xz kernel-qcow2-linux-feb2ff9d74f76a174e284255b7e537b6c090c13c.zip | |
net/mlx5e: XDP, Change the XDP SQ redirect indication
Do not maintain an SQ state bit to indicate whether an
XDP SQ serves redirect operations.
Instead, rely on the fact that such an XDP SQ doesn't reside
in an RQ instance, while the others do.
This info is not known to the XDP SQ functions themselves,
and they rely on their callers to distinguish between the cases.
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c index cf22ea529c53..4961b8fea111 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c @@ -164,11 +164,10 @@ bool mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xdp_info *xdpi) return true; } -bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq) +bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq, struct mlx5e_rq *rq) { struct mlx5e_xdpsq *sq; struct mlx5_cqe64 *cqe; - struct mlx5e_rq *rq; bool is_redirect; u16 sqcc; int i; @@ -182,8 +181,7 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq) if (!cqe) return false; - is_redirect = test_bit(MLX5E_SQ_STATE_REDIRECT, &sq->state); - rq = container_of(sq, struct mlx5e_rq, xdpsq); + is_redirect = !rq; /* sq->cc must be updated only after mlx5_cqwq_update_db_record(), * otherwise a cq overrun may occur @@ -228,13 +226,9 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq) return (i == MLX5E_TX_CQ_POLL_BUDGET); } -void mlx5e_free_xdpsq_descs(struct mlx5e_xdpsq *sq) +void mlx5e_free_xdpsq_descs(struct mlx5e_xdpsq *sq, struct mlx5e_rq *rq) { - struct mlx5e_rq *rq; - bool is_redirect; - - is_redirect = test_bit(MLX5E_SQ_STATE_REDIRECT, &sq->state); - rq = is_redirect ? NULL : container_of(sq, struct mlx5e_rq, xdpsq); + bool is_redirect = !rq; while (sq->cc != sq->pc) { u16 ci = mlx5_wq_cyc_ctr2ix(&sq->wq, sq->cc); |