[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID:
<DS0PR10MB60561686BF54FB94E98AFCC38FE62@DS0PR10MB6056.namprd10.prod.outlook.com>
Date: Thu, 9 May 2024 17:31:14 +0000
From: Mohith Kumar Thummaluru <mohith.k.kumar.thummaluru@...cle.com>
To: Yuan Fang <yf768672249@...il.com>,
"edumazet@...gle.com"
<edumazet@...gle.com>
CC: "davem@...emloft.net" <davem@...emloft.net>,
"netdev@...r.kernel.org"
<netdev@...r.kernel.org>,
"linux-kernel@...r.kernel.org"
<linux-kernel@...r.kernel.org>
Subject: RE: [External] : [PATCH 2/2] tcp/ipv6: fix get_tcp6_sock() output
error info
LGTM.
Reviewed-by : Mohith Kumar Thummaluru <mohith.k.kumar.thummaluru@...cle.com>
-----Original Message-----
From: Yuan Fang <yf768672249@...il.com>
Sent: 09 May 2024 10:13
To: edumazet@...gle.com
Cc: davem@...emloft.net; netdev@...r.kernel.org; linux-kernel@...r.kernel.org; Yuan Fang <yf768672249@...il.com>
Subject: [External] : [PATCH 2/2] tcp/ipv6: fix get_tcp6_sock() output error info
Using the netstat command, the Send-Q is always 0 in TCP_LISTEN.
Modify tx_queue to the value of sk->sk_max_ack_backlog.
Signed-off-by: Yuan Fang <yf768672249@...il.com>
---
net/ipv6/tcp_ipv6.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 3f4cba49e9ee..07ea1be13151 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2177,7 +2177,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
const struct tcp_sock *tp = tcp_sk(sp);
const struct inet_connection_sock *icsk = inet_csk(sp);
const struct fastopen_queue *fastopenq = &icsk->icsk_accept_queue.fastopenq;
- int rx_queue;
+ int rx_queue, tx_queue;
int state;
dest = &sp->sk_v6_daddr;
@@ -2202,14 +2202,17 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
}
state = inet_sk_state_load(sp);
- if (state == TCP_LISTEN)
+ if (state == TCP_LISTEN) {
rx_queue = READ_ONCE(sp->sk_ack_backlog);
- else
+ tx_queue = READ_ONCE(sp->sk_max_ack_backlog);
+ } else {
/* Because we don't lock the socket,
* we might find a transient negative value.
*/
rx_queue = max_t(int, READ_ONCE(tp->rcv_nxt) -
READ_ONCE(tp->copied_seq), 0);
+ tx_queue = READ_ONCE(tp->write_seq) - tp->snd_una;
+ }
seq_printf(seq,
"%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
@@ -2220,7 +2223,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
dest->s6_addr32[0], dest->s6_addr32[1],
dest->s6_addr32[2], dest->s6_addr32[3], 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
Powered by blists - more mailing lists