From patchwork Mon Jan 23 18:59:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 718728 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3v6gcR4xd2z9t0q for ; Tue, 24 Jan 2017 06:00:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Aqc70GiO"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751442AbdAWTAV (ORCPT ); Mon, 23 Jan 2017 14:00:21 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33315 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750705AbdAWTAU (ORCPT ); Mon, 23 Jan 2017 14:00:20 -0500 Received: by mail-pf0-f196.google.com with SMTP id e4so10494315pfg.0 for ; Mon, 23 Jan 2017 11:00:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=J4DJSicxzToXH3qG9uKvabLc6pyncRclFxNkCbju5TI=; b=Aqc70GiOPffmj+a9c/MNcZIH6vMAXB+SXb34NHiU6OZ54EMFMtqzK8Lh1SgqhJsGC4 rugF1xAF86NWKaWTNitkedNgVYGYN3RINDU6SUiXhwPVMMS7zlmxmr8ESuZqzWAhuYwk OtnNbvK9Y95yUzlfVq8+5DID8258xZzwOUN/UzJwYdlVaY8Zl9mn/YFNcdpnt09YSBp+ aHnQdl2IaCWNGcbVGsvokUBeEFxa45fKB6mNEosQMEHOZdCskMgLOH4hDAq4ZEeC4d1w yjzPnb8ix2T8yyPafgt/QxhIuT2jDxydITow6fVDZ42Zif3SnMweCqlHnjFa3yoXdpkC 0YxQ== 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:in-reply-to :references; bh=J4DJSicxzToXH3qG9uKvabLc6pyncRclFxNkCbju5TI=; b=nPEMHcLSr1HyGNJ88hOJ3ZyXChlroC7oteHqgqs6BMftQyteJ6s7zkaXpGYETU1J8/ /lUKIp3AV91g22gaCBP/EHbM37FXc6WJSYbPxzFDu17ssLHl9RoaC4YfL5i5U6QeVPsh EpbpNBtkikWYkW7BF1aVY8N3n2NiK5RiLJo/bFyn3i1XUiotMUo39WbZJJKzkGvOYWY0 LaOKjqdAeGwB3pAwRwv1gseQnesVcx2EMq82NTKE2wB+nQP9zEN3yc1T7vvEbzhrJi0O r+VnQ3i51t/Mdfq2JTWcXdXP+eMwG6LlqLJAkhkoU5nbgCqyJPdVhU6mNUUd0hot/L8B arAw== X-Gm-Message-State: AIkVDXK29zoBIdpng1DZDk15hohwmk2lczpCGb9ylFWVioxG0SF3BFAyRzDRmwW45LASVw== X-Received: by 10.99.56.94 with SMTP id h30mr34650362pgn.23.1485198019684; Mon, 23 Jan 2017 11:00:19 -0800 (PST) Received: from weiwan0.mtv.corp.google.com ([100.99.140.129]) by smtp.gmail.com with ESMTPSA id 66sm38732919pfx.29.2017.01.23.11.00.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jan 2017 11:00:19 -0800 (PST) From: Wei Wang To: netdev@vger.kernel.org, David Miller Cc: Eric Dumazet , Yuchung Cheng , Wei Wang Subject: [PATCH net-next 1/3] net/tcp-fastopen: refactor cookie check logic Date: Mon, 23 Jan 2017 10:59:20 -0800 Message-Id: <20170123185922.48046-2-tracywwnj@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170123185922.48046-1-tracywwnj@gmail.com> References: <20170123185922.48046-1-tracywwnj@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Wang Refactor the cookie check logic in tcp_send_syn_data() into a function. This function will be called else where in later changes. Signed-off-by: Wei Wang Acked-by: Eric Dumazet Acked-by: Yuchung Cheng --- include/net/tcp.h | 2 ++ net/ipv4/tcp_fastopen.c | 21 +++++++++++++++++++++ net/ipv4/tcp_output.c | 16 ++-------------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index c55d65f74f7f..de67541d7adf 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1493,6 +1493,8 @@ struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb, struct tcp_fastopen_cookie *foc, struct dst_entry *dst); void tcp_fastopen_init_key_once(bool publish); +bool tcp_fastopen_cookie_check(struct sock *sk, u16 *mss, + struct tcp_fastopen_cookie *cookie); #define TCP_FASTOPEN_KEY_LENGTH 16 /* Fastopen key context */ diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c index f51919535ca7..f90e09e1ff4c 100644 --- a/net/ipv4/tcp_fastopen.c +++ b/net/ipv4/tcp_fastopen.c @@ -325,3 +325,24 @@ struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb, *foc = valid_foc; return NULL; } + +bool tcp_fastopen_cookie_check(struct sock *sk, u16 *mss, + struct tcp_fastopen_cookie *cookie) +{ + unsigned long last_syn_loss = 0; + int syn_loss = 0; + + tcp_fastopen_cache_get(sk, mss, cookie, &syn_loss, &last_syn_loss); + + /* Recurring FO SYN losses: no cookie or data in SYN */ + if (syn_loss > 1 && + time_before(jiffies, last_syn_loss + (60*HZ << syn_loss))) { + cookie->len = -1; + return false; + } + if (sysctl_tcp_fastopen & TFO_CLIENT_NO_COOKIE) { + cookie->len = -1; + return true; + } + return cookie->len > 0; +} diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 9a1a1494b9dd..671c69535671 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -3267,23 +3267,11 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn) { struct tcp_sock *tp = tcp_sk(sk); struct tcp_fastopen_request *fo = tp->fastopen_req; - int syn_loss = 0, space, err = 0; - unsigned long last_syn_loss = 0; + int space, err = 0; struct sk_buff *syn_data; tp->rx_opt.mss_clamp = tp->advmss; /* If MSS is not cached */ - tcp_fastopen_cache_get(sk, &tp->rx_opt.mss_clamp, &fo->cookie, - &syn_loss, &last_syn_loss); - /* Recurring FO SYN losses: revert to regular handshake temporarily */ - if (syn_loss > 1 && - time_before(jiffies, last_syn_loss + (60*HZ << syn_loss))) { - fo->cookie.len = -1; - goto fallback; - } - - if (sysctl_tcp_fastopen & TFO_CLIENT_NO_COOKIE) - fo->cookie.len = -1; - else if (fo->cookie.len <= 0) + if (!tcp_fastopen_cookie_check(sk, &tp->rx_opt.mss_clamp, &fo->cookie)) goto fallback; /* MSS for SYN-data is based on cached MSS and bounded by PMTU and