From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60172383304; Tue, 12 May 2026 02:34:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.110 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778553285; cv=none; b=aF8vUN4SX76gknSDGCb7uDuUzs5NsxqoSdaO8/SeaUb9q3tJCsN4MmJtRSG3Sbl7ZAlIGN9Tl3kuvpkvAkdKnt7BaBqKjJAb1UE6KcszX3V7UdwLrArG8NrANKF+Ypk4GfFHuqlC2e4FVUhyqfYOcRoBmpDcXZ0srW2dOqGPu+k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778553285; c=relaxed/simple; bh=/+wS7oDnBR8IRSjxCIOqapgFelhDjKLgk/pmP4lyEao=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=RIEsNTcnBVBl/0hbif4/YUZDvqt1duQkhpH5/wCPsYEcJPxiW3fK6u/Xsu3yDVFBjJoxElb3x3tVVDEvQSbt7g76ylmFT51tAubJ6NZbh5MlYUwvzsrNpqu9+ZW5Upu4VG2vX9jAqydzlHnOdFLDGK5RBphEfDrdXsrKUGXfsjU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=MZmqxA3A; arc=none smtp.client-ip=115.124.30.110 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="MZmqxA3A" DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1778553272; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=lVEthr3OjyLWgfe3fW1E9XiL6UTLbnwbkazBNrYN0nE=; b=MZmqxA3A5Qqby4Fzc37zK01B66aO+jZMuqo7ceuYLQbB+Mmp73V6B5dKE29Mpv82t5sNm+Y6jLA9qMY1t19RP+y6t3u4LAZSfz03a9RN5GRBi+yVjnElUB8GuJCzorXkwSe7QLEJCfpdejv11dSnjIxWrY1wXqljdxdRENfoIA0= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam011083073210;MF=mengferry@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0X2opqSE_1778553269; Received: from localhost(mailfrom:mengferry@linux.alibaba.com fp:SMTPD_---0X2opqSE_1778553269 cluster:ay36) by smtp.aliyun-inc.com; Tue, 12 May 2026 10:34:32 +0800 From: Ferry Meng To: stable@vger.kernel.org Cc: Namjae Jeon , Steve French , Sergey Senozhatsky , Tom Talpey , linux-cifs@vger.kernel.org, Ferry Meng Subject: [PATCH v2 6.12.y,6.6.y] ksmbd: make ksmbd thread names distinct by client IP Date: Tue, 12 May 2026 10:34:27 +0800 Message-Id: <20260512023427.90371-1-mengferry@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Namjae Jeon commit 5da92a251e41f824d7e6b4d54d65dcdcfd69fda3 upstream. This patch makes ksmbd thread names distinct by client IP address. 100943 ? S 0:00 [ksmbd:::ffff:10.177.110.57] or 101752 ? S 0:00 [ksmbd:10.177.110.57] Signed-off-by: Namjae Jeon Signed-off-by: Steve French Stable-dep-of: 77ffbcac4e56 ("smb: server: fix leak of active_num_conn in ksmbd_tcp_new_connection()") Stable-dep-of: 97f8d2648ef4 ("smb: server: fix active_num_conn leak on transport allocation failure") Signed-off-by: Ferry Meng --- v2: Replace verbose [backport ...] description with standard Stable-dep-of: tags per stable tree convention. fs/smb/server/transport_tcp.c | 39 ++++++++++++----------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/fs/smb/server/transport_tcp.c b/fs/smb/server/transport_tcp.c index e55afd0c9bf4..f04aa8c504ff 100644 --- a/fs/smb/server/transport_tcp.c +++ b/fs/smb/server/transport_tcp.c @@ -173,17 +173,6 @@ static struct kvec *get_conn_iovec(struct tcp_transport *t, unsigned int nr_segs return new_iov; } -static unsigned short ksmbd_tcp_get_port(const struct sockaddr *sa) -{ - switch (sa->sa_family) { - case AF_INET: - return ntohs(((struct sockaddr_in *)sa)->sin_port); - case AF_INET6: - return ntohs(((struct sockaddr_in6 *)sa)->sin6_port); - } - return 0; -} - /** * ksmbd_tcp_new_connection() - create a new tcp session on mount * @client_sk: socket associated with new connection @@ -195,7 +184,6 @@ static unsigned short ksmbd_tcp_get_port(const struct sockaddr *sa) */ static int ksmbd_tcp_new_connection(struct socket *client_sk) { - struct sockaddr *csin; int rc = 0; struct tcp_transport *t; struct task_struct *handler; @@ -208,27 +196,26 @@ static int ksmbd_tcp_new_connection(struct socket *client_sk) return -ENOMEM; } - csin = KSMBD_TCP_PEER_SOCKADDR(KSMBD_TRANS(t)->conn); - if (kernel_getpeername(client_sk, csin) < 0) { - pr_err("client ip resolution failed\n"); - rc = -EINVAL; - goto out_error; - } - +#if IS_ENABLED(CONFIG_IPV6) + if (client_sk->sk->sk_family == AF_INET6) + handler = kthread_run(ksmbd_conn_handler_loop, + KSMBD_TRANS(t)->conn, "ksmbd:%pI6c", + &KSMBD_TRANS(t)->conn->inet6_addr); + else + handler = kthread_run(ksmbd_conn_handler_loop, + KSMBD_TRANS(t)->conn, "ksmbd:%pI4", + &KSMBD_TRANS(t)->conn->inet_addr); +#else handler = kthread_run(ksmbd_conn_handler_loop, - KSMBD_TRANS(t)->conn, - "ksmbd:%u", - ksmbd_tcp_get_port(csin)); + KSMBD_TRANS(t)->conn, "ksmbd:%pI4", + &KSMBD_TRANS(t)->conn->inet_addr); +#endif if (IS_ERR(handler)) { pr_err("cannot start conn thread\n"); rc = PTR_ERR(handler); ksmbd_tcp_disconnect(KSMBD_TRANS(t)); } return rc; - -out_error: - free_transport(t); - return rc; } /** -- 2.43.5