From nobody Tue Sep 29 07:41:15 2026 Received: from mail-pj2-f11.google.com (mail-pj2-f11.google.com [74.125.227.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 084B4439F88 for ; Mon, 10 Aug 2026 18:47:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.139 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786387677; cv=none; b=g+hhJ0sQEGrKHsj/tv2vN1JHQRdU48XEYNrxrGmKMdS9WiiZPXHVyzsBirTp7Lam/uLghjvC4WWQDGqGFHdZzyI+oNKghMr+nQxAfnFDosax5ek2jBOBmut9350oQ/XTBWBIg8Uvt+S2eZ90zcQHyxelqOoD3JdOrifF/DQSxEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786387677; c=relaxed/simple; bh=rWuyKW0qJTLaz8U9Q47FHhUR/2b+JV9Wuz0CfR5JtWE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j0020YeJ0OA4AXjdayDm+6CiYce/HdX0jXRX/oCqu9/9v8suowowhMz4q6R6BWxIEfHA/PKk64DffWR5Jzl/9vT4L66duIR6WMwcRqPLOEUlM7d9pbdfOIBfk43oiu4l5PhGLGLeBznNI5et8ZGP98uZxlwxoQkkJYzS5/+roOc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Kq/ve03q; arc=none smtp.client-ip=74.125.227.139 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kq/ve03q" Received: by mail-pj2-f11.google.com with SMTP id 98e67ed59e1d1-38dbe53179bso801052a91.0 for ; Mon, 10 Aug 2026 11:47:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786387675; x=1786992475; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=k/Ax58T4Q8crjfyLzO+c1sFhNTHsEbLvFPcefzRdh9g=; b=Kq/ve03qzmFnoMRnaL8Ei9J6t/Zycq8s2QZ7Qknc64MryfT5AsuShhuIT6lmF+tL/r zp4QsbNaxGE1h7IgdVXqUhaQkNkO2f4v/L3klsGABGwEaa3CXMr0uDpIv6CHcyQs96QZ 2pxB+7shYnB1vjNPyGdjKSyyy/+KenV81MQjsgybVgSqc5yMR3K2OQAT4JPTjmn8eGqV e3Edgm33+0BezzYp7tukLPRRGcUi9G9AOH7nu3zU5D7byzl1f9L3dn/IYmXhU6fXzpH2 2icpGaPZu2iJl3+25Bz0QdLkqhII2ngFv1r65RP/hJ7ZMrKlmG/ZKYGTK8KjHFca+azY iksQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786387675; x=1786992475; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=k/Ax58T4Q8crjfyLzO+c1sFhNTHsEbLvFPcefzRdh9g=; b=hIXbhfaKcgLCsqrhFKhmx46/0BKV5vdEUNtMD8uedchAtuUSBzczGifx1ClSrvTnE3 KgU8gplms9ZW0XTfP0+n6fviBgfLsdFQi6pv7mUtfMukXd195y2lpaQCOm+0HxD4DIwm 3RUGxl2zFIcP+Uhv+uX6dEDWkFsU/7O+oibpcv8UxvjA00xhxMiLxLHzj4YrG+3/sY7z XbjZHy34T+lBsrkxObEh4haIz8ODHDf213j8e/bzojSBOEgWV6UMl9eujFyR8h0Q7W7h OQcuSw6tmNHAHMDExFEoS+NDBXLQIvNNz4pd9Uo+zHujN6rIg8UEpKB/lUjNCNfPZM5J DAEA== X-Forwarded-Encrypted: i=1; AHgh+Rr1QZ9JyN76nub92P2bNff8N5+bw1T46o4iYQZxaW9bmdVPPWccUBI8JRK9e8IZmxHGCMogAjCtNjfSOHQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzywhobToZtsplO2RNm/Qrb/l3wJlYrYVvRZf6yI4Ug18hcQ45I TyZO5a3o6kjxrLa5plEAe35fX5bBjR8JdvkKCLqZdqJ3DttDYNiN/+87 X-Gm-Gg: AR+sD11gg9MsLKCZgIs0qsDFKwXPgphuzVyRQJbsTgjIvBEyC61/qOP9Rlj3aC0in6P IfKn8I4x/cGBbuN6DyX7pqsKB2uiuH17PgdiuyPZ3jjE9Fdquc6ak5kRrzXg7DOcIGlgG+BW/E1 rN8PBynNIVSDSzRuhOh4Dq8ObYsiARczzqovZppRwHvrOQH6TGe+cXEwf4NoYLNgV6HdIXcSyFf y7d6/ZGW1VqzFVXsTU+i5wQMplXmAqjRiVvqssSMXxuYHE5JLKVaOTYi/bVFOiIlkKsYfFczZ/K RYdSrUYD1jvXFw4ztQqauAzDFhYpOCLK27JbbfmspC76+MLuVEOkHSuio7ooEJqZOfv4aK88ev+ u34KhWFGd2enTOMaIRoB1Y/KBB9Xfh63bNGSlR5ovTjzEtKYiFxwM2wGoImQP7ttKECtdex8A1W GWsoKIyFZvTqU/L+oFclqDKSFqCDzqWz1ziALiziAOCR8HhuXfa8ib9enm7h+IOEvI X-Received: by 2002:a17:90b:1807:b0:38e:6dd:a9ad with SMTP id 98e67ed59e1d1-39281b1b0c8mr20842462a91.0.1786387675358; Mon, 10 Aug 2026 11:47:55 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:48::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-392d5226b40sm611653a91.13.2026.08.10.11.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2026 11:47:55 -0700 (PDT) From: Stanislav Fomichev X-Google-Original-From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, saeedm@nvidia.com, tariqt@nvidia.com, mbloch@nvidia.com, maxime.chevallier@bootlin.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, aleksander.lobakin@intel.com, horms@kernel.org, magnus.karlsson@intel.com, maciej.fijalkowski@intel.com, sdf@fomichev.me, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, alice.kernel@fastmail.im, dtatulea@nvidia.com, witu@nvidia.com, martin.lau@kernel.org, yoong.siang.song@intel.com, rohan.g.thomas@intel.com, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, leon@kernel.org Subject: [PATCH net-next 1/3] xsk: align TX metadata layout across ABIs Date: Mon, 10 Aug 2026 11:47:51 -0700 Message-ID: <20260810184753.135756-2-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260810184753.135756-1-sdf@fomichev.me> References: <20260810184753.135756-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add explicit padding before launch_time so xsk_tx_metadata has the same layout on 32-bit and 64-bit systems. This intentionally replaces the incompatible 32-bit launch-time layout while the interface is still new. Fixes: ca4419f15abd ("xsk: Add launch time hardware offload support to XDP = Tx metadata") Signed-off-by: Stanislav Fomichev --- include/uapi/linux/if_xdp.h | 1 + tools/include/uapi/linux/if_xdp.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/uapi/linux/if_xdp.h b/include/uapi/linux/if_xdp.h index 23a062781468..50d67df78911 100644 --- a/include/uapi/linux/if_xdp.h +++ b/include/uapi/linux/if_xdp.h @@ -149,6 +149,7 @@ struct xsk_tx_metadata { __u16 csum_start; /* Offset from csum_start where checksum should be stored. */ __u16 csum_offset; + __u32 reserved; =20 /* XDP_TXMD_FLAGS_LAUNCH_TIME */ /* Launch time in nanosecond against the PTP HW Clock */ diff --git a/tools/include/uapi/linux/if_xdp.h b/tools/include/uapi/linux/i= f_xdp.h index 23a062781468..50d67df78911 100644 --- a/tools/include/uapi/linux/if_xdp.h +++ b/tools/include/uapi/linux/if_xdp.h @@ -149,6 +149,7 @@ struct xsk_tx_metadata { __u16 csum_start; /* Offset from csum_start where checksum should be stored. */ __u16 csum_offset; + __u32 reserved; =20 /* XDP_TXMD_FLAGS_LAUNCH_TIME */ /* Launch time in nanosecond against the PTP HW Clock */ --=20 2.53.0-Meta From nobody Tue Sep 29 07:41:15 2026 Received: from mail-pj2-f5.google.com (mail-pj2-f5.google.com [74.125.227.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFF8743B3C0 for ; Mon, 10 Aug 2026 18:47:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786387679; cv=none; b=CKuXXzO0hUEnam6vDJPVpRj4K3UyziY3M2VXd1/Sps+IWLWsC5cOwQMv+NDpSQw5BOTWVXD+X+0V1NQOMh03BuaIBzX3K5zH55XdBZL4N8Dv3YIUXyh7Oe8YN/NbP8i1LTL9kkgBB9O+R2VprjkqHwz5c1pcclqm3cBDwqCDkK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786387679; c=relaxed/simple; bh=oc0FyxVZ4ZdrcDJUCj1m469A6KQnHvekrbZ5nkQXVNc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZziUUG0Wst57gYpdhoOdvVlZQij7xL0L9GZIM5J+9om4sSmYaERhsVT44MyVrKla+CAy+U3B0q7RrjLjfTpeUl6It5h0qxgQ7v7Dy02DgeO1eNubNy39SQrMD4KXftmrQvWbzSJcREUK9mrIAi+o1GemboE1ek6T2SQWxzmyKO8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LiU6bhIW; arc=none smtp.client-ip=74.125.227.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LiU6bhIW" Received: by mail-pj2-f5.google.com with SMTP id d9443c01a7336-2d0344e1ce9so11111105ad.1 for ; Mon, 10 Aug 2026 11:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786387676; x=1786992476; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ReqxlOI3SPTob6ZQXa8L4cTAU26COQOXARq4XifK/Bw=; b=LiU6bhIW22yv9IxJkvsafqxdAOZOjCQ0UG1a3L8XaMFfxcw9/jnrgJPdbmm4dOaalk ltWSi4X7sMV5FnBLNFyhvWhj/G7tIyEy3s8GteMxgnJAsfI4P8EmO9Pz79P4sHUuChSx weMGnvFfodNw3LVpKOsKFzSGvxig4hcVqL6eC9XUdC5Hp3Y7O3/sz6GtbZaCKbxUiXKh XF5JIMd57GKcAvrovyY/hIbcl4FXQziKLJCbpGfmuDkmTUmqMHcdSejw66qmV5OWnuFL URnnxnJ43eIZGcXRL1Wzq/Ys/M4KCaxRAZQhjOI1BSeRaCEGA7cTTNSWgjNDw121j+YB hf9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786387676; x=1786992476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ReqxlOI3SPTob6ZQXa8L4cTAU26COQOXARq4XifK/Bw=; b=bu5WpOfVS+WtxkwyFO8IvmWuH9MczbBG3EG6GVrHAk1w7C1wB/lBo3I5EKhgp0Xfzm 1iYJo8P59ECx43SD4cYIjQDEXaPvJ/85z8P9KJAuEu2xBMqdi6XCWIQbAMeynWZkzaPd AxsNjthmDrcyNZ2CUSwKx18rrltLl98JT5xft+5WWjznBCf4yKqyrk2zaB0E8hkj/8YM CSz2EPD9ynDiJaquwqFWqHZimRofXrl3uAFrLAgXU1BmfAzYoAYrC77rP/wujrBCO7Pa nwxRLdeKMsq0niong8kknUPwRhU2RY2TNw6uMhRgdJ8rKZ0F1Wr1Es8VcB3X0aJ6VOtW vd1Q== X-Forwarded-Encrypted: i=1; AHgh+RpTA0UB6lCM1kgjFHjgY+uw6uGG2LBmS0XDrlikROearak3NLUgL7Segupb1R7/bLpakn5juuuy+TQxM3M=@vger.kernel.org X-Gm-Message-State: AOJu0YyZ11517BtxBM5HB9q7Dvbabqe+vbDBRVlnmGM+tvD+g7gtGWFa YSDb7dvTDFxPbbX8QEsgqespaO2WIxnfdpi2ZYT0ANhc1xc7aUzp2EUU X-Gm-Gg: AR+sD138V8Myhg9me6Pc8CsZ/9Z2glYM5ZUh4Rw+lpIq0yMvRQcHb353ZzVQZck3ILs UZ0PNHxZRVMvBu+SWtnJmwQHhbm69YvfF89+n2ce8Q4vZ6mXR48RyNLf0U6ms/qQQX1oVcrzYtM fVZgVqyMpSN6F1HtTvsWmYB0PDnd+NuwNhzDRmxpUgylq6dfCW3PifmJewsCCLOkDD5YxZ73gUP wYSggu6ArKL0z8Ba/PnNb4T4qpJyP7gU6BsAWk2XclzHKSUGSklad58Tl9OwGM78MTt6jyDyQut cCKIzykToXiF8qltMxbKI3dVyF5zCEFp37lCiK2ssatKa/dK9legSeX/LT/AX4gOTVNp/tjoaD3 YGyEz7yOOnVInxH97ZbszvPu4SlxF9Qa0LgckwtyVXSGw/hB4P9bUzVabC1+NWrXG55HeTNYjOb PVzPgNV0TtPhIYxn3sEaLccM9JsPAz14Bkr0v+jZXBvkM/o/2fqArvXkOvJiyh1jo= X-Received: by 2002:a17:903:4b28:b0:2d1:1a18:4d0a with SMTP id d9443c01a7336-2d2a8996f11mr253323075ad.9.1786387676319; Mon, 10 Aug 2026 11:47:56 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:1::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d16c4af2fcsm40115335ad.69.2026.08.10.11.47.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2026 11:47:55 -0700 (PDT) From: Stanislav Fomichev X-Google-Original-From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, saeedm@nvidia.com, tariqt@nvidia.com, mbloch@nvidia.com, maxime.chevallier@bootlin.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, aleksander.lobakin@intel.com, horms@kernel.org, magnus.karlsson@intel.com, maciej.fijalkowski@intel.com, sdf@fomichev.me, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, alice.kernel@fastmail.im, dtatulea@nvidia.com, witu@nvidia.com, martin.lau@kernel.org, yoong.siang.song@intel.com, rohan.g.thomas@intel.com, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, leon@kernel.org Subject: [PATCH net-next 2/3] xsk: honor XDP_TX_METADATA in zero-copy path Date: Mon, 10 Aug 2026 11:47:52 -0700 Message-ID: <20260810184753.135756-3-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260810184753.135756-1-sdf@fomichev.me> References: <20260810184753.135756-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The zero-copy path reads TX metadata whenever the UMEM has metadata space, even if the descriptor does not set XDP_TX_METADATA. Pass descriptor options through the metadata helpers and ignore metadata unless the option is set. This does not change the existing per-WQE metadata handling for mlx5 MPWQEs, where the descriptor that starts a session configures offload state shared by the batch. Supporting mixed metadata states within one MPWQE requires a separate fix. Fixes: 48eb03dd2630 ("xsk: Add TX timestamp and TX checksum offload support= ") Signed-off-by: Stanislav Fomichev --- drivers/net/ethernet/intel/igc/igc_main.c | 3 ++- .../ethernet/mellanox/mlx5/core/en/xsk/tx.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 3 ++- include/net/libeth/xsk.h | 2 +- include/net/xdp_sock_drv.h | 22 +++++++++++-------- include/net/xsk_buff_pool.h | 3 ++- net/xdp/xsk_buff_pool.c | 7 ++++-- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethern= et/intel/igc/igc_main.c index 8b9ce7cbfff9..1fb5f3cbe93c 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -3071,7 +3071,8 @@ static void igc_xdp_xmit_zc(struct igc_ring *ring) olinfo_status =3D xdp_desc.len << IGC_ADVTXD_PAYLEN_SHIFT; =20 dma =3D xsk_buff_raw_get_dma(pool, xdp_desc.addr); - meta =3D xsk_buff_get_metadata(pool, xdp_desc.addr); + meta =3D xsk_buff_get_metadata(pool, xdp_desc.addr, + xdp_desc.options); xsk_buff_raw_dma_sync_for_device(pool, dma, xdp_desc.len); bi =3D &ring->tx_buffer_info[ntu]; =20 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 3d19dad8f868..d194eeddd7b5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c @@ -99,7 +99,7 @@ bool mlx5e_xsk_tx(struct mlx5e_xdpsq *sq, unsigned int bu= dget) xdptxd.dma_addr =3D xsk_buff_raw_get_dma(pool, desc.addr); xdptxd.data =3D xsk_buff_raw_get_data(pool, desc.addr); xdptxd.len =3D desc.len; - meta =3D xsk_buff_get_metadata(pool, desc.addr); + meta =3D xsk_buff_get_metadata(pool, desc.addr, desc.options); =20 xsk_buff_raw_dma_sync_for_device(pool, xdptxd.dma_addr, xdptxd.len); =20 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne= t/ethernet/stmicro/stmmac/stmmac_main.c index b2b7d0242dd3..efa35cfecc4f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2723,7 +2723,8 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *pr= iv, u32 queue, u32 budget) =20 tx_desc =3D stmmac_get_tx_desc(priv, tx_q, entry); dma_addr =3D xsk_buff_raw_get_dma(pool, xdp_desc.addr); - meta =3D xsk_buff_get_metadata(pool, xdp_desc.addr); + meta =3D xsk_buff_get_metadata(pool, xdp_desc.addr, + xdp_desc.options); xsk_buff_raw_dma_sync_for_device(pool, dma_addr, xdp_desc.len); =20 /* To return XDP buffer to XSK pool, we simple call diff --git a/include/net/libeth/xsk.h b/include/net/libeth/xsk.h index 5dcc0d7f65b7..a452b7828ce4 100644 --- a/include/net/libeth/xsk.h +++ b/include/net/libeth/xsk.h @@ -196,7 +196,7 @@ __libeth_xsk_xmit_fill_buf_md(const struct xdp_desc *xd= esc, struct libeth_xdp_tx_desc desc; struct xdp_desc_ctx ctx; =20 - ctx =3D xsk_buff_raw_get_ctx(sq->pool, xdesc->addr); + ctx =3D xsk_buff_raw_get_ctx(sq->pool, xdesc->addr, xdesc->options); desc =3D (typeof(desc)){ .addr =3D ctx.dma, __libeth_xdp_tx_len(xdesc->len), diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h index b344789f5df8..d94aeb506379 100644 --- a/include/net/xdp_sock_drv.h +++ b/include/net/xdp_sock_drv.h @@ -240,6 +240,7 @@ static inline void *xsk_buff_raw_get_data(struct xsk_bu= ff_pool *pool, u64 addr) * xsk_buff_raw_get_ctx - get &xdp_desc context * @pool: XSk buff pool desc address belongs to * @addr: desc address (from userspace) + * @options: desc options (from userspace) * * Wrapper for xp_raw_get_ctx() to be used in drivers, see its kdoc for * details. @@ -248,9 +249,9 @@ static inline void *xsk_buff_raw_get_data(struct xsk_bu= ff_pool *pool, u64 addr) * pointer, if it is present (initialized to %NULL otherwise). */ static inline struct xdp_desc_ctx -xsk_buff_raw_get_ctx(const struct xsk_buff_pool *pool, u64 addr) +xsk_buff_raw_get_ctx(const struct xsk_buff_pool *pool, u64 addr, u32 optio= ns) { - return xp_raw_get_ctx(pool, addr); + return xp_raw_get_ctx(pool, addr, options); } =20 #define XDP_TXMD_FLAGS_VALID ( \ @@ -318,18 +319,20 @@ xsk_tx_metadata_request(const struct xsk_buff_pool *p= ool, } =20 static inline struct xsk_tx_metadata * -__xsk_buff_get_metadata(const struct xsk_buff_pool *pool, void *data) +__xsk_buff_get_metadata(const struct xsk_buff_pool *pool, void *data, + unsigned int options) { - if (!pool->tx_metadata_len) + if (!pool->tx_metadata_len || !(options & XDP_TX_METADATA)) return NULL; =20 return data - pool->tx_metadata_len; } =20 static inline struct xsk_tx_metadata * -xsk_buff_get_metadata(struct xsk_buff_pool *pool, u64 addr) +xsk_buff_get_metadata(struct xsk_buff_pool *pool, u64 addr, u32 options) { - return __xsk_buff_get_metadata(pool, xp_raw_get_data(pool, addr)); + return __xsk_buff_get_metadata(pool, xp_raw_get_data(pool, addr), + options); } =20 static inline void xsk_buff_dma_sync_for_cpu(struct xdp_buff *xdp) @@ -510,7 +513,7 @@ static inline void *xsk_buff_raw_get_data(struct xsk_bu= ff_pool *pool, u64 addr) } =20 static inline struct xdp_desc_ctx -xsk_buff_raw_get_ctx(const struct xsk_buff_pool *pool, u64 addr) +xsk_buff_raw_get_ctx(const struct xsk_buff_pool *pool, u64 addr, u32 optio= ns) { return (struct xdp_desc_ctx){ }; } @@ -530,13 +533,14 @@ xsk_tx_metadata_request(const struct xsk_buff_pool *p= ool, } =20 static inline struct xsk_tx_metadata * -__xsk_buff_get_metadata(const struct xsk_buff_pool *pool, void *data) +__xsk_buff_get_metadata(const struct xsk_buff_pool *pool, void *data, + unsigned int options) { return NULL; } =20 static inline struct xsk_tx_metadata * -xsk_buff_get_metadata(struct xsk_buff_pool *pool, u64 addr) +xsk_buff_get_metadata(struct xsk_buff_pool *pool, u64 addr, u32 options) { return NULL; } diff --git a/include/net/xsk_buff_pool.h b/include/net/xsk_buff_pool.h index 2bb1d122b1bc..a7df573784fd 100644 --- a/include/net/xsk_buff_pool.h +++ b/include/net/xsk_buff_pool.h @@ -154,7 +154,8 @@ struct xdp_desc_ctx { struct xsk_tx_metadata *meta; }; =20 -struct xdp_desc_ctx xp_raw_get_ctx(const struct xsk_buff_pool *pool, u64 a= ddr); +struct xdp_desc_ctx xp_raw_get_ctx(const struct xsk_buff_pool *pool, u64 a= ddr, + u32 options); =20 static inline dma_addr_t xp_get_dma(struct xdp_buff_xsk *xskb) { diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c index 78c14f106395..9d2d94f1fb75 100644 --- a/net/xdp/xsk_buff_pool.c +++ b/net/xdp/xsk_buff_pool.c @@ -763,6 +763,7 @@ EXPORT_SYMBOL(xp_raw_get_dma); * xp_raw_get_ctx - get &xdp_desc context * @pool: XSk buff pool desc address belongs to * @addr: desc address (from userspace) + * @options: desc options (from userspace) * * Helper for getting desc's DMA address and metadata pointer, if present. * Saves one call on hotpath and double calculation of the actual address. @@ -771,14 +772,16 @@ EXPORT_SYMBOL(xp_raw_get_dma); * Return: new &xdp_desc_ctx struct containing desc's DMA address and meta= data * pointer, if it is present (initialized to %NULL otherwise). */ -struct xdp_desc_ctx xp_raw_get_ctx(const struct xsk_buff_pool *pool, u64 a= ddr) +struct xdp_desc_ctx xp_raw_get_ctx(const struct xsk_buff_pool *pool, u64 a= ddr, + u32 options) { struct xdp_desc_ctx ret; =20 addr =3D __xp_raw_get_addr(pool, addr); =20 ret.dma =3D __xp_raw_get_dma(pool, addr); - ret.meta =3D __xsk_buff_get_metadata(pool, __xp_raw_get_data(pool, addr)); + ret.meta =3D __xsk_buff_get_metadata(pool, __xp_raw_get_data(pool, addr), + options); =20 return ret; } --=20 2.53.0-Meta From nobody Tue Sep 29 07:41:15 2026 Received: from mail-pj2-f8.google.com (mail-pj2-f8.google.com [74.125.227.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3565B43B490 for ; Mon, 10 Aug 2026 18:47:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.136 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786387680; cv=none; b=mkgXQcX0ptJphv7b0MMf/A35tbRyF6HUg7pe3QuJzJ1IY4LD1oaRbrvzS0tVkH9YLLzhA2fUzamRR5dJ17PDASqjlaTHwNPOOPqpPNOYGj8bXGREbnS2XjAasExybCUonYQxDXSBTqcU1q7ZcesLfwDLJzS13DREo95ArMpl/Fc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786387680; c=relaxed/simple; bh=GKE9WxfuuFSk4fxayK4oJhsYIA/EvxRVXK9sR7Ol0aY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AfoCKcPR6q173PG6YfdfqOJC/2WJaqJi/BqwiEmO4AM7/DdCShwPS2IxzfTtW9dDMuEOmfFWq2o5cOJpCBHmric08PXs6bd+6VNNCYsA6nbOvnYynU0wi7umimrSPbnVso1MY5hKAQvHClqWg53rRXr3aVJUi/8oLjaxEzhQh8A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Gtb724h4; arc=none smtp.client-ip=74.125.227.136 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Gtb724h4" Received: by mail-pj2-f8.google.com with SMTP id 98e67ed59e1d1-392c6555df6so404650a91.0 for ; Mon, 10 Aug 2026 11:47:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786387677; x=1786992477; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=/h1pNasFi/92T6RUAvXDvHq7QawRH4lT9AOvszwUiP4=; b=Gtb724h4xyP9iqtruN9lvhZNNL2Mw5QzZSOwevKtUYvMt2cv0ckDAO4u8UfQEu0Zmx AxeaZZQWOLhKOIifUYslieR9maZ62toBToi/nN97tqOf4MpJzwYbvRuzAOs1+GzV0tI1 wwkgAzfDg1emRhyjMdLbf/t7z8A+K3S+FFmUOhE4DJrsAhqMRdHYG7/c3/EXFQ42Ltce 5pXlXLBF3vTVjOAHNF6ZklKLAobnxQzrkk3BnZF9eWJ3DggbRrgGoczbgYGbnbJPF/QO l4KSvZvF1HGx2t05JVLHKUlk7dRQSdd1rrwLGQkhzv1fuGCAI0pZAizo4y0U2Z00BREU hDpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786387677; x=1786992477; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=/h1pNasFi/92T6RUAvXDvHq7QawRH4lT9AOvszwUiP4=; b=USFcPpnSfTKobJ1DPlGpYZriZtsjbV9YbQT2TZtuPy4rF0rDMTfFkdj6rnWzIToUdi 2HCREVcghuGp7kxCo7CH0QoWPsiFz/OYKIXlBzaMcRlgay4YS62NtJ6imjj6tZiSUvNF Srbi1X1N0A3gZCfPTCifVtm/vCN/dtjdcCNUos/CsLjY9TL7VLMp1xsVsAMhG5AtUGIu Dvg9kKVNn0WThcxg1mCF9SwFzDhZGBFGHJLN/s3DJ68o/onc4YFD9x0s7/T4gqLW4sB8 /EA42dOKOv0WpG57Yzc8agqdAw6gakxKvNwU/Ti4ktoAX5FvMLJBf1icVqu3ctWdCiM0 3meQ== X-Forwarded-Encrypted: i=1; AHgh+RoWMM2Hn4AWZmS6CdSmC8vwIGS7GmjHIWz0+shh0RZhu8n5XRof7uKuqw81v87NOG5i5k1Ka7mTvd6HR0s=@vger.kernel.org X-Gm-Message-State: AOJu0YyTe7un63lW+4DN1dqygKb/PWGHwJudnb6c+K9xhSP+2YYsHjh8 6wk4f04EN6xRxh7yw7mSdlXDFQbphwmzXhrYNBt2h1e+s0uaTMczKacy X-Gm-Gg: AR+sD10EKXeZGVqsaMM5wGDv+Nz34eKGVWMCNc29bG9hlHWe4EIxheSpV2uaddfJoog rTajztE9lgiGwFNR4ftFGlOXoWCRVWYFBUV59+Ql965NnC6IP7ce1Zk0DtAsrp4nrWGa5i1ztph PHG0Xgzw8VXWqJ2yGReFT//kVAZRoyOsrjP8Q7IGKn6dJ9gp1qEZqpbzC1M+tBirtLXG4m3AWnZ 9wrL/Ur951u0CQb4nQZBxXNuo2Pr18VnOQcu7HmP9QBg5M7R6fg7OeKt4w7HYZxQtuyTIcdSgpB T2JjRmzZGOYX2CMvF2Hi3l2cVpUx07YuMr7GKhO4jYFoIO+BUXxxqtzGPlWqL5FtbPnKhhvNFBm 2pSHDfQoX1h7WlLDpi+C/b1x8BbmiF15aB4iVvXp4RSUqNxU96RofFECCotF+ybP+m/EyjuFRt6 pfQ6T9lpt5yM3aZfmOHn0WZlW44xZQpeIYKZLPZc6J8jzs6cP0mskf8w== X-Received: by 2002:a05:6a20:918c:b0:3c3:89cf:f3a with SMTP id adf61e73a8af0-3cbce6cb365mr23635499637.5.1786387677292; Mon, 10 Aug 2026 11:47:57 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:58::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbe8f38882fsm4517610a12.31.2026.08.10.11.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2026 11:47:56 -0700 (PDT) From: Stanislav Fomichev X-Google-Original-From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, saeedm@nvidia.com, tariqt@nvidia.com, mbloch@nvidia.com, maxime.chevallier@bootlin.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, aleksander.lobakin@intel.com, horms@kernel.org, magnus.karlsson@intel.com, maciej.fijalkowski@intel.com, sdf@fomichev.me, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, alice.kernel@fastmail.im, dtatulea@nvidia.com, witu@nvidia.com, martin.lau@kernel.org, yoong.siang.song@intel.com, rohan.g.thomas@intel.com, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, leon@kernel.org Subject: [PATCH net-next 3/3] net: stmmac: skip queueMaxSDU check for AF_XDP Date: Mon, 10 Aug 2026 11:47:53 -0700 Message-ID: <20260810184753.135756-4-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260810184753.135756-1-sdf@fomichev.me> References: <20260810184753.135756-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit c5c3e1bfc9e0 ("net: stmmac: Offload queueMaxSDU from tc-taprio") was inspired by commit 92a0dcb8427d ("igc: offload queue max SDU from tc-taprio"), but the igc change does not apply the check to AF_XDP. xsk_tx_peek_desc() reserves a completion entry. Continuing without queuing or completing the descriptor leaves the AF_XDP rings imbalanced, so remove the check from the zero-copy path. Fixes: c5c3e1bfc9e0 ("net: stmmac: Offload queueMaxSDU from tc-taprio") Signed-off-by: Stanislav Fomichev --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne= t/ethernet/stmicro/stmmac/stmmac_main.c index efa35cfecc4f..6e9d4cb336ee 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2714,13 +2714,6 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *p= riv, u32 queue, u32 budget) if (!xsk_tx_peek_desc(pool, &xdp_desc)) break; =20 - if (priv->est && priv->est->enable && - priv->est->max_sdu[queue] && - xdp_desc.len > priv->est->max_sdu[queue]) { - priv->xstats.max_sdu_txq_drop[queue]++; - continue; - } - tx_desc =3D stmmac_get_tx_desc(priv, tx_q, entry); dma_addr =3D xsk_buff_raw_get_dma(pool, xdp_desc.addr); meta =3D xsk_buff_get_metadata(pool, xdp_desc.addr, --=20 2.53.0-Meta