From nobody Tue Sep 29 01:18:29 2026 Received: from mail-pj2-f9.google.com (mail-pj2-f9.google.com [74.125.227.137]) (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 594FD42049C for ; Thu, 13 Aug 2026 19:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.137 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786648084; cv=none; b=H0b7tX8fLS22KZDstBR50ApcHWEOrfA7ObuVer8/siOHsAXk2DJxArJ4gEkcOCp1EqoPB1dOz4z3Gtb55P3fZZbXmnfNZS6z47pGDsmx3jkSghblHerI1KqM8d1ViRL7T5WbfMKyM5Ik7BpQGsb14pRILWCDIUu5+fQp5QBiHkw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786648084; c=relaxed/simple; bh=Na7MS/Up8XTKb4IX9xJjbtZxGJ7cnEgnEI7V0oawB80=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lb2emzgkk8PEPrzGilS0tKLztCwgSUIhxYcGy6zZ9goTHztNG5lLsyT6oMjF6ptZDLu9bCBKqBMJR5sRl6ImewNaUyzWy4h6NZp8Sx4mzIzFSa9qabwrSisHsl/RGxKhf6mKCFHOSXGuwVz5GW/MTDOU39XQlaqf+q5uyFhklOk= 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=SJzKuBu9; arc=none smtp.client-ip=74.125.227.137 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="SJzKuBu9" Received: by mail-pj2-f9.google.com with SMTP id 98e67ed59e1d1-38f0f8ab050so148368a91.0 for ; Thu, 13 Aug 2026 12:08:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786648083; x=1787252883; 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=akUZ9dYiYWC1oUDGRGEMMoCmBNHpXpllEedbay7GMFg=; b=SJzKuBu9wHTjWU9bGfrFJ+r9NiOTAfKB6oHWsgxB2gGcLkXlNuw/60fSe5HwgLxFKV Lwn4556+mOBdsiI1xDIPh3O2lmQ6ArIXj3+b2LhXe9HUec8/HhLOiCHa5iQfB6qbWsgK gkTPoaLqhYPQTOwAyNbKLfgsPDnaFmboTGIA+m3HkrAezqlhff+2eenRlwrdR8qBgHGB GaAFJfzp7ZVNjuBm0kL8g6b9xYAFVTqOXD1Xeh+RwfqPM3uMd70j83ZnmqtzwLZewAEc OJjCSEiDCuCvk+9fRSvg9kV2LMeAGHfIoAkBMkixW1E1NLz/Om8a7iJ4OMGP94yaAnw3 rMaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786648083; x=1787252883; 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=akUZ9dYiYWC1oUDGRGEMMoCmBNHpXpllEedbay7GMFg=; b=LHilZwSjO2ewNx6DVFPFANzXCZDUbhGQzmDhzOPKdn4R9zGpqUAgsxIGHhsTdCuH0X 94IGsVx5taNjZi8AfZ9DQrxGx5xWE6HMQg/+XNOPLh6kLoh1crLqdM1Uveschfho4LFt 5MpdGU8YyqCw7mW/6qUVfOO7Qxmn+1w0CN984/qHisQrOTR5xLx96TDB+4NvEuUcKrPx 7DVwGzdvrgbd3dkzrHXZjPJlHOjpbylhUG/ojZBZV0ii23mxCNjjm8jdZoSv143SrWD+ IfuR8EBh9+jZVoEauceaogkHr4sfryVHb4CAZki5ufiG2jGLONtuC6FiBoMp7Q0VBi8F XaMg== X-Forwarded-Encrypted: i=1; AHgh+RosLYdMSJD8SPT9wODeEMdjpK40SONi8F8WJ/plGKuN5TNEWT1FieHpBIsiDzf/qev9Gkrh/+BYnL+6VbQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxZSMbuf85ajTOIpiMagD1TGifTJ2YrfVsNiGrVaHDYcaqZ/TjN BNGt19v7DabvoSn0PICYGlJGE6IPy1rQ/vxVbjSUk7vXKGo5rLJd7GZ0 X-Gm-Gg: AR+sD12yq+yCihqXCQm9HBTNxqZwu2PaFv5MeN9rwqilHILs4idhm5gmauPU+1Row8d wESHTrVBsgeiCQJVs3hYL/Ga7Uy/ceh28T+cIunAWhv43+60qEmYnyiTHuz9/938zpXSINiLAsa zHtnxoMTHdH3Ov8l7zqfpwqfJqJuBRt10emrk24dM8xHWZv5/MLltWKHnFl0b6WKLhReqi2Rlhn HXUESOCZOpuH1ltf2ZwHWLaROyEfw7IUlsPwiuUgXdV78p4Zdb+pY88lxM5lzHX4hzQ1rKghi/E rAHLUDH4CYTs8yn5jIeB2ZjuDFTlcK0ics+VGlLcjYTdavHUpDPwTD+7CCjtdhm+vbrWEnMsT38 W+PpV9Zb4ZZOAY6atRwyObYviAGm0gs7hLkzPJsqOooG6DeAhlpPXka7rxsgCrLELytKD90NOS+ +Gxe7+6tPFWa56RmPOszDlpOoJ+h/R8Yler9WDMDLtLmgQviUIOBSkgg== X-Received: by 2002:a17:90b:2b8e:b0:38e:4f41:83df with SMTP id 98e67ed59e1d1-3933b8aa611mr183995a91.15.1786648082609; Thu, 13 Aug 2026 12:08:02 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:4f::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3933a009f35sm492119a91.15.2026.08.13.12.08.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2026 12:08:02 -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, 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 v2 1/3] xsk: align TX metadata layout across ABIs Date: Thu, 13 Aug 2026 12:07:58 -0700 Message-ID: <20260813190800.222527-2-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260813190800.222527-1-sdf@fomichev.me> References: <20260813190800.222527-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. On i386 and m68k, the old native 32-bit layout put launch_time at offset 12 and had a natural size of 20 bytes. Using sizeof(struct xsk_tx_metadata) as tx_metadata_len was already rejected because the length must be a multiple of eight, so the straightforward use of the interface was broken on those ABIs. Userspace could still register a padded length of 24 bytes, though; mixing the old and new layouts then silently reads launch_time from the wrong offset and misprograms packet launch times. This intentionally replaces that incompatible 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 Reviewed-by: Simon Horman --- 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 01:18:29 2026 Received: from mail-pj2-f6.google.com (mail-pj2-f6.google.com [74.125.227.134]) (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 83F87422521 for ; Thu, 13 Aug 2026 19:08:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.134 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786648086; cv=none; b=nBQoaNTLexufyQ6W3uV8yMMk1FEGVb+O1pdKh/XU7dPrPdmmjBBB2T8pGrrABsmBwBU/KLgPDsC9Kl8sAKSUIJj3lR6wqO7niJGwgcW2hvlvVExnvFbK9J18qsCjploYFtaimn88nvlafCutIe8vyxugNYn5JKH3mUpQRz8jgI0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786648086; c=relaxed/simple; bh=h/yRTy+q/aTNWgdAyARpnxO02skNFXM6ZPvX24ue7RU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UB2+9yqVSPee6Qm+4a2LucJ/v/yygYCPU/uZCFNI3Y+L2FTJ+Id3cUhcwTqebkEWiErxHO3wMOq6wpDZ5yapUk6BpEgJImTkhjyQtL1VIOAxXv+dbMOjEBs8imtiCLtPp14nSydZqnVRAfwnxbGAmO6iIF8iq3Gy88CLIVJ/25A= 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=BxxA8BdM; arc=none smtp.client-ip=74.125.227.134 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="BxxA8BdM" Received: by mail-pj2-f6.google.com with SMTP id 98e67ed59e1d1-38f25802c19so74405a91.1 for ; Thu, 13 Aug 2026 12:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786648084; x=1787252884; 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=knHPZ2hqDlF6r7lICpyiSankCSnQUl1ZecmnK0yjr1w=; b=BxxA8BdMs621XLpRrcXBmzwifHSG5UoNWkE9d1ppbJJmCvlcQNfzCILo6OtbA6/rpx jJ7V++l+PCvsfceYjzSoimTKX7yYIkdD9yEuaMnaVYs9/hi5BNkb87TZqjZvj158xh81 wIOEKIyw76iRW9ZSbc9/QIWfKdc6dyurCA+4GSEfXYVou/n+GrfiF8GYO9EnVJW0I52e ju2u0htng1cTYWMKi4WP0j2JIpMig2/Cyjuhlx5RatWq6t/q2MoCYgszSEoYUEsquZ3t MwxWfn+m09MHQG+OfrMQAB+uVMnRZANMnrxjwfYRub97hHG/umOz9Oyp68nwtjxwcHub ZAiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786648084; x=1787252884; 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=knHPZ2hqDlF6r7lICpyiSankCSnQUl1ZecmnK0yjr1w=; b=bGVfhRqv46LR28nKUGj7tWJ8DPy9P6qSSLyW4r04fXGlS7RH3MkWP+OfzamlTFGjB0 u9xdjHVf6h9L+ftnRVm/3kdjH4MXtSesK9sG2PnNvwcYBcZeaXcpu2IN21hW/IzLSZEF 45WBANfmKQn1ncx0cdJ31Ut8bg9MtSP1QZFlzQxHgRNFiYqDuZmZ/lhFSKSMARQzXw54 pcnJE6x1HJSUjxuDbcNF0TSjc7TNZwm5fCWVsGp2zjzfttuRN7wSwgiyEfio6sYw55VX XSnRANthllawxDQ4wxoG0dGdE/SM8DOP4wL5jUpO/7pwfK20Qz5Nr+5I5eaEqUy20amF D1jQ== X-Forwarded-Encrypted: i=1; AHgh+RqIND73U6sYZpZlz3SaO+G1jeWWqBK5XCILNZx1l7Il5I1pfZ7iSZiI46LyFSrRDmI/eOPbsRumve6oBVg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxf9nm+lZhDAfUKj9Mp0pG3ysz71t3BPP5/uFytnejtX17qPJNW Lwajmc//CQpRrfhcMDttOnp6dxL4+it+K5/Hxq5rkUUY2fyiXMg58tEa X-Gm-Gg: AR+sD12aUN2W5ydewdGOTqFpdlieLutsVbAOoEH/8JHL79KWPNYcEaJnAdUYoDSKfdl clY+kPQJF3eKlF4iTXrFg5N3oE+TY6JF/gIK2elsQBlIdNy/5VoLXiIFONQGWE3cVgJXw2jdBeh XKqVQgmGqPt4iJAeSBOHihOiRTcX8ZnktUanBEApCDjiUfIMjq5M1W5+0eqNqWTIMoRHWefJvds HoY5CanVf5uo5DVpeyxFoVZKmWrRq7TS7mACP7kSRbeHo4R50oBcSqP0d47fOx7B6k17qpWkz2y qR68kZijf58hNUVkXArQrWmdDzHRiFNOPJrridPxgXsgCy3lSkeY1vU1PT9fJJ8biJJKgt22SrY QWtR72EIWL/WmN4mWaAdFHuK7OKnRBMHVS2EN/cmdb7sO5QaDHiPJLBediNmmXsdp9tKVNIDRmW zLFKjqVc/NTF96qxI6ERTqql3wHD7aRGnX9Dg+9f2BVD9lP9dYpHVFHw== X-Received: by 2002:a17:90a:da8f:b0:380:21b7:e727 with SMTP id 98e67ed59e1d1-3933b95e327mr167852a91.14.1786648083852; Thu, 13 Aug 2026 12:08:03 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:4c::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3931cf25e5dsm4535692a91.17.2026.08.13.12.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2026 12:08:03 -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, 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 v2 2/3] xsk: honor XDP_TX_METADATA in zero-copy path Date: Thu, 13 Aug 2026 12:07:59 -0700 Message-ID: <20260813190800.222527-3-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260813190800.222527-1-sdf@fomichev.me> References: <20260813190800.222527-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 fix the existing per-WQE metadata handling for mlx5 MPWQEs. Only the descriptor that starts a session passes through xsk_tx_metadata_request() and configures offload state shared by the batch. Metadata on descriptors joining an open session is therefore not validated and does not configure its requested offloads. In addition, a non-NULL metadata pointer from such a descriptor is treated as a timestamp completion request even when XDP_TXMD_FLAGS_TIMESTAMP is not set, so its metadata union can be overwritten with an unrequested timestamp. Fixing mixed metadata states within one MPWQE requires a separate change. Fixes: 48eb03dd2630 ("xsk: Add TX timestamp and TX checksum offload support= ") Reviewed-by: Alexander Lobakin 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 39043d8ca1bf..59067939a586 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -3074,7 +3074,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 a71f0df26378..62de03e65a90 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2719,7 +2719,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 01:18:29 2026 Received: from mail-pj2-f7.google.com (mail-pj2-f7.google.com [74.125.227.135]) (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 CBCE2426D0C for ; Thu, 13 Aug 2026 19:08:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.135 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786648087; cv=none; b=CtkaUGWYAR1GOV4s587r/4rI3cluXPLkjGGKmWHZtGYIJdiViRD7NQhn3FWjBWkfeovmdCMerdqQBG547mzpZcyMfdiXsWI+a0mtRr/4sLpughtieOr6Gvq1IvziUcqTL0815VQ0QavXFjvOUhzhlcnIzNztXGB1z7r2wiPqa04= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786648087; c=relaxed/simple; bh=Tud4eUO2xHdHMLanMzOvMuFiHkLGOKwIvvgYvzDmhMo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZupBZDmdZpQZlj4dEweSvzeeYrwjbn2dI+JyNpBPx/h4Kv1crAuu2ivph0qJ4vxvFADx4HajhckBFluwRQfh7+T6wXAhX8XsGAFfZYGAsRcIYD6l9++cQOOHsEXDH2zxCPaghasu+YCkNLbygexVM1Fqty9fokyKmOU+GWoKm3o= 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=i0mraj8O; arc=none smtp.client-ip=74.125.227.135 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="i0mraj8O" Received: by mail-pj2-f7.google.com with SMTP id 98e67ed59e1d1-38dcd98e5easo115308a91.0 for ; Thu, 13 Aug 2026 12:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786648085; x=1787252885; 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=zjeV9JcXmMB5XUYPG/BDWWBwnse1nt9xQQ5l1gfrbe8=; b=i0mraj8OoIpXvRPCdaHjRWZOBk8XJCEgEXrrV9Kp66o+mDLVdTDX3Dfx6GqufnBjus J50flLwhn4toaNfny4l/1F+Egf1dieJUm4wq9HbAlyBWZqxC0aiK89nyzsKyIjZG4xiU q0ac8I+77Z9ocgdTz2A9fh5QpoDpATSm3tppPmWenY7SQ/Dt0STR2gmlWxRyBRqbGgaZ FSUziE5NaC4v94hWgr8/FY2NHztvqkr7fuXY6nun4Iv+hTAFQg2jo9NnxuuiFOblmXDK xNhdrdIBVK41eobOY9FwEL55WDYivVAQEzkHaHpv+xGylYwQTY9YoQ2coMI67pbChBca hpOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786648085; x=1787252885; 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=zjeV9JcXmMB5XUYPG/BDWWBwnse1nt9xQQ5l1gfrbe8=; b=C+bKeSPE1bvxXPlcaAx36b89RGxiiIie8JmTvgu4oyrLG44xnC39mpftbk8FqmTkTe Qw7q0IZmcjdDvU/28Gz9niAwpvU3M/WQuqqOZ17cGQzGcl4M2Ddo8FoCdyqeaHFT4eId x1ih7iWLMw9GCVZ5vStoW21haOCOpKBN3cYjRtTzTWG2xxU03rmlrzxJ5Yp0JVOTAF1O Yxiew9OQgSDdH/csvl6YfgdyqtwYa4y9DKPxloyWvLWzkfcyH91/XDJOQumHR1ok9K3J AtsQ5/0pEJSm2p6+3z1YBMdbg7xPqXOocQidilsJ+TYmXEvnC8iij5IkO1dS7heIZzbR c7wQ== X-Forwarded-Encrypted: i=1; AHgh+Rq7qDt/Fy4llU5HySfZvucAnQu+rTEgba7VcLYzIw65XyKWhwwIKZmuDrY1pix40rtqHyoy6YW4Zw7MUwg=@vger.kernel.org X-Gm-Message-State: AOJu0YyS04pZzdtYJsRlYQqi0M1QrGa/IAp+zIcCrZ9r2Mha8SFHE2Gs 1jhJleXRf7Vesd+J7XWY0kl6zI9CwMPMspAyNGehlBEdF+Fil1+O0Xd3 X-Gm-Gg: AR+sD11yLETSTV2wexdqYmLYXQk0TugT0gVq/QobbRGW0rKSJm4n7Q8ROX9A6IxwMmz FLd2fJe+eZ36Cnb9g0CJ3wPyyWG6UmY7Udo/DcNLpuqukyBBMLttm3gIQFJxshAyqqvTJiU3GlY kvjmJ7Xahu7h6a8i1FO/EDIHW2Vb7lrfKbVMfziJcvmoy44jbfPXBnGR6cuiZ8DcuRPb4DJwteM urVdpK4aKTupbl53vGkPct5xp7OT0C6o9ZdLe5nURUSO79nad7liy93FD7mzMCaNx2jB6ErqhJu 0jN44wyL2xZvF3WgxSeK+I01jOuqvANC61nNehnxbmqpnTF62rRtc3gUmgSeYGGBEr/qusYlEc9 N+//oK5WtIlW/tdih2DYAowQixbzjFFZTYOk0xmKkkXSJjWAm5m0NWfskABJ0XE9djkPmPo9RIO nPSN2G/jqAOze8q/2VL45EZlmsJ5yfGdkRwN9YO2u8xc3Z4mfPfMzSLQ== X-Received: by 2002:a17:90b:2f0d:b0:38e:7268:220d with SMTP id 98e67ed59e1d1-3933ed5e238mr29902a91.20.1786648085014; Thu, 13 Aug 2026 12:08:05 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:52::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39339fe280fsm485100a91.12.2026.08.13.12.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2026 12:08:04 -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, 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 v2 3/3] net: stmmac: skip queueMaxSDU check for AF_XDP Date: Thu, 13 Aug 2026 12:08:00 -0700 Message-ID: <20260813190800.222527-4-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260813190800.222527-1-sdf@fomichev.me> References: <20260813190800.222527-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. The assumptions is that AF_XDP zero-copy traffic bypasses the qdisc, so taprio's queueMaxSDU check does not apply to this path. Fixes: c5c3e1bfc9e0 ("net: stmmac: Offload queueMaxSDU from tc-taprio") Signed-off-by: Stanislav Fomichev Reviewed-by: Aleksandr Loktionov Reviewed-by: Simon Horman --- 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 62de03e65a90..4a82f4351303 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2710,13 +2710,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