From patchwork Sat Jun 27 04:05:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousuk Seung X-Patchwork-Id: 1318206 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=RVy7UnNm; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49v0Y22n5Gz9sRW for ; Sat, 27 Jun 2020 14:05:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725922AbgF0EFz (ORCPT ); Sat, 27 Jun 2020 00:05:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725468AbgF0EFz (ORCPT ); Sat, 27 Jun 2020 00:05:55 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D146C03E979 for ; Fri, 26 Jun 2020 21:05:55 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id p22so11972281ybg.21 for ; Fri, 26 Jun 2020 21:05:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=jt6WhDQvdEkiFGmjrJwz7Q0ln/RzE8kaKuWwCPnVjbs=; b=RVy7UnNmWWbzdyhzTkaGAunulE0TvtC4UG7u3KGWCWj7ejNb1Qu3O8GKMZKt7NT4tq EJjWJ7SGwoXyg9Qpl2mJD9NydOhrl8bOwk6LoRb6Df6adimz/FMsmypTLvVxaWi+6DmF sgt10wp2Df5piuVx1yuxSOW8S6PPuhZ0iYc7KQIUOekIL9CedB1TbYolqOiH42hzTBtd F5RAO+vlnjEmCT/CP4HUd/cK3q4cevADhAEkShIg1m/yU9DlTeQBDqTn0OQ/CoFrlW0l wYiP2P3NYWNiZGKo6PvZhc/sCNBIjye/IvosQVm590Qt49FODFEExyIdoapoQ31MJnHJ wKQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=jt6WhDQvdEkiFGmjrJwz7Q0ln/RzE8kaKuWwCPnVjbs=; b=m1eFn7DKZF2ymi0ruykmt2zaHn7G+SzqKW0AzMDpgppXiZ4xkz01RZtV8lyP6LCpWh XM8SHacXzczMRtV0tGxdQdsadBFYJCPxfzx/YG53gc5dPkNkgl8//RvH3RSpWs0G66fC NI9xSLw7lThlCpd9U0iMI0gNKTMlvGAKnBLm7O35UDhLzmixGrC5AXk1atknOgefJhKu mVsxsUQsxsYOxA5KT3GxMHjl3ufguKe7MZBSuBNMQna6WY6vTiwaz4ZgQ83rIAJYzHs4 IDVRVPFRcs89JiwNepfHu5Em48Y9G6MBbQSi78xHLRV38Vw961bXbc6pPH51Q2W7mz5o zwfg== X-Gm-Message-State: AOAM533eIoPPmoel3ov8jm82WzCg+smHWB2aiXCyP6Lm2LT5XEA+C9q0 hPl31PngSWAy1wHe+kfrm53sGgm47IJG X-Google-Smtp-Source: ABdhPJyRKNDpg1p3F46PwWLWaJxm5EuzlfDpr8MrFO4bTK1BqzF04SQcLSnh8Hdg6lOeq+QotRr+LcYyu4Kz X-Received: by 2002:a25:aaeb:: with SMTP id t98mr10481195ybi.295.1593230754446; Fri, 26 Jun 2020 21:05:54 -0700 (PDT) Date: Fri, 26 Jun 2020 21:05:32 -0700 In-Reply-To: <20200627040535.858564-1-ysseung@google.com> Message-Id: <20200627040535.858564-2-ysseung@google.com> Mime-Version: 1.0 References: <20200627040535.858564-1-ysseung@google.com> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog Subject: [PATCH net-next 1/4] tcp: stamp SCM_TSTAMP_ACK later in tcp_clean_rtx_queue() From: Yousuk Seung To: David Miller Cc: netdev@vger.kernel.org, Yousuk Seung , Yuchung Cheng , Eric Dumazet , Neal Cardwell , Soheil Hassas Yeganeh Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently tp->delivered is updated with sacked packets but not cumulatively acked when SCP_TSTAMP_ACK is timestamped. This patch moves a tcp_ack_tstamp() call in tcp_clean_rtx_queue() to later in the loop so that when a skb is fully acked OPT_STATS of SCM_TSTAMP_ACK will include the current skb in the delivered count. When not fully acked tcp_ack_tstamp() is a no-op and there is no change in behavior. Signed-off-by: Yousuk Seung Signed-off-by: Yuchung Cheng Acked-by: Eric Dumazet Acked-by: Neal Cardwell Acked-by: Soheil Hassas Yeganeh --- net/ipv4/tcp_input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index f3a0eb139b76..2a683e785cca 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3078,8 +3078,6 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack, u8 sacked = scb->sacked; u32 acked_pcount; - tcp_ack_tstamp(sk, skb, prior_snd_una); - /* Determine how many packets and what bytes were acked, tso and else */ if (after(scb->end_seq, tp->snd_una)) { if (tcp_skb_pcount(skb) == 1 || @@ -3143,6 +3141,8 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack, if (!fully_acked) break; + tcp_ack_tstamp(sk, skb, prior_snd_una); + next = skb_rb_next(skb); if (unlikely(skb == tp->retransmit_skb_hint)) tp->retransmit_skb_hint = NULL; From patchwork Sat Jun 27 04:05:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousuk Seung X-Patchwork-Id: 1318207 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=AaCwP2Fb; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49v0Y45jvJz9sRW for ; Sat, 27 Jun 2020 14:06:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725936AbgF0EF7 (ORCPT ); Sat, 27 Jun 2020 00:05:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725468AbgF0EF6 (ORCPT ); Sat, 27 Jun 2020 00:05:58 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AB39C03E979 for ; Fri, 26 Jun 2020 21:05:58 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id i62so8082536qkd.18 for ; Fri, 26 Jun 2020 21:05:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=0TyWh/BFeGzVeogO4Ds2cc5UCIjRSTHn5xRKvnkGpGA=; b=AaCwP2FbvNbi3KJM1W2RMYxXZ7wDb4n+2i3X5sfsxamcfgQM2kWlsN+QPqW1dQ5RB+ F2bSnlUfwwf5k5TO36LsTszw2/STHTPzJJ/EVqk8SGKxUWHAmzVdIq5PCPTnfT6G7d4h v5PXwy29tG9uiZ3y6MWEqcGJUOZAhf6FyOvfPL7LqXmdsZgVt4kMCxc0JmceaFN8gZet zay5130geWl6WLoBdaYVYF7imjoOTRnXwCdvgQ+L3X6LDv8p2EAagM66FDVtH1cgO72i O6gkEeqs4jO26p0thJu9hs/srdsVtMTyycyA9rtrotydC09wKrzvqRipkvHFYNCZpSVn RqrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=0TyWh/BFeGzVeogO4Ds2cc5UCIjRSTHn5xRKvnkGpGA=; b=SMhN39lKHG9npUKmZvCRq4ZIZLVqJ+Bc2tC8FzfRqxfVfXCNw7UCl6NELU/y9bxPK7 uthdU4LDgBY7+SWk7p10nrfDSVYsXeHJvwYpPeOVXt43bKU3DvcZ5NTiAChIwQ/3b0IW an1H9iaCpphhdGYLZcev3rQA5o/up/E3Ics76eoj4jqgnpQZYL5MOPLi9+jgtDkL1kPo svgETTXmnhoHleNBdnfjA5NK4am4MgE1Hk0dE5ihwBmjcprJ106p6N/4gx1dhXR8ldxM tyHkfBxmxVoiYdH8i7XmriBQm54KoZW5bmoxQeNYurb6Zz6SQetIqiqHsFjlZkNcirYl DoeA== X-Gm-Message-State: AOAM530OPYRMT35tqZtrOF0nF3WScHOlRjNIL2MM62IB4AL3TaW7215d X58KH5f1Xek3UauDLLvrZS+EMgEcEE9O X-Google-Smtp-Source: ABdhPJycGOVDW7TUFCE2AVb6Py4MnPeg6PCi4SoJLx4Wz5Bkx56sPSr5fopufOGOfwXfyr1kOZfK+oCk3kKF X-Received: by 2002:a0c:f691:: with SMTP id p17mr6321862qvn.157.1593230757327; Fri, 26 Jun 2020 21:05:57 -0700 (PDT) Date: Fri, 26 Jun 2020 21:05:33 -0700 In-Reply-To: <20200627040535.858564-1-ysseung@google.com> Message-Id: <20200627040535.858564-3-ysseung@google.com> Mime-Version: 1.0 References: <20200627040535.858564-1-ysseung@google.com> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog Subject: [PATCH net-next 2/4] tcp: add ece_ack flag to reno sack functions From: Yousuk Seung To: David Miller Cc: netdev@vger.kernel.org, Yousuk Seung , Yuchung Cheng , Eric Dumazet , Neal Cardwell , Soheil Hassas Yeganeh Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Pass a boolean flag that tells the ECE state of the current ack to reno sack functions. This is pure refactor for future patches to improve tracking delivered counts. Signed-off-by: Yousuk Seung Signed-off-by: Yuchung Cheng Acked-by: Eric Dumazet Acked-by: Neal Cardwell Acked-by: Soheil Hassas Yeganeh --- net/ipv4/tcp_input.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 2a683e785cca..09bed29e3ef4 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1893,7 +1893,7 @@ static void tcp_check_reno_reordering(struct sock *sk, const int addend) /* Emulate SACKs for SACKless connection: account for a new dupack. */ -static void tcp_add_reno_sack(struct sock *sk, int num_dupack) +static void tcp_add_reno_sack(struct sock *sk, int num_dupack, bool ece_ack) { if (num_dupack) { struct tcp_sock *tp = tcp_sk(sk); @@ -1911,7 +1911,7 @@ static void tcp_add_reno_sack(struct sock *sk, int num_dupack) /* Account for ACK, ACKing some data in Reno Recovery phase. */ -static void tcp_remove_reno_sacks(struct sock *sk, int acked) +static void tcp_remove_reno_sacks(struct sock *sk, int acked, bool ece_ack) { struct tcp_sock *tp = tcp_sk(sk); @@ -2697,7 +2697,7 @@ static void tcp_process_loss(struct sock *sk, int flag, int num_dupack, * delivered. Lower inflight to clock out (re)tranmissions. */ if (after(tp->snd_nxt, tp->high_seq) && num_dupack) - tcp_add_reno_sack(sk, num_dupack); + tcp_add_reno_sack(sk, num_dupack, flag & FLAG_ECE); else if (flag & FLAG_SND_UNA_ADVANCED) tcp_reset_reno_sack(tp); } @@ -2779,6 +2779,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una, struct inet_connection_sock *icsk = inet_csk(sk); struct tcp_sock *tp = tcp_sk(sk); int fast_rexmit = 0, flag = *ack_flag; + bool ece_ack = flag & FLAG_ECE; bool do_lost = num_dupack || ((flag & FLAG_DATA_SACKED) && tcp_force_fast_retransmit(sk)); @@ -2787,7 +2788,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una, /* Now state machine starts. * A. ECE, hence prohibit cwnd undoing, the reduction is required. */ - if (flag & FLAG_ECE) + if (ece_ack) tp->prior_ssthresh = 0; /* B. In all the states check for reneging SACKs. */ @@ -2828,7 +2829,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una, case TCP_CA_Recovery: if (!(flag & FLAG_SND_UNA_ADVANCED)) { if (tcp_is_reno(tp)) - tcp_add_reno_sack(sk, num_dupack); + tcp_add_reno_sack(sk, num_dupack, ece_ack); } else { if (tcp_try_undo_partial(sk, prior_snd_una)) return; @@ -2853,7 +2854,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una, if (tcp_is_reno(tp)) { if (flag & FLAG_SND_UNA_ADVANCED) tcp_reset_reno_sack(tp); - tcp_add_reno_sack(sk, num_dupack); + tcp_add_reno_sack(sk, num_dupack, ece_ack); } if (icsk->icsk_ca_state <= TCP_CA_Disorder) @@ -2877,7 +2878,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una, } /* Otherwise enter Recovery state */ - tcp_enter_recovery(sk, (flag & FLAG_ECE)); + tcp_enter_recovery(sk, ece_ack); fast_rexmit = 1; } @@ -3053,7 +3054,7 @@ static void tcp_ack_tstamp(struct sock *sk, struct sk_buff *skb, */ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack, u32 prior_snd_una, - struct tcp_sacktag_state *sack) + struct tcp_sacktag_state *sack, bool ece_ack) { const struct inet_connection_sock *icsk = inet_csk(sk); u64 first_ackt, last_ackt; @@ -3191,7 +3192,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack, } if (tcp_is_reno(tp)) { - tcp_remove_reno_sacks(sk, pkts_acked); + tcp_remove_reno_sacks(sk, pkts_acked, ece_ack); /* If any of the cumulatively ACKed segments was * retransmitted, non-SACK case cannot confirm that @@ -3685,7 +3686,8 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) goto no_queue; /* See if we can take anything off of the retransmit queue. */ - flag |= tcp_clean_rtx_queue(sk, prior_fack, prior_snd_una, &sack_state); + flag |= tcp_clean_rtx_queue(sk, prior_fack, prior_snd_una, &sack_state, + flag & FLAG_ECE); tcp_rack_update_reo_wnd(sk, &rs); From patchwork Sat Jun 27 04:05:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousuk Seung X-Patchwork-Id: 1318208 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=vyz7w2yf; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49v0Y803qSz9sRW for ; Sat, 27 Jun 2020 14:06:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725958AbgF0EGC (ORCPT ); Sat, 27 Jun 2020 00:06:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725468AbgF0EGA (ORCPT ); Sat, 27 Jun 2020 00:06:00 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C473FC03E979 for ; Fri, 26 Jun 2020 21:05:59 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id b14so5518728ybq.3 for ; Fri, 26 Jun 2020 21:05:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=SIMon8ym3NGiIuenBYzlB8XmYzXAJxZpMpE2/6caaCE=; b=vyz7w2yfwCIfJyFBU5B/5GxmP5XG2dt8GMNRoKpCPlqmrHSnUiMigjI147tWVar2rR 78K9lmQPF1UrIcXHEHCL8uPjU4WQQpC4Bo5T4Rw7z7OLtDRJBMBwe7MucZmdAOfqgrow qmVjgdDXumwzND/JDhYEiHjtdPxf98w42RrRyp/WiYgyTY6HBdAzQRGxUTEOSVWW9fUz mDiPHBAxi+zmm54gJ4Fuuvugnz4y39ZcC+/SB7jJ7bIkeKUl4wz/63EAkQudq1eF+JXt knmLdh4ICnpxxHvP54OzNHmM0/jD2dQcqDiOmg0ZJJjN4yfrbBvf0G0HARPRB4Vr9O5/ jcQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=SIMon8ym3NGiIuenBYzlB8XmYzXAJxZpMpE2/6caaCE=; b=VKguL15kN9695RAWCL5hYTvEguEXj5Ozhzk6gKgsyOZY/faJ6xicmDXAX9gL1WD/If o9am3Av5zPgkhCohYQrzeptvkYd0zo/HOqRSMoimKJI9TJT5a5Kv9/3sFKCuOv+jgM67 s12JMJieQTux0QIEG4xyWtzJEqL97F/SxN59YpkvB2BFUEpHEaCtqxEyv7LRj3gJ0Vqw 5qd0rhthWlPwIlbyjBf7ELpTbKeSvk6RRpPXljRY0QkCFGjcMqdotxHegUTciH8OCq4T noQt9ZiTx29XPQ8RrnPgZ/iZeULETkeF7q8WvKdkW1+v2tQbfs/jV4L/iu9tVPNt+INh qHYw== X-Gm-Message-State: AOAM533Szg8jIJ+nWvAZxjzhS5s9kJKlNqU3NhbGviTSZqJHNFTUmAVC VWZDfqhU7bUK3dLsAjZemeqOmrZC7QEj X-Google-Smtp-Source: ABdhPJwZNkYCP5Ey9tlB4N2xw/8k5bu8ypDpb9OCdhbZg//tkIGRxSnsgdbw01FHmmQVgqJvGg9915MW2HqZ X-Received: by 2002:a25:5d5:: with SMTP id 204mr9652931ybf.24.1593230759061; Fri, 26 Jun 2020 21:05:59 -0700 (PDT) Date: Fri, 26 Jun 2020 21:05:34 -0700 In-Reply-To: <20200627040535.858564-1-ysseung@google.com> Message-Id: <20200627040535.858564-4-ysseung@google.com> Mime-Version: 1.0 References: <20200627040535.858564-1-ysseung@google.com> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog Subject: [PATCH net-next 3/4] tcp: count sacked packets in tcp_sacktag_state From: Yousuk Seung To: David Miller Cc: netdev@vger.kernel.org, Yousuk Seung , Yuchung Cheng , Eric Dumazet , Neal Cardwell , Soheil Hassas Yeganeh Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add sack_delivered to tcp_sacktag_state and count the number of sacked and dsacked packets. This is pure refactor for future patches to improve tracking delivered counts. Signed-off-by: Yousuk Seung Signed-off-by: Yuchung Cheng Acked-by: Eric Dumazet Acked-by: Neal Cardwell Acked-by: Soheil Hassas Yeganeh --- net/ipv4/tcp_input.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 09bed29e3ef4..db61ea597e39 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1138,6 +1138,7 @@ struct tcp_sacktag_state { struct rate_sample *rate; int flag; unsigned int mss_now; + u32 sack_delivered; }; /* Check if skb is fully within the SACK block. In presence of GSO skbs, @@ -1259,6 +1260,7 @@ static u8 tcp_sacktag_one(struct sock *sk, state->flag |= FLAG_DATA_SACKED; tp->sacked_out += pcount; tp->delivered += pcount; /* Out-of-order packets delivered */ + state->sack_delivered += pcount; /* Lost marker hint past SACKed? Tweak RFC3517 cnt */ if (tp->lost_skb_hint && @@ -1685,6 +1687,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb, if (found_dup_sack) { state->flag |= FLAG_DSACKING_ACK; tp->delivered++; /* A spurious retransmission is delivered */ + state->sack_delivered++; } /* Eliminate too old ACKs, but take into @@ -3586,6 +3589,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) sack_state.first_sackt = 0; sack_state.rate = &rs; + sack_state.sack_delivered = 0; /* We very likely will need to access rtx queue. */ prefetch(sk->tcp_rtx_queue.rb_node); From patchwork Sat Jun 27 04:05:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousuk Seung X-Patchwork-Id: 1318209 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=onh2GWLY; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49v0YB57MSz9sRW for ; Sat, 27 Jun 2020 14:06:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725975AbgF0EGE (ORCPT ); Sat, 27 Jun 2020 00:06:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725950AbgF0EGB (ORCPT ); Sat, 27 Jun 2020 00:06:01 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F2CBC03E979 for ; Fri, 26 Jun 2020 21:06:01 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id e82so12012952ybh.12 for ; Fri, 26 Jun 2020 21:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=2e2unW1qDyqvth7RC+EnWk87g6+5SgUhOPF73R4c6C0=; b=onh2GWLYi/VDAh36uSspfL7itzoTsdnxBBzcKSujP/fJq6MQZa3Nf43qWZbLJy/JEM VNQlZvwOxN4AbVpg94JZHsYpHz8cvfniHLKySN6VWOEM2Im2I8jLzVymUzpDR8gcr7Xv NRsY+DZxWNwuN2PNM7C6M++hQozU12hfONUT9DXm4whaqY5TvfZDCErq8PWyZN1LwfUa +0sFD96RkD6/902xmZHZD9yKf+uSIDh25d25EuubmnRxJ3jl46Me8MW8t/aB/l/1fgvf yS5hC1dEMmxZvI7+j9XpQhIL7UN+XzcJOZ+J0WiJRqJNoi3e4qmkSchp65fCP4mj8qUi 7VOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=2e2unW1qDyqvth7RC+EnWk87g6+5SgUhOPF73R4c6C0=; b=RHvgetSiJRa3BnEdIkRqU7v0B9S8VaSs1LAotpCp/WUE8Crnx728MtjLReJW8udF3d C7HiHB5sHhPyN0a0a3tMChjYq7/VT7zhTvd3xYbnUOXgTUXveu7+lG32Mx/Ld2QF93DL TJmc7P3Jhey/n0xAtrKGg5cacNlWUj5dFCQPa0bAXu+xUGrqHXgF1alQ8YCUrjQgPbBF 1wSc/Vl6+IYdcMPOLYkicIrE26O9J1PIZJIga686bsGUtYU7FGEWwky/tVbRRYoZ8PoJ sjLd/xqH0SZ5agVe2pUKTwT9KtmFx0YQGWaMuF21KtYww8gii19e11n+jhjUhq1eExM2 Y3CQ== X-Gm-Message-State: AOAM530b+DEJ2aTok5fLTWPSOjBnzH2y71235T4+m5KjXQyaDUuOd1Rm nbBGmJj9edvdtSOTRptlBP+btE/YpcwG X-Google-Smtp-Source: ABdhPJxQBC1gMKY3fjreR/8th/DyxzGKB/ONKaJbY9a+3xYaB0QM3HgvftaQrinwu+HVBtzYs+g//hn/J7OO X-Received: by 2002:a5b:986:: with SMTP id c6mr10393201ybq.397.1593230760828; Fri, 26 Jun 2020 21:06:00 -0700 (PDT) Date: Fri, 26 Jun 2020 21:05:35 -0700 In-Reply-To: <20200627040535.858564-1-ysseung@google.com> Message-Id: <20200627040535.858564-5-ysseung@google.com> Mime-Version: 1.0 References: <20200627040535.858564-1-ysseung@google.com> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog Subject: [PATCH net-next 4/4] tcp: update delivered_ce with delivered From: Yousuk Seung To: David Miller Cc: netdev@vger.kernel.org, Yousuk Seung , Yuchung Cheng , Eric Dumazet , Neal Cardwell , Soheil Hassas Yeganeh Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently tp->delivered is updated in various places in tcp_ack() but tp->delivered_ce is updated once at the end. As a result two counts in OPT_STATS of SCM_TSTAMP_ACK timestamps generated in tcp_ack() may not be in sync. This patch updates both counts at the same in tcp_ack(). Signed-off-by: Yousuk Seung Signed-off-by: Yuchung Cheng Acked-by: Eric Dumazet Acked-by: Neal Cardwell Acked-by: Soheil Hassas Yeganeh --- net/ipv4/tcp_input.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index db61ea597e39..8479b84f0a7f 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -962,6 +962,15 @@ void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb) } } +/* Updates the delivered and delivered_ce counts */ +static void tcp_count_delivered(struct tcp_sock *tp, u32 delivered, + bool ece_ack) +{ + tp->delivered += delivered; + if (ece_ack) + tp->delivered_ce += delivered; +} + /* This procedure tags the retransmission queue when SACKs arrive. * * We have three tag bits: SACKED(S), RETRANS(R) and LOST(L). @@ -1259,7 +1268,7 @@ static u8 tcp_sacktag_one(struct sock *sk, sacked |= TCPCB_SACKED_ACKED; state->flag |= FLAG_DATA_SACKED; tp->sacked_out += pcount; - tp->delivered += pcount; /* Out-of-order packets delivered */ + /* Out-of-order packets delivered */ state->sack_delivered += pcount; /* Lost marker hint past SACKed? Tweak RFC3517 cnt */ @@ -1686,7 +1695,7 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb, num_sacks, prior_snd_una); if (found_dup_sack) { state->flag |= FLAG_DSACKING_ACK; - tp->delivered++; /* A spurious retransmission is delivered */ + /* A spurious retransmission is delivered */ state->sack_delivered++; } @@ -1907,7 +1916,7 @@ static void tcp_add_reno_sack(struct sock *sk, int num_dupack, bool ece_ack) tcp_check_reno_reordering(sk, 0); delivered = tp->sacked_out - prior_sacked; if (delivered > 0) - tp->delivered += delivered; + tcp_count_delivered(tp, delivered, ece_ack); tcp_verify_left_out(tp); } } @@ -1920,7 +1929,8 @@ static void tcp_remove_reno_sacks(struct sock *sk, int acked, bool ece_ack) if (acked > 0) { /* One ACK acked hole. The rest eat duplicate ACKs. */ - tp->delivered += max_t(int, acked - tp->sacked_out, 1); + tcp_count_delivered(tp, max_t(int, acked - tp->sacked_out, 1), + ece_ack); if (acked - 1 >= tp->sacked_out) tp->sacked_out = 0; else @@ -3116,7 +3126,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack, if (sacked & TCPCB_SACKED_ACKED) { tp->sacked_out -= acked_pcount; } else if (tcp_is_sack(tp)) { - tp->delivered += acked_pcount; + tcp_count_delivered(tp, acked_pcount, ece_ack); if (!tcp_skb_spurious_retrans(tp, skb)) tcp_rack_advance(tp, sacked, scb->end_seq, tcp_skb_timestamp_us(skb)); @@ -3562,10 +3572,9 @@ static u32 tcp_newly_delivered(struct sock *sk, u32 prior_delivered, int flag) delivered = tp->delivered - prior_delivered; NET_ADD_STATS(net, LINUX_MIB_TCPDELIVERED, delivered); - if (flag & FLAG_ECE) { - tp->delivered_ce += delivered; + if (flag & FLAG_ECE) NET_ADD_STATS(net, LINUX_MIB_TCPDELIVEREDCE, delivered); - } + return delivered; } @@ -3665,6 +3674,10 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) ack_ev_flags |= CA_ACK_ECE; } + if (sack_state.sack_delivered) + tcp_count_delivered(tp, sack_state.sack_delivered, + flag & FLAG_ECE); + if (flag & FLAG_WIN_UPDATE) ack_ev_flags |= CA_ACK_WIN_UPDATE;