From patchwork Tue May 29 15:27:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 922181 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aGisFqHf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40wHgq1lzqz9s08 for ; Wed, 30 May 2018 01:28:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935660AbeE2P1z (ORCPT ); Tue, 29 May 2018 11:27:55 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:41084 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935613AbeE2P1w (ORCPT ); Tue, 29 May 2018 11:27:52 -0400 Received: by mail-pl0-f66.google.com with SMTP id az12-v6so9154589plb.8; Tue, 29 May 2018 08:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=fgfJhtbTboHYoN3LUwcOrgwfjedf228zUTVUBOkh+xI=; b=aGisFqHf3hM+AdMYkqpKyXVRoKGu7J8PbApAMoWtlitplr1IC7ut/M2R3/DxPfJhQK bqMntLsIBSvSUaFmE2v5+C/dsUvQoiDeBbplfGOKqB4yT3k4Ydi+UNNV9JRT7JnYNu6a CsQudkP0ihfviYn/KkbRILcrlTkIoZPt2KwFyr0+F4cgMk+1qoRUUULUfSxAobpU+pBa GgjdG9mT5zWpaR0RkbaspPQKqnXAqIpmRIkp2lKQH8A7q7zQbImzi5Q7mJGtC1mf1ZkZ JXA8KCTBI9KoqWQenCJ0EG7PFtNPMKnqAa/YaR5FHEUOsciPmzESsG3tXtQPKlWuvimf JjNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fgfJhtbTboHYoN3LUwcOrgwfjedf228zUTVUBOkh+xI=; b=ZrF+22XDdyhF9lhew1ZtPnYUekIJyOZUwrD92aI7VrMjgwjbDnh6LLIMw92vP+qD5c Am7fxLPpRbVQ4C7rq5xl3t/otlX9+HzWdKunKnIUitLgK5djBdjGMgQ/EZ4tRAXIrl3v XNDFHiIIDBkO2Ucf0b+MEvdOrcTSbIj1VGVS0Wkg/jg7Mr4HpR6fK5OehUXHvYck6BFN qwiAVTgh9ntKA/G2tggRrTH48GsKQ97IL0BR6cnrfE56GqgR6cc/oJ0sAaGsN9SUO48c I5gu23LZbf7DOXD+6hyJgYtj5LRgAM8mkcIdAT4UQEvbHIHz0UhRAR/q2cmgtnaBN0f5 SGyQ== X-Gm-Message-State: ALKqPwdF+xYeVr/HZlOyFIc38oVh6g8xojB8lB2k7aets1qQTLnZZp3s ZGaGrhSEDW/Ns7z5CoMxZ18= X-Google-Smtp-Source: AB8JxZqB6iTFCi1dV1v9pAuzTv9/nF9NR/VLsCa+BdFynH9/Ao+UtfcOjnBxdbGfpKVD/hsjEJBpmw== X-Received: by 2002:a17:902:24e:: with SMTP id 72-v6mr17736481plc.87.1527607671545; Tue, 29 May 2018 08:27:51 -0700 (PDT) Received: from li1588-6.members.linode.com (li1588-6.members.linode.com. [139.162.104.6]) by smtp.gmail.com with ESMTPSA id 5-v6sm61132169pfx.140.2018.05.29.08.27.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 May 2018 08:27:50 -0700 (PDT) From: Yafang Shao To: edumazet@google.com, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH net-next] tcp: minor optimization around tcp_hdr() usage in receive path Date: Tue, 29 May 2018 23:27:31 +0800 Message-Id: <1527607651-28262-1-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. So use the less expensive one to get the tcp header. Remove the third parameter of tcp_rcv_established() and put it into the function body. Furthermore, the local variables are listed as a reverse christmas tree :) Cc: Eric Dumazet Signed-off-by: Yafang Shao --- include/net/tcp.h | 3 +-- include/trace/events/tcp.h | 5 +++-- net/ipv4/tcp_input.c | 6 +++--- net/ipv4/tcp_ipv4.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- 5 files changed, 9 insertions(+), 9 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/include/trace/events/tcp.h b/include/trace/events/tcp.h index 703abb6..ac55b32 100644 --- a/include/trace/events/tcp.h +++ b/include/trace/events/tcp.h @@ -248,8 +248,9 @@ ), TP_fast_assign( - const struct tcp_sock *tp = tcp_sk(sk); + const struct tcphdr *th = (const struct tcphdr *)skb->data; const struct inet_sock *inet = inet_sk(sk); + const struct tcp_sock *tp = tcp_sk(sk); 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->data_len = skb->len - tcp_hdrlen(skb); + __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; diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 1191cac..d5ffb57 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; + const struct tcphdr *th = (const struct tcphdr *)skb->data; struct tcp_sock *tp = tcp_sk(sk); + unsigned int len = skb->len; /* 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;