This series removes support for using PSP's assoc uapi on TCP sockets
not in established state.
The PSP uapi and connection upgrade described in psp.rst is only fleshed
out for established TCP connections. Installing PSP assoc state on a
listen socket, or closed socket ahead of connect() is possible, but not
something that results in useful outcomes.
With commit 8cc3aef0cb19 ("tcp: Do not allow buggy transitions between
ehash and lhash2.") in place, this series makes it impossible to have
PSP assoc state on a listen socket. It is still possible to have a
closed socket with assoc state by terminating a connection with
shutdown(), but the series then adds code to prevent subsequent calls to
connect() from succeeding. Patch two updates psp.rst to discuss what
this means for users.
The first patch converts some tests that used TCP_CLOSE sockets for
basic uapi tests with connected sockets, so that the subsequent commit
doesn't break them.
The second patch introduces the actual checks on sk->sk_state during the
rx and tx assoc handlers, as well as preventing connect() attempts when
assoc state is already present. The commit message contains my argument
for why removing these "features" is appropriate and doesn't constitute
a fix.
The third patch unwinds commit 1d2929d0850f ("net: psp: do not inherit
the Rx association on clone"), which was introduced to workaround assoc
state not being handled correctly from listen sockets.
The fourth patch has some tests for the new checks introduced.
Signed-off-by: Daniel Zahka <[email protected]>
---
Changes in v2:
- net: psp: require an established connection for association setup
- reject connect() on sockets with PSP assoc state
- drop PSP MSS overhead handling from tcp_v{4,6}_connect()
- update psp.rst disconnect paragraph
- selftests: drv-net: psp: test that assocs require an established socket
- drop assoc_tx_non_established test
- Link to v1:
https://lore.kernel.org/r/[email protected]
---
Daniel Zahka (4):
selftests: drv-net: psp: swap closed for connected sockets in assoc tests
net: psp: require an established connection for association setup
net: psp: drop psp assoc clear in sk_clone()
selftests: drv-net: psp: test that rx-assoc fails on closed and listen
socks
Documentation/networking/psp.rst | 8 +++++
net/core/sock.c | 2 +-
net/ipv4/tcp_ipv4.c | 7 ++--
net/ipv6/tcp_ipv6.c | 9 +++--
net/psp/psp_sock.c | 12 +++++++
tools/testing/selftests/drivers/net/psp.py | 56 ++++++++++++++++++++++++------
6 files changed, 77 insertions(+), 17 deletions(-)
---
base-commit: 1631d79ae57dce2c5f88ad278307028638a8b4d9
change-id: 20260916-psp-defeat-a271649be9dc
Best regards,
--
Daniel Zahka <[email protected]>
