nvme/tcp: handle tls partially sent records in write_space()
PATCH v3 1/1 nvme/tcp: handle tls partially sent records in write_space()
From: Wilfred Mallawa <[email protected]>
With TLS enabled, records that are encrypted and appended to TLS TX list can fail to see a retry if the underlying TCP socket is busy, for example, hitting an EAGAIN from tcp_sendmsg_locked(). This is not known to the NVMe TCP driver, as the TLS layer successfully generated a record.
Typically, the TLS write_space() callback would ensure such records are retried, but in the NVMe TCP Host driver, write_space() invokes nvme_tcp_write_space(). This causes a partially sent record in the TLS TX list to timeout after not being retried.
This patch fixes the above by calling queue->write_space(), which calls into the TLS layer to retry any pending records.
---V2->V3: Minor Style Changes
---drivers/nvme/host/tcp.c | 3 +++
1 file changed, 3 insertions(+)
drivers/nvme/host/tcp.c +3 -0
@@ -1081,6 +1081,9 @@ static void nvme_tcp_write_space(struct sock *sk) queue = sk->sk_user_data;if (likely (queue &&sk_stream_is_writeable (sk))) {clear_bit (SOCK_NOSPACE , &sk->sk_socket->flags); +/* Ensure pending TLS partial records are retried */ +if (nvme_tcp_queue_tls (queue)) + queue->write_space (sk);queue_work_on (queue->io_cpu, nvme_tcp_wq, &queue->io_work); }read_unlock_bh (&sk->sk_callback_lock);
Signature · 1 line
2.51.0
Quoted 28 lines · Wilfred Mallawa
From: Wilfred Mallawa <[email protected]>
With TLS enabled, records that are encrypted and appended to TLS TX list can fail to see a retry if the underlying TCP socket is busy, for example, hitting an EAGAIN from
tcp_sendmsg_locked(). This is not known to the NVMe TCP driver, as the TLS layer successfully generated a record.Typically, the TLS
write_space()callback would ensure such records are retried, but in the NVMe TCP Host driver,write_space()invokesnvme_tcp_write_space(). This causes a partially sent record in the TLS TX list to timeout after not being retried.This patch fixes the above by calling
queue->write_space(), which calls into the TLS layer to retry any pending records.Fixes be8e82caa685 ("nvme-tcp: enable TLS handshake upcall")Signed-off-by Wilfred Mallawa <[email protected]>---
V2->V3: Minor Style Changes
---drivers/nvme/host/tcp.c| 3 +++1 file changed, 3 insertions(+)drivers/nvme/host/tcp.c +0
-0
drivers/nvme/host/tcp.c static void nvme_tcp_write_space(struct sock *sk) · line 1089
Quoted 9 lines
drivers/nvme/host/tcp.c +3
-0@@ -1081,6 +1081,9 @@ static void nvme_tcp_write_space(struct sock *sk) queue = sk->sk_user_data;if (likely (queue &&sk_stream_is_writeable (sk))) {clear_bit (SOCK_NOSPACE , &sk->sk_socket->flags); +/* Ensure pending TLS partial records are retried */ +if (nvme_tcp_queue_tls (queue)) + queue->write_space (sk);queue_work_on (queue->io_cpu, nvme_tcp_wq, &queue->io_work); }read_unlock_bh (&sk->sk_callback_lock);
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich