From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 24609194AFB; Wed, 3 Jul 2024 10:59:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720004360; cv=none; b=SV2YP9Tt9RU3QMnlvdv0hMqEIfMRg+uei5w45xCZVs71w+1CsPU57JXYeZds1u7IodohsJpjDRT/tJpcTBS0oiuGQtBmVyGLfsBibTKh9R+oVOFxGhHIDlhLhF1WPwR60oMKi+rquB8bNpCZyB8Z2+COcgQp7m3jTD/zfRam85U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720004360; c=relaxed/simple; bh=tOZv03VLaMG2lh7uDflGA0iEIUBzIfRnQXHSfLZVUhU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hs/uJWCSdGOXE87F7i08vRtfUJcdm5eVzmLXy95+vd4U6MSdZXP/dUlVxno+BgjVBWjtNEJPmLyMkX64Eeo46YkWB9ZinBZCPkNh9TltC7d2H5o/xCjzf1SwBa4AxA8My7j4UNY1zl5Tz0/EszFS+TbXW2NtVBw2VFQ5n8FxAd0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YXXiRukb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YXXiRukb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BE9EC32781; Wed, 3 Jul 2024 10:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720004360; bh=tOZv03VLaMG2lh7uDflGA0iEIUBzIfRnQXHSfLZVUhU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YXXiRukbbf9QgVyXGKt2XhCUWSvtjPw2zacSAc2dWazyh0L/Vj+qIimookQlruSZ+ 4u8xeC0C0uqdUBwHvoZo2WwgBPfwZ86cuE0oTCTKCa/rwTtBzUw/XOUCe461z6E6eQ 6TQo2cXam2hZ/EaaYIyKXQ2bTujsLzNk/4SH3ChQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jason Xing , Eric Dumazet , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 017/290] tcp: count CLOSE-WAIT sockets for TCP_MIB_CURRESTAB Date: Wed, 3 Jul 2024 12:36:38 +0200 Message-ID: <20240703102904.843126385@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240703102904.170852981@linuxfoundation.org> References: <20240703102904.170852981@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jason Xing [ Upstream commit a46d0ea5c94205f40ecf912d1bb7806a8a64704f ] According to RFC 1213, we should also take CLOSE-WAIT sockets into consideration: "tcpCurrEstab OBJECT-TYPE ... The number of TCP connections for which the current state is either ESTABLISHED or CLOSE- WAIT." After this, CurrEstab counter will display the total number of ESTABLISHED and CLOSE-WAIT sockets. The logic of counting When we increment the counter? a) if we change the state to ESTABLISHED. b) if we change the state from SYN-RECEIVED to CLOSE-WAIT. When we decrement the counter? a) if the socket leaves ESTABLISHED and will never go into CLOSE-WAIT, say, on the client side, changing from ESTABLISHED to FIN-WAIT-1. b) if the socket leaves CLOSE-WAIT, say, on the server side, changing from CLOSE-WAIT to LAST-ACK. Please note: there are two chances that old state of socket can be changed to CLOSE-WAIT in tcp_fin(). One is SYN-RECV, the other is ESTABLISHED. So we have to take care of the former case. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing Reviewed-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/tcp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 4ed0d303791a1..0a495b6edbc4b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2420,6 +2420,10 @@ void tcp_set_state(struct sock *sk, int state) if (oldstate != TCP_ESTABLISHED) TCP_INC_STATS(sock_net(sk), TCP_MIB_CURRESTAB); break; + case TCP_CLOSE_WAIT: + if (oldstate == TCP_SYN_RECV) + TCP_INC_STATS(sock_net(sk), TCP_MIB_CURRESTAB); + break; case TCP_CLOSE: if (oldstate == TCP_CLOSE_WAIT || oldstate == TCP_ESTABLISHED) @@ -2431,7 +2435,7 @@ void tcp_set_state(struct sock *sk, int state) inet_put_port(sk); fallthrough; default: - if (oldstate == TCP_ESTABLISHED) + if (oldstate == TCP_ESTABLISHED || oldstate == TCP_CLOSE_WAIT) TCP_DEC_STATS(sock_net(sk), TCP_MIB_CURRESTAB); } -- 2.43.0