* [PATCH v4 net-next 1/2] tcp: use data length instead of skb->len in tcp_probe
@ 2018-05-29 13:35 Yafang Shao
2018-05-29 13:35 ` [PATCH v4 net-next 2/2] tcp: minor optimization around tcp_hdr() usage in tcp receive path Yafang Shao
0 siblings, 1 reply; 4+ messages in thread
From: Yafang Shao @ 2018-05-29 13:35 UTC (permalink / raw)
To: songliubraving, edumazet, davem; +Cc: netdev, linux-kernel, Yafang Shao
At this point skb->len is including tcp header length, so it is meaningless
to user. data length could be more helpful, with which we can easily filter
out the packet without payload.
Cc: Eric Dumazet <edumazet@google.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
v4: no change on this patch
v3: tcp_hdr() is a little expensive than skb->data, so replace it with
skb->data.
---
include/trace/events/tcp.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h
index c1a5284..7ff0446 100644
--- a/include/trace/events/tcp.h
+++ b/include/trace/events/tcp.h
@@ -236,7 +236,7 @@
__field(__u16, sport)
__field(__u16, dport)
__field(__u32, mark)
- __field(__u16, length)
+ __field(__u16, data_len)
__field(__u32, snd_nxt)
__field(__u32, snd_una)
__field(__u32, snd_cwnd)
@@ -250,6 +250,7 @@
TP_fast_assign(
const struct tcp_sock *tp = tcp_sk(sk);
const struct inet_sock *inet = inet_sk(sk);
+ const struct tcphdr *th = (const struct tcphdr *)skb->data;
memset(__entry->saddr, 0, sizeof(struct sockaddr_in6));
memset(__entry->daddr, 0, sizeof(struct sockaddr_in6));
@@ -261,7 +262,7 @@
__entry->dport = ntohs(inet->inet_dport);
__entry->mark = skb->mark;
- __entry->length = skb->len;
+ __entry->data_len = skb->len - __tcp_hdrlen(th);
__entry->snd_nxt = tp->snd_nxt;
__entry->snd_una = tp->snd_una;
__entry->snd_cwnd = tp->snd_cwnd;
@@ -272,9 +273,9 @@
__entry->sock_cookie = sock_gen_cookie(sk);
),
- TP_printk("src=%pISpc dest=%pISpc mark=%#x length=%d snd_nxt=%#x snd_una=%#x snd_cwnd=%u ssthresh=%u snd_wnd=%u srtt=%u rcv_wnd=%u sock_cookie=%llx",
+ TP_printk("src=%pISpc dest=%pISpc mark=%#x data_len=%d snd_nxt=%#x snd_una=%#x snd_cwnd=%u ssthresh=%u snd_wnd=%u srtt=%u rcv_wnd=%u sock_cookie=%llx",
__entry->saddr, __entry->daddr, __entry->mark,
- __entry->length, __entry->snd_nxt, __entry->snd_una,
+ __entry->data_len, __entry->snd_nxt, __entry->snd_una,
__entry->snd_cwnd, __entry->ssthresh, __entry->snd_wnd,
__entry->srtt, __entry->rcv_wnd, __entry->sock_cookie)
);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v4 net-next 2/2] tcp: minor optimization around tcp_hdr() usage in tcp receive path
2018-05-29 13:35 [PATCH v4 net-next 1/2] tcp: use data length instead of skb->len in tcp_probe Yafang Shao
@ 2018-05-29 13:35 ` Yafang Shao
2018-05-29 13:54 ` Eric Dumazet
0 siblings, 1 reply; 4+ messages in thread
From: Yafang Shao @ 2018-05-29 13:35 UTC (permalink / raw)
To: songliubraving, edumazet, davem; +Cc: netdev, linux-kernel, Yafang Shao
This is additional to the commit ea1627c20c34 ("tcp: minor optimizations around tcp_hdr() usage").
At this point, skb->data is same with tcp_hdr() as tcp header has not
been pulled yet.
Remove the third parameter of tcp_rcv_established() and put it into
the function body.
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
v4: remove the third parameter of tcp_rcv_established()
---
include/net/tcp.h | 3 +--
net/ipv4/tcp_input.c | 4 ++--
net/ipv4/tcp_ipv4.c | 2 +-
net/ipv6/tcp_ipv6.c | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 952d842..029a51b 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -334,8 +334,7 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
void tcp_delack_timer_handler(struct sock *sk);
int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg);
int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb);
-void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
- const struct tcphdr *th);
+void tcp_rcv_established(struct sock *sk, struct sk_buff *skb);
void tcp_rcv_space_adjust(struct sock *sk);
int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp);
void tcp_twsk_destructor(struct sock *sk);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1191cac..1d70dab 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -5390,11 +5390,11 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,
* the rest is checked inline. Fast processing is turned on in
* tcp_data_queue when everything is OK.
*/
-void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
- const struct tcphdr *th)
+void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)
{
unsigned int len = skb->len;
struct tcp_sock *tp = tcp_sk(sk);
+ const struct tcphdr *th = (const struct tcphdr *)skb->data;
/* TCP congestion window tracking */
trace_tcp_probe(sk, skb);
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index adbdb50..749b0ef 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1486,7 +1486,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
sk->sk_rx_dst = NULL;
}
}
- tcp_rcv_established(sk, skb, tcp_hdr(skb));
+ tcp_rcv_established(sk, skb);
return 0;
}
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 7d47c2b..8764a63 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1322,7 +1322,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
}
}
- tcp_rcv_established(sk, skb, tcp_hdr(skb));
+ tcp_rcv_established(sk, skb);
if (opt_skb)
goto ipv6_pktoptions;
return 0;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v4 net-next 2/2] tcp: minor optimization around tcp_hdr() usage in tcp receive path
2018-05-29 13:35 ` [PATCH v4 net-next 2/2] tcp: minor optimization around tcp_hdr() usage in tcp receive path Yafang Shao
@ 2018-05-29 13:54 ` Eric Dumazet
2018-05-29 14:37 ` Yafang Shao
0 siblings, 1 reply; 4+ messages in thread
From: Eric Dumazet @ 2018-05-29 13:54 UTC (permalink / raw)
To: Yafang Shao, songliubraving, edumazet, davem; +Cc: netdev, linux-kernel
On 05/29/2018 06:35 AM, Yafang Shao wrote:
> This is additional to the commit ea1627c20c34 ("tcp: minor optimizations around tcp_hdr() usage").
> At this point, skb->data is same with tcp_hdr() as tcp header has not
> been pulled yet.
> Remove the third parameter of tcp_rcv_established() and put it into
> the function body.
>
> Cc: Eric Dumazet <edumazet@google.com>
> Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
>
> ---
> v4: remove the third parameter of tcp_rcv_established()
> ---
> include/net/tcp.h | 3 +--
> net/ipv4/tcp_input.c | 4 ++--
> net/ipv4/tcp_ipv4.c | 2 +-
> net/ipv6/tcp_ipv6.c | 2 +-
> 4 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/include/net/tcp.h b/include/net/tcp.h
> index 952d842..029a51b 100644
> --- a/include/net/tcp.h
> +++ b/include/net/tcp.h
> @@ -334,8 +334,7 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
> void tcp_delack_timer_handler(struct sock *sk);
> int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg);
> int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb);
> -void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
> - const struct tcphdr *th);
> +void tcp_rcv_established(struct sock *sk, struct sk_buff *skb);
> void tcp_rcv_space_adjust(struct sock *sk);
> int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp);
> void tcp_twsk_destructor(struct sock *sk);
> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
> index 1191cac..1d70dab 100644
> --- a/net/ipv4/tcp_input.c
> +++ b/net/ipv4/tcp_input.c
> @@ -5390,11 +5390,11 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,
> * the rest is checked inline. Fast processing is turned on in
> * tcp_data_queue when everything is OK.
> */
> -void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
> - const struct tcphdr *th)
> +void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)
> {
> unsigned int len = skb->len;
> struct tcp_sock *tp = tcp_sk(sk);
> + const struct tcphdr *th = (const struct tcphdr *)skb->data;
>
>
Please reorder list to get a reverse christmas tree.
const struct tcphdr *th = (const struct tcphdr *)skb->data;
struct tcp_sock *tp = tcp_sk(sk);
unsigned int len = skb->len;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v4 net-next 2/2] tcp: minor optimization around tcp_hdr() usage in tcp receive path
2018-05-29 13:54 ` Eric Dumazet
@ 2018-05-29 14:37 ` Yafang Shao
0 siblings, 0 replies; 4+ messages in thread
From: Yafang Shao @ 2018-05-29 14:37 UTC (permalink / raw)
To: Eric Dumazet; +Cc: Song Liu, Eric Dumazet, David Miller, netdev, LKML
On Tue, May 29, 2018 at 9:54 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
>
>
> On 05/29/2018 06:35 AM, Yafang Shao wrote:
>> This is additional to the commit ea1627c20c34 ("tcp: minor optimizations around tcp_hdr() usage").
>> At this point, skb->data is same with tcp_hdr() as tcp header has not
>> been pulled yet.
>> Remove the third parameter of tcp_rcv_established() and put it into
>> the function body.
>>
>> Cc: Eric Dumazet <edumazet@google.com>
>> Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
>>
>> ---
>> v4: remove the third parameter of tcp_rcv_established()
>> ---
>> include/net/tcp.h | 3 +--
>> net/ipv4/tcp_input.c | 4 ++--
>> net/ipv4/tcp_ipv4.c | 2 +-
>> net/ipv6/tcp_ipv6.c | 2 +-
>> 4 files changed, 5 insertions(+), 6 deletions(-)
>>
>> diff --git a/include/net/tcp.h b/include/net/tcp.h
>> index 952d842..029a51b 100644
>> --- a/include/net/tcp.h
>> +++ b/include/net/tcp.h
>> @@ -334,8 +334,7 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
>> void tcp_delack_timer_handler(struct sock *sk);
>> int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg);
>> int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb);
>> -void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
>> - const struct tcphdr *th);
>> +void tcp_rcv_established(struct sock *sk, struct sk_buff *skb);
>> void tcp_rcv_space_adjust(struct sock *sk);
>> int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp);
>> void tcp_twsk_destructor(struct sock *sk);
>> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
>> index 1191cac..1d70dab 100644
>> --- a/net/ipv4/tcp_input.c
>> +++ b/net/ipv4/tcp_input.c
>> @@ -5390,11 +5390,11 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,
>> * the rest is checked inline. Fast processing is turned on in
>> * tcp_data_queue when everything is OK.
>> */
>> -void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
>> - const struct tcphdr *th)
>> +void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)
>> {
>> unsigned int len = skb->len;
>> struct tcp_sock *tp = tcp_sk(sk);
>> + const struct tcphdr *th = (const struct tcphdr *)skb->data;
>>
>>
>
> Please reorder list to get a reverse christmas tree.
>
Got it :)
> const struct tcphdr *th = (const struct tcphdr *)skb->data;
> struct tcp_sock *tp = tcp_sk(sk);
> unsigned int len = skb->len;
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-29 14:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-29 13:35 [PATCH v4 net-next 1/2] tcp: use data length instead of skb->len in tcp_probe Yafang Shao
2018-05-29 13:35 ` [PATCH v4 net-next 2/2] tcp: minor optimization around tcp_hdr() usage in tcp receive path Yafang Shao
2018-05-29 13:54 ` Eric Dumazet
2018-05-29 14:37 ` Yafang Shao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).