Re: [PATCH net-next] inet_diag: report delayed ack timer information

[David Ahern <dsahern@kernel.org>]

On 3/4/26 2:43 AM, Eric Dumazet wrote:
> inet_sk_diag_fill() populates r->idiag_timer with the following
> precedence order:
> 
> 1 - Retransmit timer.
> 4 - Probe0 timer.
> 2 - Keepalive timer.
> 
> This patch adds a new value, last in the list, if other timers
> are not active.
> 
> 5 - Delayed ACK timer.
> 
> A corresponding iproute2 patch is needed to replace "unknown"
> with "delack":

...

> diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
> index 9d215485b5c7e7ba29dd53c924f0245439d74af5..e4cb18061aefcc22df04644c00bf5c7db4e150d2 100644
> --- a/net/ipv4/inet_diag.c
> +++ b/net/ipv4/inet_diag.c
> @@ -298,6 +298,10 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
>  		r->idiag_retrans = READ_ONCE(icsk->icsk_probes_out);
>  		r->idiag_expires =
>  			jiffies_delta_to_msecs(icsk->icsk_keepalive_timer.expires - jiffies);
> +	} else if (timer_pending(&icsk->icsk_delack_timer)) {
> +		r->idiag_timer = 5;

How come the idiag_timer values an enum in
include/uapi/linux/inet_diag.h since this is a uapi?

> +		r->idiag_expires =
> +			jiffies_delta_to_msecs(icsk_delack_timeout(icsk) - jiffies);
>  	}
>  
>  	if ((ext & (1 << (INET_DIAG_INFO - 1))) && handler->idiag_info_size) {