From: Martin KaFai Lau <kafai@fb.com>
To: Yuchung Cheng <ycheng@google.com>
Cc: netdev <netdev@vger.kernel.org>, Kernel Team <kernel-team@fb.com>,
Chris Rapier <rapier@psc.edu>, Eric Dumazet <edumazet@google.com>,
Marcelo Ricardo Leitner <mleitner@redhat.com>,
Neal Cardwell <ncardwell@google.com>
Subject: Re: [PATCH net-next v3] tcp: Add RFC4898 tcpEStatsPerfDataSegsOut/In
Date: Wed, 9 Mar 2016 17:55:00 -0800 [thread overview]
Message-ID: <20160310015500.GA68025@kafai-mba.local> (raw)
In-Reply-To: <CAK6E8=fxc+uefYnnEb1Np7OUTNASXvYeOfJOtEeABdWOqEY_=w@mail.gmail.com>
On Wed, Mar 09, 2016 at 03:11:50PM -0800, Yuchung Cheng wrote:
> On Wed, Mar 9, 2016 at 10:43 AM, Martin KaFai Lau <kafai@fb.com> wrote:
> > diff --git a/include/net/tcp.h b/include/net/tcp.h
> > index e90db85..24557a8 100644
> > --- a/include/net/tcp.h
> > +++ b/include/net/tcp.h
> > @@ -1816,4 +1816,14 @@ static inline void skb_set_tcp_pure_ack(struct sk_buff *skb)
> > skb->truesize = 2;
> > }
> >
> > +static inline void tcp_segs_in(struct tcp_sock *tp, const struct sk_buff *skb)
> > +{
> > + u16 segs_in;
> > +
> > + segs_in = max_t(u16, 1, skb_shinfo(skb)->gso_segs);
> > + tp->segs_in += segs_in;
> > + if (skb->len > tcp_hdrlen(skb))
> > + tp->data_segs_in += segs_in;
> > +}
> > +
> > #endif /* _TCP_H */
> > diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c
> > index fdb286d..f583c85 100644
> > --- a/net/ipv4/tcp_fastopen.c
> > +++ b/net/ipv4/tcp_fastopen.c
> > @@ -131,6 +131,7 @@ static bool tcp_fastopen_cookie_gen(struct request_sock *req,
> > void tcp_fastopen_add_skb(struct sock *sk, struct sk_buff *skb)
> > {
> > struct tcp_sock *tp = tcp_sk(sk);
> > + u16 segs_in;
> >
> > if (TCP_SKB_CB(skb)->end_seq == tp->rcv_nxt)
> > return;
> > @@ -154,6 +155,9 @@ void tcp_fastopen_add_skb(struct sock *sk, struct sk_buff *skb)
> > * as we certainly are not changing upper 32bit value (0)
> > */
> > tp->bytes_received = skb->len;
> > + segs_in = max_t(u16, 1, skb_shinfo(skb)->gso_segs);
> > + tp->segs_in = segs_in;
> > + tp->data_segs_in = segs_in;
> why not use the new tcp_segs_in() helper?
It is because
segs_in has been set to 1 by tcp_create_openreq_child(), so calling
tcp_segs_in() will have it double counted
and
tcphdr has been pulled from skb, so skb->len does not include tcp_hdrlen.
I will add some remark in this change.
prev parent reply other threads:[~2016-03-10 1:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 18:43 [PATCH net-next v3] tcp: Add RFC4898 tcpEStatsPerfDataSegsOut/In Martin KaFai Lau
2016-03-09 23:11 ` Yuchung Cheng
2016-03-10 1:55 ` Martin KaFai Lau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160310015500.GA68025@kafai-mba.local \
--to=kafai@fb.com \
--cc=edumazet@google.com \
--cc=kernel-team@fb.com \
--cc=mleitner@redhat.com \
--cc=ncardwell@google.com \
--cc=netdev@vger.kernel.org \
--cc=rapier@psc.edu \
--cc=ycheng@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox