[PATCH v2 0/2] nvme-tcp: handle TLS control records at connect and on receive errors
Martin Belanger via B4 Relay
devnull+martin.nvme.dev.gmail.com at kernel.org
Tue Oct 27 03:38:51 PDT 2026
A TLS 1.3 peer can send records that carry no application data, for
example a NewSessionTicket right after the handshake. nvme-tcp does not
handle them correctly. This series fixes two cases.
Patch 1: when read_sock() returns an error, nvme-tcp does not start
error recovery. The queue stops receiving until a command times out.
With a NewSessionTicket on a live queue, I/O stalls until the I/O
timeout (30 seconds by default). With this patch, recovery starts at
once. This also applies to plain TCP.
Patch 2: a NewSessionTicket that arrives before the ICResp fails the
connection with "failed to receive icresp, error -104". A target that
sends a ticket at once, such as an OpenSSL-based target, cannot be
reached. With this patch, the ticket is discarded and the connection
succeeds. An alert in place of the ICResp is now reported with its code,
instead of as error -104.
These patches replace patch 1/2 of Hannes's "nvme,tls: minimal handling
for TLS records":
https://lore.kernel.org/all/20260922133708.84522-1-hare@kernel.org/
Patch 2/2 of that series (the net/tls errno change) will be posted to
netdev separately after 7.4-rc1. It will not change
tls_sw_splice_read(), because that errno is visible to user space.
After that, a follow-up nvme-tcp patch will read control records on a
live queue, so a NewSessionTicket no longer causes a reconnect.
Tested with host and target in one VM, with a test-only change to
net/tls that makes the target send NewSessionTickets of 64 to 1000
bytes, or an alert.
Also tested on plain TCP, and built with CONFIG_NVME_TCP_TLS=n.
Signed-off-by: Martin Belanger <martin.belanger at dell.com>
---
Changes in v2:
- Patch 2: pass a control buffer when draining a record. Without it,
kTLS fails a ticket longer than 128 bytes with -EIO. (Sashiko)
- Patch 2: report a peer that closes before the ICResp as -ECONNRESET.
(Sashiko)
- Patch 1: start error recovery under the socket lock, before
release_sock() processes the backlog. (Sashiko)
- Patch 2: cite RFC 9846 section 4.7.1 in the commit message. (Hannes)
- Kept Hannes's Reviewed-by on both patches. The changes since v1 are
small fixes found in review.
- Link to v1: https://patch.msgid.link/20261026-nvme-tcp-ctrlrec-fixes-v1-0-ebf6ff7eff34@gmail.com
---
Martin Belanger (2):
nvme-tcp: start error recovery when read_sock fails
nvme-tcp: skip TLS control records while waiting for the ICResp
drivers/nvme/host/tcp.c | 175 ++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 153 insertions(+), 22 deletions(-)
---
base-commit: 6b4b543fa18757297ac756a6fe6e64f506b7844a
change-id: 20261026-nvme-tcp-ctrlrec-fixes-5f1cd54073ba
Best regards,
--
Martin Belanger <martin.nvme.dev at gmail.com>
More information about the Linux-nvme
mailing list