Skip to contentSkip to conversation

ksmbd: enable TCP keepalive for accepted connections

PATCH New Namjae Jeon 1 participant 3 messages Aug 20

Subsystems (2)
lore
Share & tools
lore

Namjae Jeon

author maintainer
#0 lore raw

PATCH 1/1 ksmbd: enable TCP keepalive for accepted connections

A client that disappears without sending a FIN or RST can leave its ksmbd connection in ESTABLISHED indefinitely. ksmbd sets a socket receive timeout, but the connection receive loop retries timeout errors without a limit, so the connection remains in conn_list and consumes the per-IP connection quota.

Enable SO_KEEPALIVE on accepted TCP sockets so the TCP stack can detect a silent peer failure. The keepalive idle time, interval, and probe count remain controlled by the existing TCP sysctl settings.

---
 fs/smb/server/transport_tcp.c | 6 ++++++
 1 file changed, 6 insertions(+)
fs/smb/server/transport_tcp.c +6 -0
index 0ae5f145a332..921e4e86d01c 100644
@@ -292,6 +292,12 @@ static int ksmbd_kthread_fn(void *p)
 		ksmbd_debug(CONN, "connect success: accepted new connection\n");
 		client_sk->sk->sk_rcvtimeo = KSMBD_TCP_RECV_TIMEOUT;
 		client_sk->sk->sk_sndtimeo = KSMBD_TCP_SEND_TIMEOUT;
+		/*
+		 * Detect peers that disappear without sending a FIN or RST.
+		 * Otherwise the connection handler can retry receive timeouts
+		 * indefinitely and keep the connection in conn_list.
+		 */
+		sock_set_keepalive(client_sk->sk);
 
 		ksmbd_tcp_new_connection(client_sk);
 	}
Signature · 1 line
2.25.1
author maintainer
#1 lore raw

PATCH 1/1 ksmbd: keep TCP timers alive for kernel sockets

ksmbd creates its listening socket with sock_create_kern(). Kernel sockets do not hold a network namespace reference by default. Accepted sockets inherit this state.

When an accepted socket is released, tcp_close() clears its pending TCP timers for a kernel socket after the socket enters an orphaned state. If the peer is unreachable while ksmbd sends a FIN, this can leave a FIN-WAIT-1 orphan without a retransmission timer.

Upgrade the listening socket's network namespace reference before kernel_listen(). Accepted sockets inherit the reference, so the TCP stack can keep the retransmission timer active and apply its normal orphan retry policy.

Preserve the existing graceful shutdown behavior.

---
 fs/smb/server/transport_tcp.c | 6 ++++++
 1 file changed, 6 insertions(+)
fs/smb/server/transport_tcp.c +6 -0
index 921e4e86d01c..832e93084605 100644
@@ -523,6 +523,12 @@ static int create_socket(struct interface *iface)
 		goto out_error;
 	}
 
+	/*
+	 * Accepted sockets inherit the listener's net reference. Keep TCP
+	 * timers alive after a kernel socket is released.
+	 */
+	sk_net_refcnt_upgrade(ksmbd_socket->sk);
+
 	ret = kernel_listen(ksmbd_socket, KSMBD_SOCKET_BACKLOG);
 	if (ret) {
 		pr_err("Port listen() error: %d\n", ret);
Signature · 1 line
2.25.1
author maintainer
#2 lore raw

PATCH 4/6 smb: server: remove unused DES crypto header

In reply to Namjae Jeon

The DES crypto header is no longer used after the removal of NTLMv1 authentication. Remove it now that the server no longer selects CRYPTO_LIB_DES.

Fixes ce812992f239 ("ksmbd: remove NTLMv1 authentication")
---
 fs/smb/server/auth.c | 1 -
 1 file changed, 1 deletion(-)
fs/smb/server/auth.c +0 -1
index 9f3151a9f379..5ec43e32de3e 100644
@@ -24,7 +24,6 @@
 
 #include <linux/fips.h>
 #include <crypto/arc4.h>
-#include <crypto/des.h>
 
 #include "server.h"
 #include "smb_common.h"
Signature · 1 line
2.25.1