xsk: pass TX metadata pointer by reference

Completion handling needs to know whether a timestamp was requested when
the metadata was processed. Let xsk_tx_metadata_request() update the
caller's metadata pointer so that decision can be carried forward without
rereading user-controlled flags.

This only changes the interface; behavior remains unchanged.

Fixes: ca4419f15abd ("xsk: Add launch time hardware offload support to XDP Tx metadata")
Cc: Cen Zhang (Microsoft) <blbllhy@gmail.com>
Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20260727161959.885642-3-sdf@fomichev.me
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index b3883a5a7d7ae195d549c93fbdcdb43c3d149047..beaea147948572c63da6aaa16ea2a3790c1776ea 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -3082,7 +3082,7 @@ static void igc_xdp_xmit_zc(struct igc_ring *ring)
                meta_req.tx_buffer = bi;
                meta_req.meta = meta;
                meta_req.used_desc = 0;
-               xsk_tx_metadata_request(meta, &igc_xsk_tx_metadata_ops,
+               xsk_tx_metadata_request(&meta, &igc_xsk_tx_metadata_ops,
                                        &meta_req);
 
                /* xsk_tx_metadata_request() may have updated next_to_use */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 6867a5aed42c086870fb446925b4ed6fb4ac7f05..822859c360e75471ca091615de23742a3ca130de 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -483,7 +483,7 @@ typedef int (*mlx5e_fp_xmit_xdp_frame_check)(struct mlx5e_xdpsq *);
 typedef bool (*mlx5e_fp_xmit_xdp_frame)(struct mlx5e_xdpsq *,
                                        struct mlx5e_xmit_data *,
                                        int,
-                                       struct xsk_tx_metadata *);
+                                       struct xsk_tx_metadata **);
 
 struct mlx5e_xdpsq {
        /* data path */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
index d8c7cb8837d742e22388ba2447ba571c13152ed1..dac5e9d4c8bdb9c88b831d656db422e6c9bac74e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
@@ -452,11 +452,11 @@ INDIRECT_CALLABLE_SCOPE int mlx5e_xmit_xdp_frame_check_mpwqe(struct mlx5e_xdpsq
 
 INDIRECT_CALLABLE_SCOPE bool
 mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd,
-                    int check_result, struct xsk_tx_metadata *meta);
+                    int check_result, struct xsk_tx_metadata **meta);
 
 INDIRECT_CALLABLE_SCOPE bool
 mlx5e_xmit_xdp_frame_mpwqe(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd,
-                          int check_result, struct xsk_tx_metadata *meta)
+                          int check_result, struct xsk_tx_metadata **meta)
 {
        struct mlx5e_tx_mpwqe *session = &sq->mpwqe;
        struct mlx5e_xdpsq_stats *stats = sq->stats;
@@ -504,7 +504,10 @@ mlx5e_xmit_xdp_frame_mpwqe(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptx
                 * and it's safe to complete it at any time.
                 */
                mlx5e_xdp_mpwqe_session_start(sq);
-               xsk_tx_metadata_request(meta, &mlx5e_xsk_tx_metadata_ops, &session->wqe->eth);
+               if (meta)
+                       xsk_tx_metadata_request(meta,
+                                               &mlx5e_xsk_tx_metadata_ops,
+                                               &session->wqe->eth);
        }
 
        mlx5e_xdp_mpwqe_add_dseg(sq, p, stats);
@@ -535,7 +538,7 @@ INDIRECT_CALLABLE_SCOPE int mlx5e_xmit_xdp_frame_check(struct mlx5e_xdpsq *sq)
 
 INDIRECT_CALLABLE_SCOPE bool
 mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd,
-                    int check_result, struct xsk_tx_metadata *meta)
+                    int check_result, struct xsk_tx_metadata **meta)
 {
        struct mlx5e_xmit_data_frags *xdptxdf =
                container_of(xdptxd, struct mlx5e_xmit_data_frags, xd);
@@ -649,7 +652,8 @@ mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd,
 
        sq->pc += num_wqebbs;
 
-       xsk_tx_metadata_request(meta, &mlx5e_xsk_tx_metadata_ops, eseg);
+       if (meta)
+               xsk_tx_metadata_request(meta, &mlx5e_xsk_tx_metadata_ops, eseg);
 
        sq->doorbell_cseg = cseg;
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h
index 3c54f8962664fc706e4c368886d455324fdd8e10..5b8f4094d553068946e746cb5e4dbea98e1bf6f0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h
@@ -114,11 +114,11 @@ extern const struct xsk_tx_metadata_ops mlx5e_xsk_tx_metadata_ops;
 INDIRECT_CALLABLE_DECLARE(bool mlx5e_xmit_xdp_frame_mpwqe(struct mlx5e_xdpsq *sq,
                                                          struct mlx5e_xmit_data *xdptxd,
                                                          int check_result,
-                                                         struct xsk_tx_metadata *meta));
+                                                         struct xsk_tx_metadata **meta));
 INDIRECT_CALLABLE_DECLARE(bool mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq,
                                                    struct mlx5e_xmit_data *xdptxd,
                                                    int check_result,
-                                                   struct xsk_tx_metadata *meta));
+                                                   struct xsk_tx_metadata **meta));
 INDIRECT_CALLABLE_DECLARE(int mlx5e_xmit_xdp_frame_check_mpwqe(struct mlx5e_xdpsq *sq));
 INDIRECT_CALLABLE_DECLARE(int mlx5e_xmit_xdp_frame_check(struct mlx5e_xdpsq *sq));
 

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 8aeab4b21035cd18cfc05ac0dc98a74165c8a4ef..3d19dad8f86889cbb8667bc25ba4fb90a01648d4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c
@@ -105,7 +105,7 @@ bool mlx5e_xsk_tx(struct mlx5e_xdpsq *sq, unsigned int budget)
 
                ret = INDIRECT_CALL_2(sq->xmit_xdp_frame, mlx5e_xmit_xdp_frame_mpwqe,
                                      mlx5e_xmit_xdp_frame, sq, &xdptxd,
-                                     check_result, meta);
+                                     check_result, &meta);
                if (unlikely(!ret)) {
                        if (sq->mpwqe.wqe)
                                mlx5e_xdp_mpwqe_complete(sq);

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 3801f9d45278efeee5753c8d50180bdb40306bd3..7c3a7c56a81adf0aa4aee54d9509f2490f8eb8c0 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2748,7 +2748,7 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
                meta_req.set_ic = &set_ic;
                meta_req.tbs = tx_q->tbs;
                meta_req.edesc = &tx_q->dma_entx[entry];
-               xsk_tx_metadata_request(meta, &stmmac_xsk_tx_metadata_ops,
+               xsk_tx_metadata_request(&meta, &stmmac_xsk_tx_metadata_ops,
                                        &meta_req);
                if (set_ic) {
                        tx_q->tx_count_frames = 0;

diff --git a/include/net/libeth/xsk.h b/include/net/libeth/xsk.h
index 82b5d21aae878486def8d48abcfdf11ea42ef23a..e2fa6bf6b1b31e50774968272ea00e29203db339 100644 (file)
--- a/include/net/libeth/xsk.h
+++ b/include/net/libeth/xsk.h
@@ -205,7 +205,7 @@ __libeth_xsk_xmit_fill_buf_md(const struct xdp_desc *xdesc,
        BUILD_BUG_ON(!__builtin_constant_p(tmo == libeth_xsktmo));
        tmo = tmo == libeth_xsktmo ? &__libeth_xsktmo : tmo;
 
-       xsk_tx_metadata_request(ctx.meta, tmo, &desc);
+       xsk_tx_metadata_request(&ctx.meta, tmo, &desc);
 
        return desc;
 }

diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h
index 8b51876efbed1a1d40e3ca4bb91da4df90f805e5..06c081feff42d4f6895f2bfd8e30e32e851fffd8 100644 (file)
--- a/include/net/xdp_sock.h
+++ b/include/net/xdp_sock.h
@@ -153,17 +153,19 @@ static inline void xsk_tx_metadata_to_compl(struct xsk_tx_metadata *meta,
 /**
  *  xsk_tx_metadata_request - Evaluate AF_XDP TX metadata at submission
  *  and call appropriate xsk_tx_metadata_ops operation.
- *  @meta: pointer to AF_XDP metadata area
+ *  @pmeta: pointer to pointer to AF_XDP metadata area
  *  @ops: pointer to struct xsk_tx_metadata_ops
  *  @priv: pointer to driver-private aread
  *
  *  This function should be called by the networking device when
  *  it prepares AF_XDP egress packet.
  */
-static inline void xsk_tx_metadata_request(const struct xsk_tx_metadata *meta,
+static inline void xsk_tx_metadata_request(struct xsk_tx_metadata **pmeta,
                                           const struct xsk_tx_metadata_ops *ops,
                                           void *priv)
 {
+       const struct xsk_tx_metadata *meta = *pmeta;
+
        if (!meta)
                return;
 
@@ -231,7 +233,7 @@ static inline void xsk_tx_metadata_to_compl(struct xsk_tx_metadata *meta,
 {
 }
 
-static inline void xsk_tx_metadata_request(struct xsk_tx_metadata *meta,
+static inline void xsk_tx_metadata_request(struct xsk_tx_metadata **pmeta,
                                           const struct xsk_tx_metadata_ops *ops,
                                           void *priv)
 {