WIP, not tested, only to show the overall idea. Non-AF_XDP paths are marked with 'false' for now. Cc: netdev@xxxxxxxxxxxxxxx Signed-off-by: Stanislav Fomichev <sdf@xxxxxxxxxx> --- .../net/ethernet/mellanox/mlx5/core/en/txrx.h | 11 +++ .../net/ethernet/mellanox/mlx5/core/en/xdp.c | 96 ++++++++++++++++++- .../net/ethernet/mellanox/mlx5/core/en/xdp.h | 9 +- .../ethernet/mellanox/mlx5/core/en/xsk/tx.c | 3 + .../net/ethernet/mellanox/mlx5/core/en_tx.c | 16 ++++ .../net/ethernet/mellanox/mlx5/core/main.c | 26 ++++- 6 files changed, 156 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h index 879d698b6119..e4509464e0b1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h @@ -6,6 +6,7 @@ #include "en.h" #include <linux/indirect_call_wrapper.h> +#include <net/devtx.h> #define MLX5E_TX_WQE_EMPTY_DS_COUNT (sizeof(struct mlx5e_tx_wqe) / MLX5_SEND_WQE_DS) @@ -506,4 +507,14 @@ static inline struct mlx5e_mpw_info *mlx5e_get_mpw_info(struct mlx5e_rq *rq, int return (struct mlx5e_mpw_info *)((char *)rq->mpwqe.info + array_size(i, isz)); } + +struct mlx5e_devtx_frame { + struct devtx_frame frame; + struct mlx5_cqe64 *cqe; /* tx completion */ + struct mlx5e_tx_wqe *wqe; /* tx */ +}; + +void mlx5e_devtx_submit(struct devtx_frame *ctx); +void mlx5e_devtx_complete(struct devtx_frame *ctx); + #endif diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c index f0e6095809fa..0cb0f0799cbc 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c @@ -255,9 +255,30 @@ static int mlx5e_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash, return 0; } +static int mlx5e_devtx_sb_request_timestamp(const struct devtx_frame *ctx) +{ + /* Nothing to do here, CQE always has a timestamp. */ + return 0; +} + +static int mlx5e_devtx_cp_timestamp(const struct devtx_frame *_ctx, u64 *timestamp) +{ + const struct mlx5e_devtx_frame *ctx = (void *)_ctx; + u64 ts; + + if (unlikely(!ctx->cqe)) + return -ENODATA; + + ts = get_cqe_ts(ctx->cqe); + *timestamp = mlx5_real_time_cyc2time(NULL, ts); + return 0; +} + const struct xdp_metadata_ops mlx5e_xdp_metadata_ops = { .xmo_rx_timestamp = mlx5e_xdp_rx_timestamp, .xmo_rx_hash = mlx5e_xdp_rx_hash, + .xmo_sb_request_timestamp = mlx5e_devtx_sb_request_timestamp, + .xmo_cp_timestamp = mlx5e_devtx_cp_timestamp, }; /* returns true if packet was consumed by xdp */ @@ -453,6 +474,23 @@ mlx5e_xmit_xdp_frame_mpwqe(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptx mlx5e_xdp_mpwqe_add_dseg(sq, p, stats); + if (devtx_enabled()) { + struct mlx5e_xmit_data_frags *xdptxdf = + container_of(xdptxd, struct mlx5e_xmit_data_frags, xd); + + struct mlx5e_devtx_frame ctx = { + .frame = { + .data = p->data, + .len = p->len, + .meta_len = sq->xsk_pool->tx_metadata_len, + .sinfo = xdptxd->has_frags ? xdptxdf->sinfo : NULL, + .netdev = sq->cq.netdev, + }, + .wqe = sq->mpwqe.wqe, + }; + mlx5e_devtx_submit(&ctx.frame); + } + if (unlikely(mlx5e_xdp_mpwqe_is_full(session, sq->max_sq_mpw_wqebbs))) mlx5e_xdp_mpwqe_complete(sq); @@ -560,6 +598,20 @@ mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd, dseg++; } + if (devtx_enabled()) { + struct mlx5e_devtx_frame ctx = { + .frame = { + .data = xdptxd->data, + .len = xdptxd->len, + .meta_len = sq->xsk_pool->tx_metadata_len, + .sinfo = xdptxd->has_frags ? xdptxdf->sinfo : NULL, + .netdev = sq->cq.netdev, + }, + .wqe = wqe, + }; + mlx5e_devtx_submit(&ctx.frame); + } + cseg->opmod_idx_opcode = cpu_to_be32((sq->pc << 8) | MLX5_OPCODE_SEND); if (test_bit(MLX5E_SQ_STATE_XDP_MULTIBUF, &sq->state)) { @@ -607,7 +659,8 @@ mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd, static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq, struct mlx5e_xdp_wqe_info *wi, u32 *xsk_frames, - struct xdp_frame_bulk *bq) + struct xdp_frame_bulk *bq, + struct mlx5_cqe64 *cqe) { struct mlx5e_xdp_info_fifo *xdpi_fifo = &sq->db.xdpi_fifo; u16 i; @@ -626,6 +679,14 @@ static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq, xdpi = mlx5e_xdpi_fifo_pop(xdpi_fifo); dma_addr = xdpi.frame.dma_addr; + if (false && devtx_enabled()) { + struct mlx5e_devtx_frame ctx; + + devtx_frame_from_xdp(&ctx.frame, xdpf, sq->cq.netdev); + ctx.cqe = cqe; + mlx5e_devtx_complete(&ctx.frame); + } + dma_unmap_single(sq->pdev, dma_addr, xdpf->len, DMA_TO_DEVICE); if (xdp_frame_has_frags(xdpf)) { @@ -659,6 +720,20 @@ static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq, xdpi = mlx5e_xdpi_fifo_pop(xdpi_fifo); page = xdpi.page.page; + if (false && devtx_enabled()) { + struct mlx5e_devtx_frame ctx = { + .frame = { + .data = page, + .len = PAGE_SIZE, + .meta_len = sq->xsk_pool->tx_metadata_len, + .netdev = sq->cq.netdev, + }, + .cqe = cqe, + }; + + mlx5e_devtx_complete(&ctx.frame); + } + /* No need to check ((page->pp_magic & ~0x3UL) == PP_SIGNATURE) * as we know this is a page_pool page. */ @@ -670,6 +745,21 @@ static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq, } case MLX5E_XDP_XMIT_MODE_XSK: /* AF_XDP send */ + + if (devtx_enabled()) { + struct mlx5e_devtx_frame ctx = { + .frame = { + .data = xdpi.frame.xsk_head, + .len = xdpi.page.xsk_head_len, + .meta_len = sq->xsk_pool->tx_metadata_len, + .netdev = sq->cq.netdev, + }, + .cqe = cqe, + }; + + mlx5e_devtx_complete(&ctx.frame); + } + (*xsk_frames)++; break; default: @@ -720,7 +810,7 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq) sqcc += wi->num_wqebbs; - mlx5e_free_xdpsq_desc(sq, wi, &xsk_frames, &bq); + mlx5e_free_xdpsq_desc(sq, wi, &xsk_frames, &bq, cqe); } while (!last_wqe); if (unlikely(get_cqe_opcode(cqe) != MLX5_CQE_REQ)) { @@ -767,7 +857,7 @@ void mlx5e_free_xdpsq_descs(struct mlx5e_xdpsq *sq) sq->cc += wi->num_wqebbs; - mlx5e_free_xdpsq_desc(sq, wi, &xsk_frames, &bq); + mlx5e_free_xdpsq_desc(sq, wi, &xsk_frames, &bq, NULL); } xdp_flush_frame_bulk(&bq); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h index 9e8e6184f9e4..860638e1209b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h @@ -50,6 +50,11 @@ struct mlx5e_xdp_buff { struct mlx5e_rq *rq; }; +struct mlx5e_xdp_md { + struct xdp_md md; + struct mlx5_cqe64 *cqe; +}; + /* XDP packets can be transmitted in different ways. On completion, we need to * distinguish between them to clean up things in a proper way. */ @@ -82,18 +87,20 @@ enum mlx5e_xdp_xmit_mode { * num, page_1, page_2, ... , page_num. * * MLX5E_XDP_XMIT_MODE_XSK: - * none. + * frame.xsk_head + page.xsk_head_len for header portion only. */ union mlx5e_xdp_info { enum mlx5e_xdp_xmit_mode mode; union { struct xdp_frame *xdpf; dma_addr_t dma_addr; + void *xsk_head; } frame; union { struct mlx5e_rq *rq; u8 num; struct page *page; + u32 xsk_head_len; } page; }; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c index 597f319d4770..1b97d6f6a9ba 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c @@ -96,6 +96,9 @@ bool mlx5e_xsk_tx(struct mlx5e_xdpsq *sq, unsigned int budget) xsk_buff_raw_dma_sync_for_device(pool, xdptxd.dma_addr, xdptxd.len); + xdpi.frame.xsk_head = xdptxd.data; + xdpi.page.xsk_head_len = xdptxd.len; + ret = INDIRECT_CALL_2(sq->xmit_xdp_frame, mlx5e_xmit_xdp_frame_mpwqe, mlx5e_xmit_xdp_frame, sq, &xdptxd, check_result); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c index c7eb6b238c2b..f8d3e210408a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c @@ -758,6 +758,14 @@ static void mlx5e_tx_wi_consume_fifo_skbs(struct mlx5e_txqsq *sq, struct mlx5e_t for (i = 0; i < wi->num_fifo_pkts; i++) { struct sk_buff *skb = mlx5e_skb_fifo_pop(&sq->db.skb_fifo); + if (false && devtx_enabled()) { + struct mlx5e_devtx_frame ctx = {}; + + devtx_frame_from_skb(&ctx.frame, skb, sq->cq.netdev); + ctx.cqe = cqe; + mlx5e_devtx_complete(&ctx.frame); + } + mlx5e_consume_skb(sq, skb, cqe, napi_budget); } } @@ -826,6 +834,14 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget) sqcc += wi->num_wqebbs; if (likely(wi->skb)) { + if (false && devtx_enabled()) { + struct mlx5e_devtx_frame ctx = {}; + + devtx_frame_from_skb(&ctx.frame, wi->skb, cq->netdev); + ctx.cqe = cqe; + mlx5e_devtx_complete(&ctx.frame); + } + mlx5e_tx_wi_dma_unmap(sq, wi, &dma_fifo_cc); mlx5e_consume_skb(sq, wi->skb, cqe, napi_budget); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index a7eb65cd0bdd..7160389a5bc6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -48,6 +48,7 @@ #include <linux/mlx5/vport.h> #include <linux/version.h> #include <net/devlink.h> +#include <net/devtx.h> #include "mlx5_core.h" #include "thermal.h" #include "lib/eq.h" @@ -73,6 +74,7 @@ #include "sf/dev/dev.h" #include "sf/sf.h" #include "mlx5_irq.h" +#include "en/xdp.h" MODULE_AUTHOR("Eli Cohen <eli@xxxxxxxxxxxx>"); MODULE_DESCRIPTION("Mellanox 5th generation network adapters (ConnectX series) core driver"); @@ -2132,6 +2134,19 @@ static void mlx5_core_verify_params(void) } } +__weak noinline void mlx5e_devtx_submit(struct devtx_frame *ctx) +{ +} + +__weak noinline void mlx5e_devtx_complete(struct devtx_frame *ctx) +{ +} + +BTF_SET8_START(mlx5e_devtx_hook_ids) +BTF_ID_FLAGS(func, mlx5e_devtx_submit) +BTF_ID_FLAGS(func, mlx5e_devtx_complete) +BTF_SET8_END(mlx5e_devtx_hook_ids) + static int __init mlx5_init(void) { int err; @@ -2144,9 +2159,15 @@ static int __init mlx5_init(void) mlx5_core_verify_params(); mlx5_register_debugfs(); + err = devtx_hooks_register(&mlx5e_devtx_hook_ids, &mlx5e_xdp_metadata_ops); + if (err) { + pr_warn("failed to register devtx hooks: %d", err); + goto err_debug; + } + err = mlx5e_init(); if (err) - goto err_debug; + goto err_devtx; err = mlx5_sf_driver_register(); if (err) @@ -2162,6 +2183,8 @@ static int __init mlx5_init(void) mlx5_sf_driver_unregister(); err_sf: mlx5e_cleanup(); +err_devtx: + devtx_hooks_unregister(&mlx5e_devtx_hook_ids); err_debug: mlx5_unregister_debugfs(); return err; @@ -2169,6 +2192,7 @@ static int __init mlx5_init(void) static void __exit mlx5_cleanup(void) { + devtx_hooks_unregister(&mlx5e_devtx_hook_ids); pci_unregister_driver(&mlx5_core_driver); mlx5_sf_driver_unregister(); mlx5e_cleanup(); -- 2.41.0.162.gfafddb0af9-goog