diff mbox series

[net-next,v2,2/2] tcp: add more warn of socket in tcp_send_loss_probe()

Message ID 20241021155245.83122-3-kerneljasonxing@gmail.com (mailing list archive)
State New
Delegated to: Netdev Maintainers
Headers show
Series tcp: add tcp_warn_once() common helper | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next, async
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 12 this patch: 12
netdev/build_tools success Errors and warnings before: 157 (+0) this patch: 157 (+0)
netdev/cc_maintainers success CCed 5 of 5 maintainers
netdev/build_clang success Errors and warnings before: 15 this patch: 15
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 909 this patch: 909
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 25 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 3 this patch: 3
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-10-22--00-00 (tests: 765)

Commit Message

Jason Xing Oct. 21, 2024, 3:52 p.m. UTC 
From: Jason Xing <kernelxing@tencent.com>

Add two fields to print in the helper which here covers tcp_send_loss_probe().

Link: https://lore.kernel.org/all/5632e043-bdba-4d75-bc7e-bf58014492fd@redhat.com/
Suggested-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Jason Xing <kernelxing@tencent.com>
Cc: Neal Cardwell <ncardwell@google.com>
--
v2
Link:https://lore.kernel.org/all/CAL+tcoAr7RHhaZGV12wYDcPPPaubAqdxMCmy7Jujtr8b3+bY=w@mail.gmail.com/
1. use "" instead of NULL in tcp_send_loss_probe()
---
 include/net/tcp.h     | 4 +++-
 net/ipv4/tcp_output.c | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

David Ahern Oct. 21, 2024, 5:51 p.m. UTC | #1 
On 10/21/24 9:52 AM, Jason Xing wrote:
> From: Jason Xing <kernelxing@tencent.com>
> 
> Add two fields to print in the helper which here covers tcp_send_loss_probe().
> 
> Link: https://lore.kernel.org/all/5632e043-bdba-4d75-bc7e-bf58014492fd@redhat.com/
> Suggested-by: Paolo Abeni <pabeni@redhat.com>
> Signed-off-by: Jason Xing <kernelxing@tencent.com>
> Cc: Neal Cardwell <ncardwell@google.com>
> --
> v2
> Link:https://lore.kernel.org/all/CAL+tcoAr7RHhaZGV12wYDcPPPaubAqdxMCmy7Jujtr8b3+bY=w@mail.gmail.com/
> 1. use "" instead of NULL in tcp_send_loss_probe()
> ---
>  include/net/tcp.h     | 4 +++-
>  net/ipv4/tcp_output.c | 4 +---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/include/net/tcp.h b/include/net/tcp.h
> index 8b8d94bb1746..78158169e944 100644
> --- a/include/net/tcp.h
> +++ b/include/net/tcp.h
> @@ -2433,12 +2433,14 @@ void tcp_plb_update_state_upon_rto(struct sock *sk, struct tcp_plb_state *plb);
>  static inline void tcp_warn_once(const struct sock *sk, bool cond, const char *str)
>  {
>  	WARN_ONCE(cond,
> -		  "%sout:%u sacked:%u lost:%u retrans:%u tlp_high_seq:%u sk_state:%u ca_state:%u advmss:%u mss_cache:%u pmtu:%u\n",
> +		  "%scwn:%u out:%u sacked:%u lost:%u retrans:%u tlp_high_seq:%u sk_state:%u ca_state:%u mss:%u advmss:%u mss_cache:%u pmtu:%u\n",
>  		  str,
> +		  tcp_snd_cwnd(tcp_sk(sk)),
>  		  tcp_sk(sk)->packets_out, tcp_sk(sk)->sacked_out,
>  		  tcp_sk(sk)->lost_out, tcp_sk(sk)->retrans_out,
>  		  tcp_sk(sk)->tlp_high_seq, sk->sk_state,
>  		  inet_csk(sk)->icsk_ca_state,
> +		  tcp_current_mss((struct sock *)sk),
>  		  tcp_sk(sk)->advmss, tcp_sk(sk)->mss_cache,
>  		  inet_csk(sk)->icsk_pmtu_cookie);
>  }
> diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
> index 054244ce5117..36562b5fe290 100644
> --- a/net/ipv4/tcp_output.c
> +++ b/net/ipv4/tcp_output.c
> @@ -2954,9 +2954,7 @@ void tcp_send_loss_probe(struct sock *sk)
>  	}
>  	skb = skb_rb_last(&sk->tcp_rtx_queue);
>  	if (unlikely(!skb)) {
> -		WARN_ONCE(tp->packets_out,
> -			  "invalid inflight: %u state %u cwnd %u mss %d\n",
> -			  tp->packets_out, sk->sk_state, tcp_snd_cwnd(tp), mss);
> +		tcp_warn_once(sk, tp->packets_out, "");

you dropped the "invalid inflight: " string for context.

>  		smp_store_release(&inet_csk(sk)->icsk_pending, 0);
>  		return;
>  	}

Besides the nit:
Reviewed-by: David Ahern <dsahern@kernel.org>
Jason Xing Oct. 22, 2024, 12:47 a.m. UTC | #2 
On Tue, Oct 22, 2024 at 1:51 AM David Ahern <dsahern@kernel.org> wrote:
>
> On 10/21/24 9:52 AM, Jason Xing wrote:
> > From: Jason Xing <kernelxing@tencent.com>
> >
> > Add two fields to print in the helper which here covers tcp_send_loss_probe().
> >
> > Link: https://lore.kernel.org/all/5632e043-bdba-4d75-bc7e-bf58014492fd@redhat.com/
> > Suggested-by: Paolo Abeni <pabeni@redhat.com>
> > Signed-off-by: Jason Xing <kernelxing@tencent.com>
> > Cc: Neal Cardwell <ncardwell@google.com>
> > --
> > v2
> > Link:https://lore.kernel.org/all/CAL+tcoAr7RHhaZGV12wYDcPPPaubAqdxMCmy7Jujtr8b3+bY=w@mail.gmail.com/
> > 1. use "" instead of NULL in tcp_send_loss_probe()
> > ---
> >  include/net/tcp.h     | 4 +++-
> >  net/ipv4/tcp_output.c | 4 +---
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/include/net/tcp.h b/include/net/tcp.h
> > index 8b8d94bb1746..78158169e944 100644
> > --- a/include/net/tcp.h
> > +++ b/include/net/tcp.h
> > @@ -2433,12 +2433,14 @@ void tcp_plb_update_state_upon_rto(struct sock *sk, struct tcp_plb_state *plb);
> >  static inline void tcp_warn_once(const struct sock *sk, bool cond, const char *str)
> >  {
> >       WARN_ONCE(cond,
> > -               "%sout:%u sacked:%u lost:%u retrans:%u tlp_high_seq:%u sk_state:%u ca_state:%u advmss:%u mss_cache:%u pmtu:%u\n",
> > +               "%scwn:%u out:%u sacked:%u lost:%u retrans:%u tlp_high_seq:%u sk_state:%u ca_state:%u mss:%u advmss:%u mss_cache:%u pmtu:%u\n",
> >                 str,
> > +               tcp_snd_cwnd(tcp_sk(sk)),
> >                 tcp_sk(sk)->packets_out, tcp_sk(sk)->sacked_out,
> >                 tcp_sk(sk)->lost_out, tcp_sk(sk)->retrans_out,
> >                 tcp_sk(sk)->tlp_high_seq, sk->sk_state,
> >                 inet_csk(sk)->icsk_ca_state,
> > +               tcp_current_mss((struct sock *)sk),
> >                 tcp_sk(sk)->advmss, tcp_sk(sk)->mss_cache,
> >                 inet_csk(sk)->icsk_pmtu_cookie);
> >  }
> > diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
> > index 054244ce5117..36562b5fe290 100644
> > --- a/net/ipv4/tcp_output.c
> > +++ b/net/ipv4/tcp_output.c
> > @@ -2954,9 +2954,7 @@ void tcp_send_loss_probe(struct sock *sk)
> >       }
> >       skb = skb_rb_last(&sk->tcp_rtx_queue);
> >       if (unlikely(!skb)) {
> > -             WARN_ONCE(tp->packets_out,
> > -                       "invalid inflight: %u state %u cwnd %u mss %d\n",
> > -                       tp->packets_out, sk->sk_state, tcp_snd_cwnd(tp), mss);
> > +             tcp_warn_once(sk, tp->packets_out, "");
>
> you dropped the "invalid inflight: " string for context.

Well, sorry, let me add it back.

>
> >               smp_store_release(&inet_csk(sk)->icsk_pending, 0);
> >               return;
> >       }
>
> Besides the nit:
> Reviewed-by: David Ahern <dsahern@kernel.org>

Thanks.
Eric Dumazet Oct. 22, 2024, 8 a.m. UTC | #3 
On Mon, Oct 21, 2024 at 5:53 PM Jason Xing <kerneljasonxing@gmail.com> wrote:
>
> From: Jason Xing <kernelxing@tencent.com>
>
> Add two fields to print in the helper which here covers tcp_send_loss_probe().
>
> Link: https://lore.kernel.org/all/5632e043-bdba-4d75-bc7e-bf58014492fd@redhat.com/
> Suggested-by: Paolo Abeni <pabeni@redhat.com>
> Signed-off-by: Jason Xing <kernelxing@tencent.com>
> Cc: Neal Cardwell <ncardwell@google.com>
> --
> v2
> Link:https://lore.kernel.org/all/CAL+tcoAr7RHhaZGV12wYDcPPPaubAqdxMCmy7Jujtr8b3+bY=w@mail.gmail.com/
> 1. use "" instead of NULL in tcp_send_loss_probe()
> ---
>  include/net/tcp.h     | 4 +++-
>  net/ipv4/tcp_output.c | 4 +---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/net/tcp.h b/include/net/tcp.h
> index 8b8d94bb1746..78158169e944 100644
> --- a/include/net/tcp.h
> +++ b/include/net/tcp.h
> @@ -2433,12 +2433,14 @@ void tcp_plb_update_state_upon_rto(struct sock *sk, struct tcp_plb_state *plb);
>  static inline void tcp_warn_once(const struct sock *sk, bool cond, const char *str)
>  {
>         WARN_ONCE(cond,
> -                 "%sout:%u sacked:%u lost:%u retrans:%u tlp_high_seq:%u sk_state:%u ca_state:%u advmss:%u mss_cache:%u pmtu:%u\n",
> +                 "%scwn:%u out:%u sacked:%u lost:%u retrans:%u tlp_high_seq:%u sk_state:%u ca_state:%u mss:%u advmss:%u mss_cache:%u pmtu:%u\n",
>                   str,
> +                 tcp_snd_cwnd(tcp_sk(sk)),
>                   tcp_sk(sk)->packets_out, tcp_sk(sk)->sacked_out,
>                   tcp_sk(sk)->lost_out, tcp_sk(sk)->retrans_out,
>                   tcp_sk(sk)->tlp_high_seq, sk->sk_state,
>                   inet_csk(sk)->icsk_ca_state,
> +                 tcp_current_mss((struct sock *)sk),

You can not promote to non const, because tcp_current_mss() might
change socket state.

If a debug helper changes the socket state, then it is no longer a debug helper.

>                   tcp_sk(sk)->advmss, tcp_sk(sk)->mss_cache,

This was already reported btw.

>                   inet_csk(sk)->icsk_pmtu_cookie);
>  }
> diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
> index 054244ce5117..36562b5fe290 100644
> --- a/net/ipv4/tcp_output.c
> +++ b/net/ipv4/tcp_output.c
> @@ -2954,9 +2954,7 @@ void tcp_send_loss_probe(struct sock *sk)
>         }
>         skb = skb_rb_last(&sk->tcp_rtx_queue);
>         if (unlikely(!skb)) {
> -               WARN_ONCE(tp->packets_out,
> -                         "invalid inflight: %u state %u cwnd %u mss %d\n",
> -                         tp->packets_out, sk->sk_state, tcp_snd_cwnd(tp), mss);
> +               tcp_warn_once(sk, tp->packets_out, "");
>                 smp_store_release(&inet_csk(sk)->icsk_pending, 0);
>                 return;
>         }
> --
> 2.37.3
>
Jason Xing Oct. 22, 2024, 9:13 a.m. UTC | #4 
On Tue, Oct 22, 2024 at 4:00 PM Eric Dumazet <edumazet@google.com> wrote:
>
> On Mon, Oct 21, 2024 at 5:53 PM Jason Xing <kerneljasonxing@gmail.com> wrote:
> >
> > From: Jason Xing <kernelxing@tencent.com>
> >
> > Add two fields to print in the helper which here covers tcp_send_loss_probe().
> >
> > Link: https://lore.kernel.org/all/5632e043-bdba-4d75-bc7e-bf58014492fd@redhat.com/
> > Suggested-by: Paolo Abeni <pabeni@redhat.com>
> > Signed-off-by: Jason Xing <kernelxing@tencent.com>
> > Cc: Neal Cardwell <ncardwell@google.com>
> > --
> > v2
> > Link:https://lore.kernel.org/all/CAL+tcoAr7RHhaZGV12wYDcPPPaubAqdxMCmy7Jujtr8b3+bY=w@mail.gmail.com/
> > 1. use "" instead of NULL in tcp_send_loss_probe()
> > ---
> >  include/net/tcp.h     | 4 +++-
> >  net/ipv4/tcp_output.c | 4 +---
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/include/net/tcp.h b/include/net/tcp.h
> > index 8b8d94bb1746..78158169e944 100644
> > --- a/include/net/tcp.h
> > +++ b/include/net/tcp.h
> > @@ -2433,12 +2433,14 @@ void tcp_plb_update_state_upon_rto(struct sock *sk, struct tcp_plb_state *plb);
> >  static inline void tcp_warn_once(const struct sock *sk, bool cond, const char *str)
> >  {
> >         WARN_ONCE(cond,
> > -                 "%sout:%u sacked:%u lost:%u retrans:%u tlp_high_seq:%u sk_state:%u ca_state:%u advmss:%u mss_cache:%u pmtu:%u\n",
> > +                 "%scwn:%u out:%u sacked:%u lost:%u retrans:%u tlp_high_seq:%u sk_state:%u ca_state:%u mss:%u advmss:%u mss_cache:%u pmtu:%u\n",
> >                   str,
> > +                 tcp_snd_cwnd(tcp_sk(sk)),
> >                   tcp_sk(sk)->packets_out, tcp_sk(sk)->sacked_out,
> >                   tcp_sk(sk)->lost_out, tcp_sk(sk)->retrans_out,
> >                   tcp_sk(sk)->tlp_high_seq, sk->sk_state,
> >                   inet_csk(sk)->icsk_ca_state,
> > +                 tcp_current_mss((struct sock *)sk),
>
> You can not promote to non const, because tcp_current_mss() might
> change socket state.
>
> If a debug helper changes the socket state, then it is no longer a debug helper.

It does make sense. Thanks.

>
> >                   tcp_sk(sk)->advmss, tcp_sk(sk)->mss_cache,
>
> This was already reported btw.

So I'm going to remove this tcp_current_mss() line.

Thanks,
Jason
diff mbox series

Patch

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 8b8d94bb1746..78158169e944 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -2433,12 +2433,14 @@  void tcp_plb_update_state_upon_rto(struct sock *sk, struct tcp_plb_state *plb);
 static inline void tcp_warn_once(const struct sock *sk, bool cond, const char *str)
 {
 	WARN_ONCE(cond,
-		  "%sout:%u sacked:%u lost:%u retrans:%u tlp_high_seq:%u sk_state:%u ca_state:%u advmss:%u mss_cache:%u pmtu:%u\n",
+		  "%scwn:%u out:%u sacked:%u lost:%u retrans:%u tlp_high_seq:%u sk_state:%u ca_state:%u mss:%u advmss:%u mss_cache:%u pmtu:%u\n",
 		  str,
+		  tcp_snd_cwnd(tcp_sk(sk)),
 		  tcp_sk(sk)->packets_out, tcp_sk(sk)->sacked_out,
 		  tcp_sk(sk)->lost_out, tcp_sk(sk)->retrans_out,
 		  tcp_sk(sk)->tlp_high_seq, sk->sk_state,
 		  inet_csk(sk)->icsk_ca_state,
+		  tcp_current_mss((struct sock *)sk),
 		  tcp_sk(sk)->advmss, tcp_sk(sk)->mss_cache,
 		  inet_csk(sk)->icsk_pmtu_cookie);
 }
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 054244ce5117..36562b5fe290 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2954,9 +2954,7 @@  void tcp_send_loss_probe(struct sock *sk)
 	}
 	skb = skb_rb_last(&sk->tcp_rtx_queue);
 	if (unlikely(!skb)) {
-		WARN_ONCE(tp->packets_out,
-			  "invalid inflight: %u state %u cwnd %u mss %d\n",
-			  tp->packets_out, sk->sk_state, tcp_snd_cwnd(tp), mss);
+		tcp_warn_once(sk, tp->packets_out, "");
 		smp_store_release(&inet_csk(sk)->icsk_pending, 0);
 		return;
 	}