| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250716144551.3646755-1-daniel.zahka@gmail.com>
Date: Wed, 16 Jul 2025 07:45:21 -0700
From: Daniel Zahka <daniel.zahka@...il.com>
To: Donald Hunter <donald.hunter@...il.com>,
Jakub Kicinski <kuba@...nel.org>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Paolo Abeni <pabeni@...hat.com>,
Simon Horman <horms@...nel.org>,
Jonathan Corbet <corbet@....net>,
Andrew Lunn <andrew+netdev@...n.ch>
Cc: Saeed Mahameed <saeedm@...dia.com>,
Leon Romanovsky <leon@...nel.org>,
Tariq Toukan <tariqt@...dia.com>,
Boris Pismenny <borisp@...dia.com>,
Kuniyuki Iwashima <kuniyu@...gle.com>,
Willem de Bruijn <willemb@...gle.com>,
David Ahern <dsahern@...nel.org>,
Neal Cardwell <ncardwell@...gle.com>,
Patrisious Haddad <phaddad@...dia.com>,
Raed Salem <raeds@...dia.com>,
Jianbo Liu <jianbol@...dia.com>,
Dragos Tatulea <dtatulea@...dia.com>,
Rahul Rameshbabu <rrameshbabu@...dia.com>,
Stanislav Fomichev <sdf@...ichev.me>,
Toke Høiland-Jørgensen <toke@...hat.com>,
Alexander Lobakin <aleksander.lobakin@...el.com>,
Jacob Keller <jacob.e.keller@...el.com>,
netdev@...r.kernel.org
Subject: [PATCH net-next v4 00/19] add basic PSP encryption for TCP connections
This is v4 of the PSP RFC [1] posted by Jakub Kicinski one year
ago. General developments since v1 include a fork of packetdrill [2]
with support for PSP added, as well as some test cases, and an
implementation of PSP key exchange and connection upgrade [3]
integrated into the fbthrift RPC library. Both [2] and [3] have been
tested on server platforms with PSP-capable CX7 NICs. Below is the
cover letter from the original RFC:
Add support for PSP encryption of TCP connections.
PSP is a protocol out of Google:
https://github.com/google/psp/blob/main/doc/PSP_Arch_Spec.pdf
which shares some similarities with IPsec. I added some more info
in the first patch so I'll keep it short here.
The protocol can work in multiple modes including tunneling.
But I'm mostly interested in using it as TLS replacement because
of its superior offload characteristics. So this patch does three
things:
- it adds "core" PSP code
PSP is offload-centric, and requires some additional care and
feeding, so first chunk of the code exposes device info.
This part can be reused by PSP implementations in xfrm, tunneling etc.
- TCP integration TLS style
Reuse some of the existing concepts from TLS offload, such as
attaching crypto state to a socket, marking skbs as "decrypted",
egress validation. PSP does not prescribe key exchange protocols.
To use PSP as a more efficient TLS offload we intend to perform
a TLS handshake ("inline" in the same TCP connection) and negotiate
switching to PSP based on capabilities of both endpoints.
This is also why I'm not including a software implementation.
Nobody would use it in production, software TLS is faster,
it has larger crypto records.
- mlx5 implementation
That's mostly other people's work, not 100% sure those folks
consider it ready hence the RFC in the title. But it works :)
Not posted, queued a branch [4] are follow up pieces:
- standard stats
- netdevsim implementation and tests
[1] https://lore.kernel.org/netdev/20240510030435.120935-1-kuba@kernel.org/
[2] https://github.com/danieldzahka/packetdrill
[3] https://github.com/danieldzahka/fbthrift/tree/dzahka/psp
[4] https://github.com/kuba-moo/linux/tree/psp
Comments we intend to defer to future series:
- we prefer to keep the version field in the tx-assoc netlink
request, because it makes parsing keys require less state early
on, but we are willing to change in the next version of this
series.
- using a static branch to wrap psp_enqueue_set_decrypted() and
other functions called from tcp.
- using INDIRECT_CALL for tls/psp in sk_validate_xmit_skb(). We
prefer to address this in a dedicated patch series, so that this
series does not need to modify the way tls_validate_xmit_skb() is
declared and stubbed out.
CHANGES:
v4:
- rename psp_rcv() to psp_dev_rcv()
- add strip_icv param psp_dev_rcv() to make trailer stripping optional
- replace memcpy in mlx5e_psp_set_state()
- rename psp_encapsulate() to psp_dev_encapsulate()
- delete unused struct mlx5e_psp_sa_entry declaration
- use psp_key_size() instead of pas->key_sz in mlx5e_psp_assoc_add()
- remove unneeded psp.c/psp.h files in mlx5
- remove unneeded struct psp_key_spi usage in mlx5
- fix EXPORT_IPV6_MOD_GPL(psp_reply_set_decrypted) semicolon
- remove version from netlink rx-assoc reply
- remove key_sz field from struct psp_assoc
- rename psd_get_for_sock() to psp_dev_get_for_sock()
- use sk_is_tcp() to check sock in psp_assoc_device_get_locked()
- add comment to tcp_timewait_state_process() explaining TCP_TW_SYN
case.
- psp_twsk_init() accepts const pointer, so caller does not need to
cast const away.
- add missing psp_twsk_rx_policy_check() to TCP_TW_SYN case of
do_timewait in tcp_v4_rcv().
- remove unused PSP_KEY_V0/PSP_KEY_V1 defines
v3:
- move psp_rcv() and psp_encapsulate() driver helpers into
psp_main.c
- lift pse/pas comparison code into new function:
psp_pse_matches_pas()
- explicitly mark rcu critical section psp_reply_set_decrypted()
- use rcu_dereference_proteced() instead of rcu_read_lock() in
psp_sk_assoc_free() and psp_twsk_assoc_free()
- rename psp_is_nondata() to psp_is_allowed_nondata()
- psp_reply_set_decrypted() should not call psp_sk_assoc(). Call
psp_sk_get_assoc_rcu() instead.
- lift common code from timewait and regular socks into new
function psp_sk_get_assoc_rcu()
- export symbols in psp_sock.c with EXPORT_IPV6_MOD_GPL()
- check for sk_is_inet() before casting to inet_twsk() in
sk_validate_xmit() and in psp_get_assoc_rcu()
- psp_reply_set_decrypted() does not use stuct sock* arg. Drop it.
- reword driver requirement about double rotating keys when the device
supports requesting arbitrary spi key pairs.
v2: https://lore.kernel.org/netdev/20250625135210.2975231-1-daniel.zahka@gmail.com/
- add pas->dev_id == pse->dev_id to policy checks
- __psp_sk_rx_policy_check() now allows pure ACKs, FINs, and RSTs to
be non-psp authenticated before "PSP Full" state.
- assign tw_validate_skb funtion during psp_twsk_init()
- psp_skb_get_rcu() also checks if sk is a tcp timewait sock when
looking for psp assocs.
- scan ofo queue non-psp data during psp_sock_recv_queue_check()
- add tcp_write_collapse_fence() to psp_sock_assoc_set_tx()
- Add psp_reply_set_decrypted() to encapsulate ACKs, FINs, and RSTs
sent from control socks on behalf of full or timewait socks with PSP
state.
- Add dev_id field to psp_skb_ext
- Move psp_assoc from struct tcp_timewait_sock to struct
inet_timewait_sock
- Move psp_sk_assoc_free() from sk_common_release() to
inet_sock_destruct()
- add documentation about MITM deletion attack, and expectation
from userspace
- add information about accepting clear text ACKs, RSTs, and FINs
to `Securing Connections` section.
v1: https://lore.kernel.org/netdev/20240510030435.120935-1-kuba@kernel.org/
Daniel Zahka (2):
net: move sk_validate_xmit_skb() to net/core/dev.c
net: tcp: allow tcp_timewait_sock to validate skbs before handing to
device
Jakub Kicinski (8):
psp: add documentation
psp: base PSP device support
net: modify core data structures for PSP datapath support
tcp: add datapath logic for PSP with inline key exchange
psp: add op for rotation of device key
net: psp: add socket security association code
net: psp: update the TCP MSS to reflect PSP packet overhead
psp: track generations of device key
Raed Salem (9):
net/mlx5e: Support PSP offload functionality
net/mlx5e: Implement PSP operations .assoc_add and .assoc_del
psp: provide encapsulation helper for drivers
net/mlx5e: Implement PSP Tx data path
net/mlx5e: Add PSP steering in local NIC RX
net/mlx5e: Configure PSP Rx flow steering rules
psp: provide decapsulation and receive helper for drivers
net/mlx5e: Add Rx data path offload
net/mlx5e: Implement PSP key_rotate operation
Documentation/netlink/specs/psp.yaml | 187 +++++
Documentation/networking/index.rst | 1 +
Documentation/networking/psp.rst | 183 +++++
.../net/ethernet/mellanox/mlx5/core/Kconfig | 11 +
.../net/ethernet/mellanox/mlx5/core/Makefile | 3 +
drivers/net/ethernet/mellanox/mlx5/core/en.h | 6 +-
.../net/ethernet/mellanox/mlx5/core/en/fs.h | 2 +-
.../ethernet/mellanox/mlx5/core/en/params.c | 4 +-
.../mellanox/mlx5/core/en_accel/en_accel.h | 50 +-
.../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 2 +-
.../mellanox/mlx5/core/en_accel/psp.c | 195 +++++
.../mellanox/mlx5/core/en_accel/psp.h | 49 ++
.../mellanox/mlx5/core/en_accel/psp_fs.c | 736 ++++++++++++++++++
.../mellanox/mlx5/core/en_accel/psp_fs.h | 30 +
.../mellanox/mlx5/core/en_accel/psp_offload.c | 44 ++
.../mellanox/mlx5/core/en_accel/psp_rxtx.c | 200 +++++
.../mellanox/mlx5/core/en_accel/psp_rxtx.h | 121 +++
.../net/ethernet/mellanox/mlx5/core/en_main.c | 9 +
.../net/ethernet/mellanox/mlx5/core/en_rx.c | 49 +-
.../net/ethernet/mellanox/mlx5/core/en_tx.c | 10 +-
drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 +
.../ethernet/mellanox/mlx5/core/lib/crypto.h | 1 +
.../net/ethernet/mellanox/mlx5/core/main.c | 1 +
.../mellanox/mlx5/core/steering/hws/definer.c | 2 +-
include/linux/mlx5/device.h | 4 +
include/linux/mlx5/mlx5_ifc.h | 94 ++-
include/linux/netdevice.h | 4 +
include/linux/skbuff.h | 3 +
include/net/dropreason-core.h | 6 +
include/net/inet_timewait_sock.h | 8 +
include/net/psp.h | 12 +
include/net/psp/functions.h | 204 +++++
include/net/psp/types.h | 184 +++++
include/net/sock.h | 26 +-
include/uapi/linux/psp.h | 66 ++
net/Kconfig | 1 +
net/Makefile | 1 +
net/core/dev.c | 32 +
net/core/gro.c | 2 +
net/core/skbuff.c | 4 +
net/ipv4/af_inet.c | 2 +
net/ipv4/inet_timewait_sock.c | 6 +-
net/ipv4/ip_output.c | 5 +-
net/ipv4/tcp.c | 2 +
net/ipv4/tcp_ipv4.c | 18 +-
net/ipv4/tcp_minisocks.c | 20 +
net/ipv4/tcp_output.c | 17 +-
net/ipv6/ipv6_sockglue.c | 6 +-
net/ipv6/tcp_ipv6.c | 17 +-
net/psp/Kconfig | 15 +
net/psp/Makefile | 5 +
net/psp/psp-nl-gen.c | 119 +++
net/psp/psp-nl-gen.h | 39 +
net/psp/psp.h | 54 ++
net/psp/psp_main.c | 273 +++++++
net/psp/psp_nl.c | 497 ++++++++++++
net/psp/psp_sock.c | 297 +++++++
tools/net/ynl/Makefile.deps | 1 +
58 files changed, 3884 insertions(+), 62 deletions(-)
create mode 100644 Documentation/netlink/specs/psp.yaml
create mode 100644 Documentation/networking/psp.rst
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.h
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_fs.c
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_fs.h
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_offload.c
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.c
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.h
create mode 100644 include/net/psp.h
create mode 100644 include/net/psp/functions.h
create mode 100644 include/net/psp/types.h
create mode 100644 include/uapi/linux/psp.h
create mode 100644 net/psp/Kconfig
create mode 100644 net/psp/Makefile
create mode 100644 net/psp/psp-nl-gen.c
create mode 100644 net/psp/psp-nl-gen.h
create mode 100644 net/psp/psp.h
create mode 100644 net/psp/psp_main.c
create mode 100644 net/psp/psp_nl.c
create mode 100644 net/psp/psp_sock.c
--
2.47.1
Powered by blists - more mailing lists