Re: [RFC PATCH v2 net-next 2/7] tcp: Merge tx_flags/tskey/txstamp_ack in tcp_collapse_retrans

2016-04-21 Thread Willem de Bruijn
On Tue, Apr 19, 2016 at 2:24 PM, Soheil Hassas Yeganeh wrote: > On Tue, Apr 19, 2016 at 2:18 PM, Martin KaFai Lau wrote: >> On Tue, Apr 19, 2016 at 10:35:52AM -0700, Eric Dumazet wrote: >>> On Tue, Apr 19, 2016 at 10:28 AM, Martin KaFai Lau wrote:

Re: [RFC PATCH v2 net-next 2/7] tcp: Merge tx_flags/tskey/txstamp_ack in tcp_collapse_retrans

2016-04-19 Thread Soheil Hassas Yeganeh
On Tue, Apr 19, 2016 at 2:18 PM, Martin KaFai Lau wrote: > On Tue, Apr 19, 2016 at 10:35:52AM -0700, Eric Dumazet wrote: >> On Tue, Apr 19, 2016 at 10:28 AM, Martin KaFai Lau wrote: >> >> > A bit off topic, I feel like the SKBTX_ACK_TSTAMP and txstamp_ack are sort >>

Re: [RFC PATCH v2 net-next 2/7] tcp: Merge tx_flags/tskey/txstamp_ack in tcp_collapse_retrans

2016-04-19 Thread Martin KaFai Lau
On Tue, Apr 19, 2016 at 10:35:52AM -0700, Eric Dumazet wrote: > On Tue, Apr 19, 2016 at 10:28 AM, Martin KaFai Lau wrote: > > > A bit off topic, I feel like the SKBTX_ACK_TSTAMP and txstamp_ack are sort > > of redundant but I have not look into the details yet, so not completely > >

Re: [RFC PATCH v2 net-next 2/7] tcp: Merge tx_flags/tskey/txstamp_ack in tcp_collapse_retrans

2016-04-19 Thread Soheil Hassas Yeganeh
On Tue, Apr 19, 2016 at 1:28 PM, Martin KaFai Lau wrote: > On Tue, Apr 19, 2016 at 01:32:14AM -0400, Soheil Hassas Yeganeh wrote: >> > + TCP_SKB_CB(skb)->txstamp_ack = >> > + !!(shinfo->tx_flags & SKBTX_ACK_TSTAMP); >> >> Maybe we can skip a

Re: [RFC PATCH v2 net-next 2/7] tcp: Merge tx_flags/tskey/txstamp_ack in tcp_collapse_retrans

2016-04-19 Thread Eric Dumazet
On Tue, Apr 19, 2016 at 10:28 AM, Martin KaFai Lau wrote: > A bit off topic, I feel like the SKBTX_ACK_TSTAMP and txstamp_ack are sort > of redundant but I have not look into the details yet, so not completely > sure. It wwould be a separate cleanup patch if it is the case.

Re: [RFC PATCH v2 net-next 2/7] tcp: Merge tx_flags/tskey/txstamp_ack in tcp_collapse_retrans

2016-04-19 Thread Martin KaFai Lau
On Tue, Apr 19, 2016 at 01:32:14AM -0400, Soheil Hassas Yeganeh wrote: > > + TCP_SKB_CB(skb)->txstamp_ack = > > + !!(shinfo->tx_flags & SKBTX_ACK_TSTAMP); > > Maybe we can skip a conditional jump here (because of !!), by simply > using the cached bit in

Re: [RFC PATCH v2 net-next 2/7] tcp: Merge tx_flags/tskey/txstamp_ack in tcp_collapse_retrans

2016-04-18 Thread Soheil Hassas Yeganeh
On Mon, Apr 18, 2016 at 6:46 PM, Martin KaFai Lau wrote: > If two skbs are merged/collapsed during retransmission, the current > logic does not merge the tx_flags, tskey and txstamp_ack. The end > result is the SCM_TSTAMP_ACK timestamp could be missing for a > packet that the