From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DAE1818A6DB for ; Thu, 30 Oct 2025 06:47:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761806864; cv=none; b=cApggcxbcyWyAi/25NaIRDPA6son9Me+cJ+VAV5duZQ1kpxJ41JhvZL3Bxf7f0jf7Z6rAK6eGAMCz2xrjyvDhIg+0NV+Lybv+LVyCs9w5D8teTV8pJjimOVEUL/VTtDLp3o4aXIICQQe7b1CsDLajTqGHZ/6+LCm8UDxnQ04ZPE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761806864; c=relaxed/simple; bh=Me3DvE2ugI06H5NnuFqscw90MT7ZGQysOgv6CrNFg7c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=pbM/MrW3D0luVObwbOhSfkdFA+BM6qx1Pp2QzwfHfs7mEZj+7SS3+ohwKYDcQIgCecnrMFf64S93fB+A8ZcqXlU2LfL4neMKXWv7VZ9oL8cxwJFiXK9KvVE6VLmZQVoRJ1ql8vm82EwCWc5qCs/M20PigVMI23szzbsRzzduQoU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Xzb/iaxs; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Xzb/iaxs" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-7a4176547bfso697115b3a.2 for ; Wed, 29 Oct 2025 23:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761806862; x=1762411662; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Am9qB9+YZXgr5yZPmS0eVlJwMZhmLJXC12be2I9616g=; b=Xzb/iaxsuyLAEW7w2FsEl0n1/OdunvACjnQh157BAyjM53zFU8BfAcqqWmqSyNCibg Ed7SZNruy6V3HgTi2miNhDG3vE+MXp7qtR1W4d3eQEW/dQFGbaqjd8yV8JjwMGkfi3c9 WFWD5tzoXRCOaC7o05O1kh4bV7JaBtGA0TCJAYdmGh30h0PnxveZNPbek+yhOhXGT9Cr DoBG2Rjy5ZbgyEyN9q9JaOHH2LY86iRd/bGO5wBSeOadD2YpGAI205f2Mhqe/AWQwUC3 ZJfxqsnSI27j83LkDhn+lP/Ab69hDP+2QZ1EEeGkB1qItKA9M6CviK4CB9wtZUt4mNfC pj5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761806862; x=1762411662; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Am9qB9+YZXgr5yZPmS0eVlJwMZhmLJXC12be2I9616g=; b=cWlt3allnpp6/N7li2wmegyppMI2vid9t4omfqVVIU11AdKYOO5OBHpHKEid7mhJ5V NHhbw1KtdNtYK8iHJgAJ+/U2gXnQfBYzBLCnHmssHN08VWNgjfCm7FAJdDm++dZlBV9l Re8aIjilNvz74KZsmGKAkIwwDJ2+WqOBzmf37pZsq4sgPJYgrTxsaaBLDJWJ2uD9IiK8 GmYT8i0Whq8B5oSp3YVpU0uyI2I+SAEqGSYBzK/svMecxpT1OdfBzocvLBcEZ1+bulE5 sVopCStcQT3I15f7VArwUqcVVmpcCtwK+uJW/TR7enFPdxNv9lMsNcvQSjbyXi/h1YZr VXfw== X-Gm-Message-State: AOJu0YzuQc23pdkW8v1LxklgB85Z7Q8Ba39nuxfO7cV1kqjqSNNIMzrI NgRaBihhwlLYh7B/40RCbRF9IPpDmx00BGhZFzJ+kmRofSMs2I/pWJ2sW8GemaYWGQYGBg== X-Gm-Gg: ASbGncslKpzvnloo+5TH/6FKKnyEBnkRLYVBFoa5iL/mL+umHtahw+HIoC9iQ6BMVzr 1nDieZfPc/1YWCNmdVHcI9B9kBy7fljfphxvvd1rKhwY1BvGi2x4egQRSil0LGXMR3oRNxPNLMA 8m+skF6rbXb/tkM3kEgKqFR+OGMRTD5Vv6KnwZ4ZXUTaJ6BU0z98AuSfEn7sQOAwC8/0pVS8Tus 4p00VHc0DIa3+B72RdRvKfZ6CDNaP989xuLtr24kr1V8b+BFF61ExvzkuxvvcI24xrlou5ktxIV puEfAiGJ/GUpVZ+e+6d8LBIQ2inyVaVAKL4n8SMdD9Fwm95K60CVBq6tSfnp7rPy+3wH8ei6wOP G+pXfnC/bxXmP7R6lrzheyFThO3Ae7rNnf4UPwTx+DN0xT7QT4DLq X-Google-Smtp-Source: AGHT+IGoeDNjZsXbO3LdK/V2YvdvGX0ZgT9GuusUDEYT4fkoC2bi4mVxlbYzrfAWfqpRdk3dt9E7Mg== X-Received: by 2002:a05:6a20:3d86:b0:33b:625:36be with SMTP id adf61e73a8af0-34654ee8c72mr7062588637.38.1761806862086; Wed, 29 Oct 2025 23:47:42 -0700 (PDT) Received: from gmail.com ([2a09:bac5:1f0a:28::4:372]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a414012c40sm17799563b3a.6.2025.10.29.23.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Oct 2025 23:47:41 -0700 (PDT) From: Qingfang Deng To: Namjae Jeon , Steve French , Sergey Senozhatsky , Tom Talpey , Ronnie Sahlberg , Hyunchul Lee , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org Subject: [PATCH] ksmbd: server: avoid busy polling in accept loop Date: Thu, 30 Oct 2025 14:47:36 +0800 Message-ID: <20251030064736.24061-1-dqfext@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The ksmbd listener thread was using busy waiting on a listening socket by calling kernel_accept() with SOCK_NONBLOCK and retrying every 100ms on -EAGAIN. Since this thread is dedicated to accepting new connections, there is no need for non-blocking mode. Switch to a blocking accept() call instead, allowing the thread to sleep until a new connection arrives. This avoids unnecessary wakeups and CPU usage. Also remove: - TCP_NODELAY, which has no effect on a listening socket. - sk_rcvtimeo and sk_sndtimeo assignments, which only caused accept() to return -EAGAIN prematurely. Fixes: 0626e6641f6b ("cifsd: add server handler for central processing and tranport layers") Signed-off-by: Qingfang Deng --- fs/smb/server/transport_tcp.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/fs/smb/server/transport_tcp.c b/fs/smb/server/transport_tcp.c index 7a1e3dcc2cde..57a6aa98e7de 100644 --- a/fs/smb/server/transport_tcp.c +++ b/fs/smb/server/transport_tcp.c @@ -46,11 +46,6 @@ static struct interface *alloc_iface(char *ifname); #define TCP_TRANS(t) ((struct tcp_transport *)container_of(t, \ struct tcp_transport, transport)) -static inline void ksmbd_tcp_nodelay(struct socket *sock) -{ - tcp_sock_set_nodelay(sock->sk); -} - static inline void ksmbd_tcp_reuseaddr(struct socket *sock) { sock_set_reuseaddr(sock->sk); @@ -241,15 +236,10 @@ static int ksmbd_kthread_fn(void *p) mutex_unlock(&iface->sock_release_lock); break; } - ret = kernel_accept(iface->ksmbd_socket, &client_sk, - SOCK_NONBLOCK); + ret = kernel_accept(iface->ksmbd_socket, &client_sk, 0); mutex_unlock(&iface->sock_release_lock); - if (ret) { - if (ret == -EAGAIN) - /* check for new connections every 100 msecs */ - schedule_timeout_interruptible(HZ / 10); + if (ret) continue; - } if (!server_conf.max_ip_connections) goto skip_max_ip_conns_limit; @@ -455,10 +445,6 @@ static void tcp_destroy_socket(struct socket *ksmbd_socket) if (!ksmbd_socket) return; - /* set zero to timeout */ - ksmbd_tcp_rcv_timeout(ksmbd_socket, 0); - ksmbd_tcp_snd_timeout(ksmbd_socket, 0); - ret = kernel_sock_shutdown(ksmbd_socket, SHUT_RDWR); if (ret) pr_err("Failed to shutdown socket: %d\n", ret); @@ -505,7 +491,6 @@ static int create_socket(struct interface *iface) release_sock(ksmbd_socket->sk); } - ksmbd_tcp_nodelay(ksmbd_socket); ksmbd_tcp_reuseaddr(ksmbd_socket); ret = sock_setsockopt(ksmbd_socket, @@ -529,9 +514,6 @@ static int create_socket(struct interface *iface) goto out_error; } - ksmbd_socket->sk->sk_rcvtimeo = KSMBD_TCP_RECV_TIMEOUT; - ksmbd_socket->sk->sk_sndtimeo = KSMBD_TCP_SEND_TIMEOUT; - ret = kernel_listen(ksmbd_socket, KSMBD_SOCKET_BACKLOG); if (ret) { pr_err("Port listen() error: %d\n", ret); -- 2.43.0