From: Todd Freed <toddfreed@meta.com>
To: <netdev@vger.kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>,
"Andrew Lunn" <andrew+netdev@lunn.ch>,
"Björn Töpel" <bjorn@kernel.org>,
"Boris Pismenny" <borisp@nvidia.com>,
"Cosmin Ratiu" <cratiu@nvidia.com>,
"Daniel Zahka" <daniel.zahka@gmail.com>,
"David Ahern" <dsahern@kernel.org>,
"Dragos Tatulea" <dtatulea@nvidia.com>,
"Eric Dumazet" <edumazet@kernel.org>,
"Ido Schimmel" <idosch@nvidia.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"John Fastabend" <john.fastabend@gmail.com>,
"Leon Romanovsky" <leon@kernel.org>,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-rdma@vger.kernel.org, "Mark Bloch" <mbloch@nvidia.com>,
"Paolo Abeni" <pabeni@redhat.com>,
"Raed Salem" <raeds@nvidia.com>,
"Rahul Rameshbabu" <rrameshbabu@nvidia.com>,
"Sabrina Dubroca" <sd@queasysnail.net>,
"Saeed Mahameed" <saeedm@nvidia.com>,
"Shuah Khan" <shuah@kernel.org>,
"Simon Horman" <horms@kernel.org>,
"Tariq Toukan" <tariqt@nvidia.com>,
"Wei Wang" <weiwan@google.com>,
"Willem de Bruijn" <willemdebruijn.kernel@gmail.com>
Subject: [PATCH net v6 0/8] psp, tls: don't send offloaded contents in cleartext
Date: Tue, 17 Nov 2026 12:31:29 -0800 [thread overview]
Message-ID: <20261117203137.804424-1-toddfreed@meta.com> (raw)
While working on adding support for socket-less psp associations, I
noticed the case of ipv6 extension headers was not being handled
properly for psp packets. It will be relevant with that series, because
it adds udp support, for which the inner packet needs to be inspected
to set the psp nexthdr.
That led me to various other ways the encryption offload path could
transmit packets unencrypted.
Since the psp/tls association encodes intent to send encrypted packets,
but these various cases circumvent that, sending these as fixes.
The cases are,
1/ ipv6 extension headers (patch 2; patch 1 makes mlx5e flush its tx
queue when the resulting drop happens),
2/ fragments (patch 3),
3/ icmp errors (patch 4),
4/ icmpv6 errors (patch 5),
Cases 2, 3 and 4 are relevant for ktls as well as psp.
patch 8 fixes an mlx5e bug in tso checksum calculation for psp packets
when the l3 dest is an intermediate hop (ipv4 source routing). It's not
about preventing unencrypted tx, so could be considered separate.
netfilter refragments bridged packets and builds reject replies itself,
outside these paths. A separate nf-next series applies the same rules
there.
Testing:
hardware testing was done on connectx-7 (fw 28.48), between two x86
hosts, plus netdevsim.
- drivers/net psp.py: on netdevsim, all 36 tests pass. on mlx5, 40
pass, 4 skip (gmac versions the device doesn't support), and 2 xfail
(netdevsim only). the gmac variants of
data_basic_send_netkit_psp_assoc fail: that test doesn't skip
versions the device doesn't support, which is fixed separately.
- drivers/net/hw tls_hw_offload.py on mlx5: all 8 tests pass.
- tso checksum seed: a psp tcp socket with an ipv4 loose source route,
the peer checking tcp checksums in software. hundreds of checksum
errors before the fix, none after.
- fragments, with tls offload and psp:
- ipv4 (route mtu above the device mtu, IP_PMTUDISC_OMIT): without
the fix, some fragments after the first go out in cleartext. with
it they're dropped.
- ipv6, through an ipvs dr service with a local client: without the
fix, fragments after the first go out in cleartext, and the peer
reassembles them. with it they're dropped.
- icmp and icmpv6 errors, on netdevsim psp, with an nft reject rule
(icmpx port-unreachable) in the inet family:
- in an input chain, of received decrypted packets: without the fix,
the errors go out on the wire, quoting the decrypted packets. with
it, no error reaches the wire.
- in an output chain, of a psp socket's packets: the error is
delivered to the local socket, with and without the fix.
- a PKT_TOOBIG from ip6_fragment() about a psp socket's packets is
delivered to the socket, with and without the fix.
v6:
- patches 4 and 5 - since "net: Make PSP skb extension survive packet
scrubbing", some of the comments on patches 4 and 5 no longer make
sense (psp skb and ktls skb can now be reliably distinguished). the
behavior from v5 is retained, the rationale has been updated.
- patches 4 and 5 - clarified which reject rules go through icmp_send()
and icmp6_send(), so that it's more obvious how the nf-next series
applies (Sashiko)
- patch 5 - icmpv6: explain why the check of a locally originated skb
comes after the rate limit (Sashiko)
- patch 6 - remove the socket option and close the connection in
separate try blocks, and don't overstate the variants (Sashiko)
- patch 7 - use ctl_file_write() to turn off tcp_mtu_probing, including
1 (Sashiko)
- Cc: stable on the fixes (patches 1-5 and 8)
- rebase on net/main
v5: https://lore.kernel.org/netdev/20261111001831.3710881-1-toddfreed@meta.com
- new patch 1: mlx5e rings the tx doorbell when an accel offload drops
a packet, and checks the stop room after the nop it posts (Sashiko)
- ipv6 extension headers: drop them in psp_dev_encapsulate() again,
instead of in mlx5e. it's the helper which can't encapsulate them,
for every driver (netdevsim sent them malformed). unlike the routing
header rejection in v2, this isn't a device limitation
- don't fragment decrypted skbs in ip6_fragment() either
- icmp and icmpv6: send no error at all about a received decrypted skb,
instead of quoting up to the tcp header for tls offload
- icmpv6: decide whether an error about a locally originated skb goes
to a local address from the error's route (RTF_LOCAL), like icmp
(RTCF_LOCAL), instead of the address list (Sashiko)
- selftests: the extension header test runs on netdevsim too, and
removes the socket option before closing. the fragment test uses the
source address of the route, and turns off tcp_mtu_probing
v4: https://lore.kernel.org/netdev/20261103001143.246081-1-toddfreed@meta.com
- back to dropping ipv6 packets with extension headers, but moved into
mlx5e instead of psp_dev_encapsulate()
- drop the psp core changes to rx and tx ipv6 extension headers
- new patch 2 to drop decrypted skbs instead of fragmenting
- new patches 3 and 4 to prevent quoting just-decrypted packet contents
in icmp errors, v4 and v6 respectively (Jakub, Bjorn, Sashiko)
- new selftest: ipv4 fragments of a psp tcp socket
v3: https://lore.kernel.org/netdev/20261023234640.1459291-1-toddfreed@meta.com
- new patch 1 to fix tso checksum seed calculation in mlx5e (Daniel)
- accept routing headers and reject ah (Daniel)
- split the psp_dev_rcv() change into its own patch (Daniel)
- return -EINVAL instead of -1 (Daniel)
- selftest: one variant per extension header type (Daniel)
v2: https://lore.kernel.org/netdev/20261022223014.556388-1-toddfreed@meta.com
- walk the extension headers instead of dropping (Daniel)
- reject fragment headers (Bjorn, Daniel)
- reject routing headers
- psp_dev_rcv() handle the rx case as well
v1: https://lore.kernel.org/netdev/20261021210200.788191-1-toddfreed@meta.com
Todd Freed (8):
net/mlx5e: ring the tx doorbell when an accel offload drops a packet
psp: don't encapsulate ipv6 packets with extension headers
net: don't fragment decrypted skbs
ipv4: icmp: don't quote decrypted payload in icmp errors
ipv6: icmpv6: don't quote decrypted payload in icmpv6 errors
selftests: drv-net: psp: test ipv6 tcp socket with extension headers
selftests: drv-net: psp: test that ipv4 psp packets aren't fragmented
net/mlx5e: psp: tso: replace only the length in checksum seed
.../mellanox/mlx5/core/en_accel/psp_rxtx.c | 21 +-
.../net/ethernet/mellanox/mlx5/core/en_tx.c | 8 +-
net/ipv4/icmp.c | 12 +
net/ipv4/ip_output.c | 8 +
net/ipv6/icmp.c | 18 ++
net/ipv6/ip6_output.c | 9 +
net/psp/psp_main.c | 21 +-
tools/testing/selftests/drivers/net/config | 1 +
tools/testing/selftests/drivers/net/psp.py | 245 +++++++++++++++++-
9 files changed, 324 insertions(+), 19 deletions(-)
base-commit: 5e9b2ad9b8384cd3c417cd5e2c3bc7eee4a72791
--
2.53.1-Meta
next reply other threads:[~2026-11-17 20:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 20:31 Todd Freed [this message]
2026-11-17 20:31 ` [PATCH net v6 1/8] net/mlx5e: ring the tx doorbell when an accel offload drops a packet Todd Freed
2026-11-17 20:49 ` sashiko-bot
2026-11-17 20:31 ` [PATCH net v6 2/8] psp: don't encapsulate ipv6 packets with extension headers Todd Freed
2026-11-17 20:49 ` sashiko-bot
2026-11-17 20:31 ` [PATCH net v6 3/8] net: don't fragment decrypted skbs Todd Freed
2026-11-17 20:49 ` sashiko-bot
2026-11-17 20:31 ` [PATCH net v6 4/8] ipv4: icmp: don't quote decrypted payload in icmp errors Todd Freed
2026-11-17 20:49 ` sashiko-bot
2026-11-17 20:31 ` [PATCH net v6 5/8] ipv6: icmpv6: don't quote decrypted payload in icmpv6 errors Todd Freed
2026-11-17 20:49 ` sashiko-bot
2026-11-17 20:31 ` [PATCH net v6 6/8] selftests: drv-net: psp: test ipv6 tcp socket with extension headers Todd Freed
2026-11-17 20:49 ` sashiko-bot
2026-11-17 20:31 ` [PATCH net v6 7/8] selftests: drv-net: psp: test that ipv4 psp packets aren't fragmented Todd Freed
2026-11-17 20:49 ` sashiko-bot
2026-11-17 20:31 ` [PATCH net v6 8/8] net/mlx5e: psp: tso: replace only the length in checksum seed Todd Freed
2026-11-17 20:49 ` sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117203137.804424-1-toddfreed@meta.com \
--to=toddfreed@meta.com \
--cc=andrew+netdev@lunn.ch \
--cc=bjorn@kernel.org \
--cc=borisp@nvidia.com \
--cc=cratiu@nvidia.com \
--cc=daniel.zahka@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=dtatulea@nvidia.com \
--cc=edumazet@kernel.org \
--cc=horms@kernel.org \
--cc=idosch@nvidia.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mbloch@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=raeds@nvidia.com \
--cc=rrameshbabu@nvidia.com \
--cc=saeedm@nvidia.com \
--cc=sd@queasysnail.net \
--cc=shuah@kernel.org \
--cc=tariqt@nvidia.com \
--cc=weiwan@google.com \
--cc=willemdebruijn.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox