rpms/ktls-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

tlshd: Pass ETIMEDOUT from gnutls to kernel

Browse Source 
Resolves: RHEL-79872
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
This commit is contained in:
Scott Mayhew 2025-03-03 15:53:07 -05:00
parent 9b953428e8
commit 080c44ad33
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ktls-utils-0.11-tlshd-Pass-ETIMEDOUT-from-gnutls-to-kernel.patch Normal file
View File

@ -0,0 +1,48 @@
From b010190cfed2d9bbd943b3343fdbaeb66efff8e8 Mon Sep 17 00:00:00 2001
From: Benjamin Coddington <bcodding@redhat.com>
Date: Tue, 11 Feb 2025 11:52:15 -0500
Subject: [PATCH] tlshd: Pass ETIMEDOUT from gnutls to kernel
We've had some QE work that's created a condition (some types of connection
instability) where the handshake attempt has timed out. When this happens,
tlshd sends EACESS back to the kernel. However, the kernel may not be
expecting this error in the context of some NFS operations, for example:
writeback. It can handle ETIMEDOUT, and we would like the kernel to
perform its normal hard/soft retry routines for this case to re-connect to
the server.
Add an error switch that clearly denotes the error paths we'd like
to send back to the kernel. For SUNRPC, there are other insteresting
errors that might be included (see call_conenct_status() in
net/sunrpc/clnt.c), but are ommitted here because we don't have evidence of
them in the wild
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
---
src/tlshd/handshake.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/tlshd/handshake.c b/src/tlshd/handshake.c
index 9bcfc2b..8240b10 100644
--- a/src/tlshd/handshake.c
+++ b/src/tlshd/handshake.c
@@ -94,10 +94,14 @@ void tlshd_start_tls_handshake(gnutls_session_t session,
case GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR:
tlshd_log_cert_verification_error(session);
break;
- default:
+ case -ETIMEDOUT:
tlshd_log_gnutls_error(ret);
+ parms->session_status = -ret;
+ break;
+ default:
+ tlshd_log_notice("tlshd_start_tls_handshake unhandled error %d, returning EACCES\n", ret);
+ parms->session_status = EACCES;
}
- parms->session_status = EACCES;
return;
}
--
2.48.1

6
ktls-utils.spec
View File

@ -3,7 +3,7 @@
Name: ktls-utils
Version: %{baseversion}
Release: 2%{?dist}
Release: 3%{?dist}
Summary: TLS handshake agent for kernel sockets
%forgemeta
@ -18,6 +18,7 @@ Source0: %{forgeurl}/releases/download/%{name}-%{baseversion}/%{name}-%{b
# RHEL-9.6
#
Patch001: ktls-utils-0.11-nvme-default-keyring.patch
Patch002: ktls-utils-0.11-tlshd-Pass-ETIMEDOUT-from-gnutls-to-kernel.patch
BuildRequires: bash systemd-rpm-macros
BuildRequires: gcc make coreutils
@ -71,6 +72,9 @@ standard kTLS socket options.
%systemd_postun_with_restart tlshd.service
%changelog
* Mon Mar 03 2025 Scott Mayhew <smayhew@redhat.com> 0.11-3
- tlshd: Pass ETIMEDOUT from gnutls to kernel
* Wed Feb 12 2025 Scott Mayhew <smayhew@redhat.com> 0.11-2
- Bump release to satisfy the errata automation