2019-11-08 10:11:46

by Tony Lu

Subject: [PATCH] tcp: remove redundant new line from tcp_event_sk_skb

This removes '\n' from trace event class tcp_event_sk_skb to avoid
redundant new blank line and make output compact.

Signed-off-by: Tony Lu <[email protected]>
---
include/trace/events/tcp.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h
index 2bc9960a31aa..cf97f6339acb 100644
--- a/include/trace/events/tcp.h
+++ b/include/trace/events/tcp.h
@@ -86,7 +86,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb,
sk->sk_v6_rcv_saddr, sk->sk_v6_daddr);
),

- TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c state=%s\n",
+ TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c state=%s",
__entry->sport, __entry->dport, __entry->saddr, __entry->daddr,
__entry->saddr_v6, __entry->daddr_v6,
show_tcp_state_name(__entry->state))
--
2.24.0

2019-11-08 12:23:17

by Eric Dumazet

Subject: Re: [PATCH] tcp: remove redundant new line from tcp_event_sk_skb

On 11/8/19 1:50 AM, Tony Lu wrote:
> This removes '\n' from trace event class tcp_event_sk_skb to avoid
> redundant new blank line and make output compact.
>
> Signed-off-by: Tony Lu <[email protected]>
> ---
> include/trace/events/tcp.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h
> index 2bc9960a31aa..cf97f6339acb 100644
> --- a/include/trace/events/tcp.h
> +++ b/include/trace/events/tcp.h
> @@ -86,7 +86,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb,
> sk->sk_v6_rcv_saddr, sk->sk_v6_daddr);
> ),
>
> - TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c state=%s\n",
> + TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c state=%s",
> __entry->sport, __entry->dport, __entry->saddr, __entry->daddr,
> __entry->saddr_v6, __entry->daddr_v6,
> show_tcp_state_name(__entry->state))
>

This seems good to me. Only few comments :

I would add a

Fixes: af4325ecc24f ("tcp: expose sk_state in tcp_retransmit_skb tracepoint")

And also CC (I just did in this reply) the author of the above patch to make sure nothing unexpected happens.

Thanks.

Reviewed-by: Eric Dumazet <[email protected]>

2019-11-08 12:46:52

by Yafang Shao

Subject: Re: [PATCH] tcp: remove redundant new line from tcp_event_sk_skb

On Fri, Nov 8, 2019 at 6:12 PM Tony Lu <[email protected]> wrote:
>
> This removes '\n' from trace event class tcp_event_sk_skb to avoid
> redundant new blank line and make output compact.
>
> Signed-off-by: Tony Lu <[email protected]>

Thanks for pointing this out.

Reviewed-by: Yafang Shao <[email protected]>

> ---
> include/trace/events/tcp.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h
> index 2bc9960a31aa..cf97f6339acb 100644
> --- a/include/trace/events/tcp.h
> +++ b/include/trace/events/tcp.h
> @@ -86,7 +86,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb,
> sk->sk_v6_rcv_saddr, sk->sk_v6_daddr);
> ),
>
> - TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c state=%s\n",
> + TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c state=%s",
> __entry->sport, __entry->dport, __entry->saddr, __entry->daddr,
> __entry->saddr_v6, __entry->daddr_v6,
> show_tcp_state_name(__entry->state))
> --
> 2.24.0
>

2019-11-09 10:35:44

by Tony Lu

Subject: Re: [PATCH] tcp: remove redundant new line from tcp_event_sk_skb

Thanks for your comments, I am going to append the tag.

Cheers,
Tony Lu

On Fri, Nov 08, 2019 at 04:22:19AM -0800, Eric Dumazet wrote:
>
>
> On 11/8/19 1:50 AM, Tony Lu wrote:
> > This removes '\n' from trace event class tcp_event_sk_skb to avoid
> > redundant new blank line and make output compact.
> >
> > Signed-off-by: Tony Lu <[email protected]>
> > ---
> > include/trace/events/tcp.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h
> > index 2bc9960a31aa..cf97f6339acb 100644
> > --- a/include/trace/events/tcp.h
> > +++ b/include/trace/events/tcp.h
> > @@ -86,7 +86,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb,
> > sk->sk_v6_rcv_saddr, sk->sk_v6_daddr);
> > ),
> >
> > - TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c state=%s\n",
> > + TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c state=%s",
> > __entry->sport, __entry->dport, __entry->saddr, __entry->daddr,
> > __entry->saddr_v6, __entry->daddr_v6,
> > show_tcp_state_name(__entry->state))
> >
>
> This seems good to me. Only few comments :
>
> I would add a
>
> Fixes: af4325ecc24f ("tcp: expose sk_state in tcp_retransmit_skb tracepoint")
>
> And also CC (I just did in this reply) the author of the above patch to make sure nothing unexpected happens.
>
> Thanks.
>
> Reviewed-by: Eric Dumazet <[email protected]>