From patchwork Mon Oct 2 17:02:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 820628 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="m+rUif4o"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y5T432SlYz9t1t for ; Tue, 3 Oct 2017 04:02:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751082AbdJBRCZ (ORCPT ); Mon, 2 Oct 2017 13:02:25 -0400 Received: from mail-pg0-f53.google.com ([74.125.83.53]:45633 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751336AbdJBRCY (ORCPT ); Mon, 2 Oct 2017 13:02:24 -0400 Received: by mail-pg0-f53.google.com with SMTP id b192so198733pga.2 for ; Mon, 02 Oct 2017 10:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=bWX6ZMTyOxygahx/jaJ+XOaUdSsyBamuZyY2Kn+tyeo=; b=m+rUif4olgLVCsGXsqTl38uHQiAXJ/MnpcWA2HTKEbQiqLH0zBFgRR3ySigDaSKNpm yTdpb8ihdigsgzTVX3HFPLFjUvNS0LATKSA/JI3vMgmy0BI6PYwCQklr3M3IdhxB6zEB j4rdPgDSkRVY3BjvCRgsFOBbQsQV/JSnaxBtCzfUOORxzcun5FlGcUtpOVv/062L8XQN 6mkTChRnqDXvY2XN7G9zWUSN+ubR6SZcxPKcqCBrG24WMxYrUgCDhMzt59wg2xFJ6uVA VCvD/C6BBmtlUHLijbgLbFpGY//nx/dzWPUHAAql2YSr2jj1tb0mNk7GSIzCR2G61jte LhqA== 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=bWX6ZMTyOxygahx/jaJ+XOaUdSsyBamuZyY2Kn+tyeo=; b=uF80RV6TGVh9Km0F5JLZV7WP35YrZeCmHb5TpN/sjJyXYwk87Ogj1zY09O2HnE2rBY HfLZ094dGs25+tbenWOVaNgz2EN5JQhEr5mlX8vb4jTyzdt4xw0LGJyxqDb34/DQ/RN5 7Yf+e+sJUkcoal/g5/MBMm6jbJ96wunTDtb9ZTBIbVSjY390on/JA8zQROSzVWKoOfxZ iESgnSq/bM0zEwaE7mO9bSWBiY+OdWYbn0Smntv5z+vHQ5okne2/z9dalYhY1WcYKYyt LH9K55vftAcC/rn3wVaFK47yJrbffi1wNPsWOO977ZzLXd2Zv9A4I3QEwduY+c7cv8ck Qg3w== X-Gm-Message-State: AMCzsaUldIeONaqMFt6ETcPXtuy26UFdp8Ea683bn1oHOmSpu5jzEsbB Tb9Lup2J5lm6mj9JG7p9iKaL7g== X-Google-Smtp-Source: AOwi7QC6pRpkDbJky5ov4LUW8S8T2qPI2doSExnX5rDb7PvrY5C5RKZExB4aAuz/tpd/9JVkJXjlYA== X-Received: by 10.99.109.65 with SMTP id i62mr4142183pgc.181.1506963743771; Mon, 02 Oct 2017 10:02:23 -0700 (PDT) Received: from localhost ([2620:15c:2cb:201:3c58:8872:931c:2a33]) by smtp.gmail.com with ESMTPSA id k67sm15130213pga.46.2017.10.02.10.02.23 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 02 Oct 2017 10:02:23 -0700 (PDT) From: Wei Wang X-Google-Original-From: Wei Wang To: David Miller , netdev@vger.kernel.org Cc: Yuchung Cheng , Neal Cardwell , Eric Dumazet , Wei Wang Subject: [PATCH net-next 2/2] tcp: clean up TFO server's initial tcp_rearm_rto() call Date: Mon, 2 Oct 2017 10:02:17 -0700 Message-Id: <20171002170217.106356-1-tracywwnj@gmail.com> X-Mailer: git-send-email 2.14.2.822.g60be5d43e6-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Wang This commit does a cleanup and moves tcp_rearm_rto() call in the TFO server case into a previous spot in tcp_rcv_state_process() to make it more compact. This is only a cosmetic change. Suggested-by: Yuchung Cheng Signed-off-by: Wei Wang Acked-by: Neal Cardwell Acked-by: Yuchung Cheng Acked-by: Eric Dumazet --- net/ipv4/tcp_input.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index bd3a35f5dbf2..c5b8d61846c2 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5911,6 +5911,15 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) if (req) { inet_csk(sk)->icsk_retransmits = 0; reqsk_fastopen_remove(sk, req, false); + /* Re-arm the timer because data may have been sent out. + * This is similar to the regular data transmission case + * when new data has just been ack'ed. + * + * (TFO) - we could try to be more aggressive and + * retransmitting any data sooner based on when they + * are sent out. + */ + tcp_rearm_rto(sk); } else { tcp_init_transfer(sk, BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB); tp->copied_seq = tp->rcv_nxt; @@ -5933,18 +5942,6 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) if (tp->rx_opt.tstamp_ok) tp->advmss -= TCPOLEN_TSTAMP_ALIGNED; - if (req) { - /* Re-arm the timer because data may have been sent out. - * This is similar to the regular data transmission case - * when new data has just been ack'ed. - * - * (TFO) - we could try to be more aggressive and - * retransmitting any data sooner based on when they - * are sent out. - */ - tcp_rearm_rto(sk); - } - if (!inet_csk(sk)->icsk_ca_ops->cong_control) tcp_update_pacing_rate(sk);