Received-SPF: pass (google.com: domain of linux-kernel+bounces-174733-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Mohith Kumar Thummaluru <mohith.k.kumar.thummaluru@oracle.com>
To: Yuan Fang <yf768672249@gmail.com>,
        "edumazet@google.com"
	<edumazet@google.com>
CC: "davem@davemloft.net" <davem@davemloft.net>,
        "netdev@vger.kernel.org"
	<netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>
Subject: RE: [External] : [PATCH 1/2] tcp: fix get_tcp4_sock() output error
 info
Thread-Topic: [External] : [PATCH 1/2] tcp: fix get_tcp4_sock() output error
 info
Thread-Index: AQHaoct9vkofYpmciUWhqVxrc622UbGPJ7bw
Date: Thu, 9 May 2024 17:29:52 +0000
Message-ID: 
 <DS0PR10MB6056248B2DFFC393E31B4A1B8FE62@DS0PR10MB6056.namprd10.prod.outlook.com>
References: <20240509044323.247606-1-yf768672249@gmail.com>
In-Reply-To: <20240509044323.247606-1-yf768672249@gmail.com>
Accept-Language: en-IN, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: 
 =?us-ascii?Q?W3Bl1n8FiI4Xdhp0y35bkAp2Vaw8fhUxJG9DqVwLbpi/TwUHcJI+xyOFZ2i6?=
 =?us-ascii?Q?0Wo/Br+ZVuNWdmaedyAyrcSGMeRLfOnYyrXU0f3kannMftEy9NhblmDHZymx?=
 =?us-ascii?Q?3GiHin8vJjdZhEjzwpQvVUAZ2ky6UnXRnATTiZDu9nAKbiq5VtvdDUWwymBA?=
 =?us-ascii?Q?tcWchcVLBRiz6K1HaEThJiwqnFG4d5KrrhTbAYp0SsdKl62iPB2Gfl9d5E2W?=
 =?us-ascii?Q?FbiJcog/HtEHFfcTaPLZ7Z1wvzIWc34GfA1C7OB1Y0OVYFgcdee2+xNCLGbe?=
 =?us-ascii?Q?81yjt/HN1EKAayY3Nnsr8Q/6TRxlGFB28A1exzsUkXlAAjJ/HKkUX60FbxDy?=
 =?us-ascii?Q?9A8U7GIUTpzTCE7v8z3agmRqlpC9DEsb8L/d2ufijBUUrC6p6zIrvULEeUIR?=
 =?us-ascii?Q?316uQzK4wrOiAD6tF/xUaSowTCYS74K3Eab7sCrn+hk3jT4gRzxhxg2pkjlZ?=
 =?us-ascii?Q?UQH8NeN7c7mFo8eAcPkyYMtFtexvejjYydfLFregPMuIOs2G0sf7bKN708CO?=
 =?us-ascii?Q?Vgy4K2adi7IW8SoXPEh0MVQ7ryMihjWyEbUnnsY5HQSXR/KzdGKAFODM/vI5?=
 =?us-ascii?Q?Isqt0QqPeSrqWnrEoo22+YWStoqEsLBIcfP8CtwowjFBiN+6oZFryPRicFeZ?=
 =?us-ascii?Q?3DSN16FCoOWyfEUsEE9eY6fkSc7ZGHvvOqSF5cmaP+PkwtlX4o4Zevp4CW2a?=
 =?us-ascii?Q?bdQkWzCMFmLMRVT38dB+EbNCOIoGwcPLhnzOQorHNvdT7QFMiGDiUXZuffwL?=
 =?us-ascii?Q?EIWvAPhxbqPc3tN9zreBStrxCidlWXrzsV+3/7CJdrItK0kXswlFuIDA8969?=
 =?us-ascii?Q?KisW7K44z2xRpMxkURZ12UD+jBwvnx+tufDa2/U8S3QNdD4pmNpYNiBXSQIn?=
 =?us-ascii?Q?1gitb4hIlhYhm0UfrA+4U2FCO9k0CstPWSlGtrl4CxlQBObFa79VVkJMfbiK?=
 =?us-ascii?Q?eVUPFRimWfLp6KEnWNLM6gjc1/u7ygA+7TNslAm7XJLyZfRCx2wAnlr67JJB?=
 =?us-ascii?Q?c+qnr+i7NfdGTXKvgbVc8SW17Hn738/XiyGkYLoGWS7RSa9GJ7Oj70AOVYJi?=
 =?us-ascii?Q?bR7DfbARG9dW2J9xfgVqBti+l22VwUAdFRo11jAZSCefy7UULSm+nXy75kr0?=
 =?us-ascii?Q?eogaEiF1rHycHpL8X5+Z7P24bHYqa3u4j8+IMgT6AXRnqkWaJeGYO6cXy+1I?=
 =?us-ascii?Q?TuUHlovXJY2oUJr16JZqOCErY846nORyFtG6agjL7VlvOHmUaPL1g5jzJAfA?=
 =?us-ascii?Q?QLfELRNKGvxxZPisMU4vKT7+CzSAcKNVLLuTnFroP5ZCFAPSX7k1G4+DBy5v?=
 =?us-ascii?Q?QEvUla8lamBoJDDBi2ibWDCR8Wsa/25SPmd/YLzhehx5ULjCkPedj1TFCWdH?=
 =?us-ascii?Q?GOcllZSXWFJN9f7pwfWEdTmwh+PjIueWFmfRSYcnsxAS5bWR7BZhxPFSqI5P?=
 =?us-ascii?Q?AZ2E3A+OwI80CKmvEGeF9U9jLRoNyVBIvKkHSgxwWfB3YQebUKyPZRXCuwgo?=
 =?us-ascii?Q?6g1ArqqRap6vjGUBcCBNkJizuEgnrzWGAwSgWFxpjrwUHdy0UOY2djuo9xLE?=
 =?us-ascii?Q?stVyDLpeIHdMjMTyVsPG5h7Xs8rz4FNC6HBjFjCBVd+YgDWnhxY5ii5C76Q2?=
 =?us-ascii?Q?keD8EeFjVgRjwN59tvCFKh8=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	NBO+jrrQZMFKdEwRmABspFAmRLTyDbxKG+I95eS25eeHuHvlfoO1a54v+8MwU4kFEdmlFlOhEPHEc3qubkDy5bpBiXpgfCfT9sC3T16vR9YYIVqQCzW06D/k+wSKRmZJy80PNodq+ZEgL9vEJ1HPdJol5sfJjyscNhy2stR8idNz+V6+laIT69GFA1+vNKIzcRZZXzno384eZ9YGXZmLTNrgCR6T0sYtD/NLsAnutBTtxB+di1vU8zrvTCvZAWUj0aY6kIXgCmcZbp15YXk/aqG4V7gWAz/EDC1YHb8RoXu0cYqC2eNK5kF6gaev7i7NAUd17RhSykZnyBIAkrMw6arKNfxO85cahk/r5lNAkaPWBQCBThqSq91tKCMiusZ6loyNnkG1gTnhEGeEWFSjmd4DqFBF+7T/lGObczURoUTpWRqlMwt23CUPhdBAtIAvmq37Cys4tl0DzJ86Za8/VIPjChx0aPvyY34bOJtYp5JYsTndgzPskabRpxfYIv2Wv+gZb6pdBk04G89kRjSarVDPygNesuM12uCStONN5vuGTyqjLxfrRvG/WpBL/JGx4TIG31q3qhjmhO6U6VQGBRSEypzEzdQ9rIiijEMj1Ms=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB6056.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 23fec94f-8949-480d-923b-08dc704da295
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 May 2024 17:29:52.1933
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: o8cVistS7MfMLHRbW0B3yqvUb7p3kPHVHkL1u48fztUVjGDou9lvm9U5FVMt8QSQ2y5AQLvZn1qNNLk165u3FNh/tmBl5+DgbS1gyD3CwODvuL78cN4wxeXuzomImpmi
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5675
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-05-09_09,2024-05-09_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999
 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2405090120
X-Proofpoint-ORIG-GUID: mEOTEeRqUmwb8UdwleODRt34YiLonf1G
X-Proofpoint-GUID: mEOTEeRqUmwb8UdwleODRt34YiLonf1G

Good catch! Thanks for this fix.=20

LGTM.

Reviewed-by : Mohith Kumar Thummaluru <mohith.k.kumar.thummaluru@oracle.com=
>
Tested-by: Mohith Kumar Thummaluru <mohith.k.kumar.thummaluru@oracle.com>

Regards,
Mohith

-----Original Message-----
From: Yuan Fang <yf768672249@gmail.com>=20
Sent: 09 May 2024 10:13
To: edumazet@google.com
Cc: davem@davemloft.net; netdev@vger.kernel.org; linux-kernel@vger.kernel.o=
rg; Yuan Fang <yf768672249@gmail.com>
Subject: [External] : [PATCH 1/2] tcp: fix get_tcp4_sock() output error inf=
o

When in the TCP_LISTEN state, using netstat,the Send-Q is always 0.
Modify tx_queue to the value of sk->sk_max_ack_backlog.

Signed-off-by: Yuan Fang <yf768672249@gmail.com>
---
 net/ipv4/tcp_ipv4.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index a22ee5838751..=
70416ba902b9 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2867,7 +2867,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq=
_file *f, int i)
 	__be32 src =3D inet->inet_rcv_saddr;
 	__u16 destp =3D ntohs(inet->inet_dport);
 	__u16 srcp =3D ntohs(inet->inet_sport);
-	int rx_queue;
+	int rx_queue, tx_queue;
 	int state;
=20
 	if (icsk->icsk_pending =3D=3D ICSK_TIME_RETRANS || @@ -2887,19 +2887,22 @=
@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i)
 	}
=20
 	state =3D inet_sk_state_load(sk);
-	if (state =3D=3D TCP_LISTEN)
+	if (state =3D=3D TCP_LISTEN) {
 		rx_queue =3D READ_ONCE(sk->sk_ack_backlog);
-	else
+		tx_queue =3D READ_ONCE(sk->sk_max_ack_backlog);
+	} else {
 		/* Because we don't lock the socket,
 		 * we might find a transient negative value.
 		 */
 		rx_queue =3D max_t(int, READ_ONCE(tp->rcv_nxt) -
 				      READ_ONCE(tp->copied_seq), 0);
+		tx_queue =3D READ_ONCE(tp->write_seq) - tp->snd_una;
+	}
=20
 	seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "
 			"%08X %5u %8d %lu %d %pK %lu %lu %u %u %d",
 		i, src, srcp, dest, destp, state,
-		READ_ONCE(tp->write_seq) - tp->snd_una,
+		tx_queue,
 		rx_queue,
 		timer_active,
 		jiffies_delta_to_clock_t(timer_expires - jiffies),
--
2.45.0