Skip to content

Commit b87c57a

Browse files
LorenzoBianconiborkmann
authored andcommitted
net: mlx5: Add xdp tx return bulking support
Convert mlx5 driver to xdp_return_frame_bulk APIs. XDP_REDIRECT (upstream codepath): 8.9Mpps XDP_REDIRECT (upstream codepath + bulking APIs): 10.2Mpps Co-developed-by: Jesper Dangaard Brouer <[email protected]> Signed-off-by: Jesper Dangaard Brouer <[email protected]> Signed-off-by: Lorenzo Bianconi <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Tested-by: Jesper Dangaard Brouer <[email protected]> Acked-by: John Fastabend <[email protected]> Link: https://lore.kernel.org/bpf/250460319fd868b7b5668fc1deca74dd42813a90.1605267335.git.lorenzo@kernel.org
1 parent dbef19c commit b87c57a

File tree

1 file changed

+18
-4
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core/en

1 file changed

+18
-4
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,8 @@ mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd,
366366
static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq,
367367
struct mlx5e_xdp_wqe_info *wi,
368368
u32 *xsk_frames,
369-
bool recycle)
369+
bool recycle,
370+
struct xdp_frame_bulk *bq)
370371
{
371372
struct mlx5e_xdp_info_fifo *xdpi_fifo = &sq->db.xdpi_fifo;
372373
u16 i;
@@ -379,7 +380,7 @@ static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq,
379380
/* XDP_TX from the XSK RQ and XDP_REDIRECT */
380381
dma_unmap_single(sq->pdev, xdpi.frame.dma_addr,
381382
xdpi.frame.xdpf->len, DMA_TO_DEVICE);
382-
xdp_return_frame(xdpi.frame.xdpf);
383+
xdp_return_frame_bulk(xdpi.frame.xdpf, bq);
383384
break;
384385
case MLX5E_XDP_XMIT_MODE_PAGE:
385386
/* XDP_TX from the regular RQ */
@@ -397,12 +398,15 @@ static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq,
397398

398399
bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq)
399400
{
401+
struct xdp_frame_bulk bq;
400402
struct mlx5e_xdpsq *sq;
401403
struct mlx5_cqe64 *cqe;
402404
u32 xsk_frames = 0;
403405
u16 sqcc;
404406
int i;
405407

408+
xdp_frame_bulk_init(&bq);
409+
406410
sq = container_of(cq, struct mlx5e_xdpsq, cq);
407411

408412
if (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state)))
@@ -434,7 +438,7 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq)
434438

435439
sqcc += wi->num_wqebbs;
436440

437-
mlx5e_free_xdpsq_desc(sq, wi, &xsk_frames, true);
441+
mlx5e_free_xdpsq_desc(sq, wi, &xsk_frames, true, &bq);
438442
} while (!last_wqe);
439443

440444
if (unlikely(get_cqe_opcode(cqe) != MLX5_CQE_REQ)) {
@@ -447,6 +451,8 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq)
447451
}
448452
} while ((++i < MLX5E_TX_CQ_POLL_BUDGET) && (cqe = mlx5_cqwq_get_cqe(&cq->wq)));
449453

454+
xdp_flush_frame_bulk(&bq);
455+
450456
if (xsk_frames)
451457
xsk_tx_completed(sq->xsk_pool, xsk_frames);
452458

@@ -463,8 +469,13 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq)
463469

464470
void mlx5e_free_xdpsq_descs(struct mlx5e_xdpsq *sq)
465471
{
472+
struct xdp_frame_bulk bq;
466473
u32 xsk_frames = 0;
467474

475+
xdp_frame_bulk_init(&bq);
476+
477+
rcu_read_lock(); /* need for xdp_return_frame_bulk */
478+
468479
while (sq->cc != sq->pc) {
469480
struct mlx5e_xdp_wqe_info *wi;
470481
u16 ci;
@@ -474,9 +485,12 @@ void mlx5e_free_xdpsq_descs(struct mlx5e_xdpsq *sq)
474485

475486
sq->cc += wi->num_wqebbs;
476487

477-
mlx5e_free_xdpsq_desc(sq, wi, &xsk_frames, false);
488+
mlx5e_free_xdpsq_desc(sq, wi, &xsk_frames, false, &bq);
478489
}
479490

491+
xdp_flush_frame_bulk(&bq);
492+
rcu_read_unlock();
493+
480494
if (xsk_frames)
481495
xsk_tx_completed(sq->xsk_pool, xsk_frames);
482496
}

0 commit comments

Comments
 (0)