|
@@ -236,14 +236,20 @@ static inline int mlx5e_page_alloc_mapped(struct mlx5e_rq *rq,
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void mlx5e_page_dma_unmap(struct mlx5e_rq *rq,
|
|
|
|
+ struct mlx5e_dma_info *dma_info)
|
|
|
|
+{
|
|
|
|
+ dma_unmap_page(rq->pdev, dma_info->addr, RQ_PAGE_SIZE(rq),
|
|
|
|
+ rq->buff.map_dir);
|
|
|
|
+}
|
|
|
|
+
|
|
void mlx5e_page_release(struct mlx5e_rq *rq, struct mlx5e_dma_info *dma_info,
|
|
void mlx5e_page_release(struct mlx5e_rq *rq, struct mlx5e_dma_info *dma_info,
|
|
bool recycle)
|
|
bool recycle)
|
|
{
|
|
{
|
|
if (likely(recycle) && mlx5e_rx_cache_put(rq, dma_info))
|
|
if (likely(recycle) && mlx5e_rx_cache_put(rq, dma_info))
|
|
return;
|
|
return;
|
|
|
|
|
|
- dma_unmap_page(rq->pdev, dma_info->addr, RQ_PAGE_SIZE(rq),
|
|
|
|
- rq->buff.map_dir);
|
|
|
|
|
|
+ mlx5e_page_dma_unmap(rq, dma_info);
|
|
put_page(dma_info->page);
|
|
put_page(dma_info->page);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -800,9 +806,10 @@ static inline int mlx5e_xdp_handle(struct mlx5e_rq *rq,
|
|
struct mlx5e_dma_info *di,
|
|
struct mlx5e_dma_info *di,
|
|
void *va, u16 *rx_headroom, u32 *len)
|
|
void *va, u16 *rx_headroom, u32 *len)
|
|
{
|
|
{
|
|
- const struct bpf_prog *prog = READ_ONCE(rq->xdp_prog);
|
|
|
|
|
|
+ struct bpf_prog *prog = READ_ONCE(rq->xdp_prog);
|
|
struct xdp_buff xdp;
|
|
struct xdp_buff xdp;
|
|
u32 act;
|
|
u32 act;
|
|
|
|
+ int err;
|
|
|
|
|
|
if (!prog)
|
|
if (!prog)
|
|
return false;
|
|
return false;
|
|
@@ -823,6 +830,15 @@ static inline int mlx5e_xdp_handle(struct mlx5e_rq *rq,
|
|
if (unlikely(!mlx5e_xmit_xdp_frame(rq, di, &xdp)))
|
|
if (unlikely(!mlx5e_xmit_xdp_frame(rq, di, &xdp)))
|
|
trace_xdp_exception(rq->netdev, prog, act);
|
|
trace_xdp_exception(rq->netdev, prog, act);
|
|
return true;
|
|
return true;
|
|
|
|
+ case XDP_REDIRECT:
|
|
|
|
+ /* When XDP enabled then page-refcnt==1 here */
|
|
|
|
+ err = xdp_do_redirect(rq->netdev, &xdp, prog);
|
|
|
|
+ if (!err) {
|
|
|
|
+ __set_bit(MLX5E_RQ_FLAG_XDP_XMIT, rq->flags);
|
|
|
|
+ rq->xdpsq.db.redirect_flush = true;
|
|
|
|
+ mlx5e_page_dma_unmap(rq, di);
|
|
|
|
+ }
|
|
|
|
+ return true;
|
|
default:
|
|
default:
|
|
bpf_warn_invalid_xdp_action(act);
|
|
bpf_warn_invalid_xdp_action(act);
|
|
case XDP_ABORTED:
|
|
case XDP_ABORTED:
|
|
@@ -1140,6 +1156,11 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)
|
|
xdpsq->db.doorbell = false;
|
|
xdpsq->db.doorbell = false;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (xdpsq->db.redirect_flush) {
|
|
|
|
+ xdp_do_flush_map();
|
|
|
|
+ xdpsq->db.redirect_flush = false;
|
|
|
|
+ }
|
|
|
|
+
|
|
mlx5_cqwq_update_db_record(&cq->wq);
|
|
mlx5_cqwq_update_db_record(&cq->wq);
|
|
|
|
|
|
/* ensure cq space is freed before enabling more cqes */
|
|
/* ensure cq space is freed before enabling more cqes */
|