From patchwork Fri Sep 25 17:04:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuchung Cheng X-Patchwork-Id: 1371470 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=DGJqL1XB; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BydZ20c8Nz9sS8 for ; Sat, 26 Sep 2020 03:04:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729592AbgIYREk (ORCPT ); Fri, 25 Sep 2020 13:04:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729477AbgIYREj (ORCPT ); Fri, 25 Sep 2020 13:04:39 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FBA8C0613CE for ; Fri, 25 Sep 2020 10:04:39 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id e12so2849091pfm.0 for ; Fri, 25 Sep 2020 10:04:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=fAS1HK36MpDrFQPqOdGconAl2xhLDaF0hI+cer5liZk=; b=DGJqL1XBcYzca0zwB4WkMYr60cYLmVg/KaNIycR+iEFUo0qYa2dTdy/P6FtFC1+Kf9 23yHECLSoB6Cru4fa5dtdHTivT8lhowfZz2Vo27QqhFqRYTVm7Pq7/C8ZwEfogoo8Cjk kxKzIM6acr9jKuJ1uEgUDo+zbJHOS+AIJ5AKrSOkaEAQLqYBIm4UOjdAlzB9xu6VGIDR UqYmXvQ0bB5Z/HrsGpgtdLJtHYDrJhyi0jHo/kVLTQwRUkorzCPoxytQLov5qQsJqg4h 4uA/n/jD/x9+iuzJmNE0GqFqqNAs0urYsb0ng4RHiQSld0z3W82ki5ZLE1JkOoItp9tz GQMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=fAS1HK36MpDrFQPqOdGconAl2xhLDaF0hI+cer5liZk=; b=Cxz4goNC8VhGK8xT9yjkDWjeBTv6dtFIYhxArzl57oOSTxTuMR10hdADmTEZfHt1GI P16YRjNdIqL8Ypw6TUSAaaMcF+hDM7xNZFU0MQh8rE5lVk1RsivihpHbpKkmfzik5BXQ w+S+YSbMWkpaN3knr4VhMKjXLnqD2+hs92kykvn1CF2h2KgJ+tPPFXucLJyM2lRmEoAK EbJRj7ypoNxaUX2uVUo3ByfomBFWHL7kYhKBgWVjBOc/j8toeRfBKN0KyCt7UMkWrV/z NrVA5B+vnTC5KEGNIRYXvQwaTsi0vnzpj/bVIyVhy9o2MEConC78TxrmYTpRI8Po6d9J 2rww== X-Gm-Message-State: AOAM530wSSij3OPJM8dEm/koqBzouScwKjSz1GtJUUdueHaEnQUBha5B nMhvEyTr/Tmy5g0W5NBXK7ZZtnMAUjw= X-Google-Smtp-Source: ABdhPJxc2wa/JehqHfiNAhh6HyM4PKHpMoxz2BgsybV+RYQj/PBgnkxKWNLyyZGmsefOJ5RTMoXJnac8d4o= Sender: "ycheng via sendgmr" X-Received: from ycheng.svl.corp.google.com ([2620:15c:2c4:201:f693:9fff:fef4:fc76]) (user=ycheng job=sendgmr) by 2002:a17:902:aa95:b029:d2:19f4:ff56 with SMTP id d21-20020a170902aa95b02900d219f4ff56mr346164plr.78.1601053479039; Fri, 25 Sep 2020 10:04:39 -0700 (PDT) Date: Fri, 25 Sep 2020 10:04:28 -0700 In-Reply-To: <20200925170431.1099943-1-ycheng@google.com> Message-Id: <20200925170431.1099943-2-ycheng@google.com> Mime-Version: 1.0 References: <20200925170431.1099943-1-ycheng@google.com> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH net-next 1/4] tcp: consistently check retransmit hint From: Yuchung Cheng To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, ncardwell@google.com, Yuchung Cheng Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org tcp_simple_retransmit() used for path MTU discovery may not adjust the retransmit hint properly by deducting retrans_out before checking it to adjust the hint. This patch fixes this by a correct routine tcp_mark_skb_lost() already used by the RACK loss detection. Signed-off-by: Yuchung Cheng Signed-off-by: Neal Cardwell Signed-off-by: Eric Dumazet --- net/ipv4/tcp_input.c | 9 ++------- net/ipv4/tcp_recovery.c | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 50834e7f958e..f84420dc7d37 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -2675,13 +2675,8 @@ void tcp_simple_retransmit(struct sock *sk) skb_rbtree_walk(skb, &sk->tcp_rtx_queue) { if (tcp_skb_seglen(skb) > mss && - !(TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) { - if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) { - TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS; - tp->retrans_out -= tcp_skb_pcount(skb); - } - tcp_skb_mark_lost_uncond_verify(tp, skb); - } + !(TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) + tcp_mark_skb_lost(sk, skb); } tcp_clear_retrans_hints_partial(tp); diff --git a/net/ipv4/tcp_recovery.c b/net/ipv4/tcp_recovery.c index fdb715bdd2d1..26a42289a870 100644 --- a/net/ipv4/tcp_recovery.c +++ b/net/ipv4/tcp_recovery.c @@ -246,6 +246,6 @@ void tcp_newreno_mark_lost(struct sock *sk, bool snd_una_advanced) tcp_fragment(sk, TCP_FRAG_IN_RTX_QUEUE, skb, mss, mss, GFP_ATOMIC); - tcp_skb_mark_lost_uncond_verify(tp, skb); + tcp_mark_skb_lost(sk, skb); } } From patchwork Fri Sep 25 17:04:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuchung Cheng X-Patchwork-Id: 1371471 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=b8q+0D8d; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BydZ334fXz9sR4 for ; Sat, 26 Sep 2020 03:04:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729601AbgIYREm (ORCPT ); Fri, 25 Sep 2020 13:04:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729477AbgIYREl (ORCPT ); Fri, 25 Sep 2020 13:04:41 -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 B1416C0613CE for ; Fri, 25 Sep 2020 10:04:41 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id a7so3174009ybq.22 for ; Fri, 25 Sep 2020 10:04:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=LkYOVOnkUnJHYHdTID+eAr4bWSUFNO12flF0Na+m7x0=; b=b8q+0D8d+g44dssqMdOkSSe3XqYzHSd1Uwl3Np2suBitB6gk69Q/x2jGCbyq58t5MU TkN88j6QIP3ePHIvu+1mOFm54+cIpUSNPFEmNW9z/IJgbkJ11vm+B1Lv+1ek53QTntHb SoqrwQIMtOcBPgco6TTxrS0auaNSb3kSzyL4r01PYyQb3tg8BAFOeQ4cH2jshDRIpBJQ 6fniEplUzeQIt9lZEdrwpS4Y8/v3YE7U2c1pqjyLuW5pdwzwJcDuJrlqzvw4FC2Gyv88 4DcpqKwjkfjqV5Xf1fyIO7xz5GjuBUzcgJ51rdI6muB5Uq74c23612DINUI+rRQDds5u AVGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=LkYOVOnkUnJHYHdTID+eAr4bWSUFNO12flF0Na+m7x0=; b=eIJUhnpHlWmtpSN0c/4rCMi+v55q+hpPvQyQCQT37rPFXT4UkW52vO1/hA/WHE5xrC H5Y6CqLeEISj+6H7SZh2OZzlIPFTQa1FvjRk6FroCKixsufiC+ccvKystngBJdhBQ/KC cjqyVzHponwRgQzFx2KGsYyVknHeErR91pMbOrwhcSkM7woSCVOabWvt+vuSKJSTC5AD p0Y2qpQd4RD2IAqkL326HkClsABEgRiaRe+2QZ04ZBNgRGggBAUqiZv0f/on21Q2P6cV JJ41rtoCl1ys/X/AncLmce8U0EkIf7fVKDshmd3PXFmVSTsR9JGZ0R6ngAXL+8uP1OLU xJlw== X-Gm-Message-State: AOAM530fsqyODwlA4jPXrCpyu1Fzq6b9XNbIh6Rw/nLA/nEjNnKBIHV2 aws3PGRkp7y3eyqssHsknD3yBr5+HgI= X-Google-Smtp-Source: ABdhPJwBmRW/gQgEZGW8y32Dcl+FcdlQILWKm/b4/560KBBfczyXsT3+3R5SjR2rHnLJQ+GLXfgB7H4zp1A= Sender: "ycheng via sendgmr" X-Received: from ycheng.svl.corp.google.com ([2620:15c:2c4:201:f693:9fff:fef4:fc76]) (user=ycheng job=sendgmr) by 2002:a25:3752:: with SMTP id e79mr242593yba.154.1601053480883; Fri, 25 Sep 2020 10:04:40 -0700 (PDT) Date: Fri, 25 Sep 2020 10:04:29 -0700 In-Reply-To: <20200925170431.1099943-1-ycheng@google.com> Message-Id: <20200925170431.1099943-3-ycheng@google.com> Mime-Version: 1.0 References: <20200925170431.1099943-1-ycheng@google.com> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH net-next 2/4] tcp: move tcp_mark_skb_lost From: Yuchung Cheng To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, ncardwell@google.com, Yuchung Cheng Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A pure refactor to move tcp_mark_skb_lost to tcp_input.c to prepare for the later loss marking consolidation. Signed-off-by: Yuchung Cheng Signed-off-by: Neal Cardwell Signed-off-by: Eric Dumazet --- net/ipv4/tcp_input.c | 14 ++++++++++++++ net/ipv4/tcp_recovery.c | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index f84420dc7d37..0f8d33b95678 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1016,6 +1016,20 @@ static void tcp_verify_retransmit_hint(struct tcp_sock *tp, struct sk_buff *skb) tp->retransmit_skb_hint = skb; } +void tcp_mark_skb_lost(struct sock *sk, struct sk_buff *skb) +{ + struct tcp_sock *tp = tcp_sk(sk); + + tcp_skb_mark_lost_uncond_verify(tp, skb); + if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) { + /* Account for retransmits that are lost again */ + TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS; + tp->retrans_out -= tcp_skb_pcount(skb); + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPLOSTRETRANSMIT, + tcp_skb_pcount(skb)); + } +} + /* Sum the number of packets on the wire we have marked as lost. * There are two cases we care about here: * a) Packet hasn't been marked lost (nor retransmitted), diff --git a/net/ipv4/tcp_recovery.c b/net/ipv4/tcp_recovery.c index 26a42289a870..f65a3ddd0d58 100644 --- a/net/ipv4/tcp_recovery.c +++ b/net/ipv4/tcp_recovery.c @@ -2,20 +2,6 @@ #include #include -void tcp_mark_skb_lost(struct sock *sk, struct sk_buff *skb) -{ - struct tcp_sock *tp = tcp_sk(sk); - - tcp_skb_mark_lost_uncond_verify(tp, skb); - if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) { - /* Account for retransmits that are lost again */ - TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS; - tp->retrans_out -= tcp_skb_pcount(skb); - NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPLOSTRETRANSMIT, - tcp_skb_pcount(skb)); - } -} - static bool tcp_rack_sent_after(u64 t1, u64 t2, u32 seq1, u32 seq2) { return t1 > t2 || (t1 == t2 && after(seq1, seq2)); From patchwork Fri Sep 25 17:04:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuchung Cheng X-Patchwork-Id: 1371472 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=L3pHUsT2; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BydZ65wG9z9sR4 for ; Sat, 26 Sep 2020 03:04:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729606AbgIYREp (ORCPT ); Fri, 25 Sep 2020 13:04:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729477AbgIYREo (ORCPT ); Fri, 25 Sep 2020 13:04:44 -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 926B1C0613CE for ; Fri, 25 Sep 2020 10:04:43 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id b8so3207211yba.10 for ; Fri, 25 Sep 2020 10:04:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=sS14qXlHQeACaFSxqte1R6lt/hihH4b4s5UsI5x9MDg=; b=L3pHUsT2LCEXRIJy5TuZ6GzxAx8/aIBXz+0MykXPqftm0UNl4QiZwM6eWD72GbVZMB NC3s6EIHJsPpdXgC1GK1Wlu9QvvirZmj9v5yQ58qROnPLs/J1n75XMuyR5MGuu6bCwR2 CtYA23SXJaIWf6sIItLH8y0CwXtW1gcAS2OL1hqYHTGgexfz0Qo6o3cyUfqZdp7EFfCn fVmTjWunMtZcSp+uqDzvCfuPWkgeBeWXPQcD+zKUckIxBUuLSYiacg4btRFoG9hTiwe/ 3cpBY8cy/IPJZfRz2X26cnlrMuYJ5hUsFuQ9OYKYeSfzXcw1iY1f0qhkFtfg6XNrikPc /pDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=sS14qXlHQeACaFSxqte1R6lt/hihH4b4s5UsI5x9MDg=; b=bxO5Rp7ndYqID5ulWXDNzbdJoabXDj3gES729v84aE6TKbb+i3GsUh3LLys8JvLJgX SGMENL0Uf+Yf25etFv7MC5yAEtVm1Dv8qHEywgII1K5+pI9Lr9USy8DdeK9AzSV2oUrF PHYrfSGMI3yu60nvl3aDFDxgzMK7psPSFWPBZZaojnOuDHD/1k8cJbE8CxxWsg+HgclY 1QEK7BfQTHzaV8KMZ11lvCLBV18fc2I8wo8pbdkgQLvyVbl3U6OrOfGESCejpLpMoBvq xCdvVWHP38hunooA7wJHCpxxHWWtvd8HHwAyU+o4pSKGwz9jKHHsbPoNsyZOJaOiBFcL RvHA== X-Gm-Message-State: AOAM532NYy+DNzL6x7Ib8Qc5NObwi5M733/2L1v4vGDkiAc6N9CQCGcm IsLDQbxPM0J7VCSODgRSJaMR9BY3hQ0= X-Google-Smtp-Source: ABdhPJxMr23e1heat0S6+ua8ocW+hgJLPvVrg76oCswp6iEGy8/D4UbW3+vM8S/95cSiyrM0cATDxFkwUUQ= Sender: "ycheng via sendgmr" X-Received: from ycheng.svl.corp.google.com ([2620:15c:2c4:201:f693:9fff:fef4:fc76]) (user=ycheng job=sendgmr) by 2002:a25:9d88:: with SMTP id v8mr226244ybp.43.1601053482840; Fri, 25 Sep 2020 10:04:42 -0700 (PDT) Date: Fri, 25 Sep 2020 10:04:30 -0700 In-Reply-To: <20200925170431.1099943-1-ycheng@google.com> Message-Id: <20200925170431.1099943-4-ycheng@google.com> Mime-Version: 1.0 References: <20200925170431.1099943-1-ycheng@google.com> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH net-next 3/4] tcp: simplify tcp_mark_skb_lost From: Yuchung Cheng To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, ncardwell@google.com, Yuchung Cheng Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch consolidates and simplifes the loss marking logic used by a few loss detections (RACK, RFC6675, NewReno). Previously each detection uses a subset of several intertwined subroutines. This unncessary complexity has led to bugs (and fixes of bug fixes). tcp_mark_skb_lost now is the single one routine to mark a packet loss when a loss detection caller deems an skb ist lost: 1. rewind tp->retransmit_hint_skb if skb has lower sequence or all lost ones have been retransmitted. 2. book-keeping: adjust flags and counts depending on if skb was retransmitted or not. Signed-off-by: Yuchung Cheng Signed-off-by: Neal Cardwell Signed-off-by: Eric Dumazet --- net/ipv4/tcp_input.c | 59 +++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 0f8d33b95678..9be41b69a75b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1006,7 +1006,11 @@ static void tcp_check_sack_reordering(struct sock *sk, const u32 low_seq, ts ? LINUX_MIB_TCPTSREORDER : LINUX_MIB_TCPSACKREORDER); } -/* This must be called before lost_out is incremented */ + /* This must be called before lost_out or retrans_out are updated + * on a new loss, because we want to know if all skbs previously + * known to be lost have already been retransmitted, indicating + * that this newly lost skb is our next skb to retransmit. + */ static void tcp_verify_retransmit_hint(struct tcp_sock *tp, struct sk_buff *skb) { if ((!tp->retransmit_skb_hint && tp->retrans_out >= tp->lost_out) || @@ -1018,32 +1022,25 @@ static void tcp_verify_retransmit_hint(struct tcp_sock *tp, struct sk_buff *skb) void tcp_mark_skb_lost(struct sock *sk, struct sk_buff *skb) { + __u8 sacked = TCP_SKB_CB(skb)->sacked; struct tcp_sock *tp = tcp_sk(sk); - tcp_skb_mark_lost_uncond_verify(tp, skb); - if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) { - /* Account for retransmits that are lost again */ - TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS; - tp->retrans_out -= tcp_skb_pcount(skb); - NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPLOSTRETRANSMIT, - tcp_skb_pcount(skb)); - } -} - -/* Sum the number of packets on the wire we have marked as lost. - * There are two cases we care about here: - * a) Packet hasn't been marked lost (nor retransmitted), - * and this is the first loss. - * b) Packet has been marked both lost and retransmitted, - * and this means we think it was lost again. - */ -static void tcp_sum_lost(struct tcp_sock *tp, struct sk_buff *skb) -{ - __u8 sacked = TCP_SKB_CB(skb)->sacked; + if (sacked & TCPCB_SACKED_ACKED) + return; - if (!(sacked & TCPCB_LOST) || - ((sacked & TCPCB_LOST) && (sacked & TCPCB_SACKED_RETRANS))) - tp->lost += tcp_skb_pcount(skb); + tcp_verify_retransmit_hint(tp, skb); + if (sacked & TCPCB_LOST) { + if (sacked & TCPCB_SACKED_RETRANS) { + /* Account for retransmits that are lost again */ + TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS; + tp->retrans_out -= tcp_skb_pcount(skb); + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPLOSTRETRANSMIT, + tcp_skb_pcount(skb)); + } + } else { + tp->lost_out += tcp_skb_pcount(skb); + TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; + } } static void tcp_skb_mark_lost(struct tcp_sock *tp, struct sk_buff *skb) @@ -1057,17 +1054,6 @@ static void tcp_skb_mark_lost(struct tcp_sock *tp, struct sk_buff *skb) } } -void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb) -{ - tcp_verify_retransmit_hint(tp, skb); - - tcp_sum_lost(tp, skb); - if (!(TCP_SKB_CB(skb)->sacked & (TCPCB_LOST|TCPCB_SACKED_ACKED))) { - tp->lost_out += tcp_skb_pcount(skb); - TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; - } -} - /* Updates the delivered and delivered_ce counts */ static void tcp_count_delivered(struct tcp_sock *tp, u32 delivered, bool ece_ack) @@ -2688,8 +2674,7 @@ void tcp_simple_retransmit(struct sock *sk) unsigned int mss = tcp_current_mss(sk); skb_rbtree_walk(skb, &sk->tcp_rtx_queue) { - if (tcp_skb_seglen(skb) > mss && - !(TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) + if (tcp_skb_seglen(skb) > mss) tcp_mark_skb_lost(sk, skb); } From patchwork Fri Sep 25 17:04:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuchung Cheng X-Patchwork-Id: 1371473 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=XbNRFdY7; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BydZ76FS0z9sR4 for ; Sat, 26 Sep 2020 03:04:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729619AbgIYREr (ORCPT ); Fri, 25 Sep 2020 13:04:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729477AbgIYREq (ORCPT ); Fri, 25 Sep 2020 13:04:46 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E75F6C0613CE for ; Fri, 25 Sep 2020 10:04:45 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id 60so2449238qtf.21 for ; Fri, 25 Sep 2020 10:04:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=436BrWsA80ToWEcQPbIaaI07QH/vu1GtRZGSncsEHfo=; b=XbNRFdY7cUlooqt16QcAeXZNH0gRhxZa1flvmCPTD2uFKGyLClcNBEf7UR7f1ROcek A99nelMz17uc53pebhzB3Wdee+LA5OnAMo3bUUmGqi4evVIyrfUwe+IY3x4szegi7I3i dO8HaqbhlppIOc4QSkTPn/8GZYoXgHyQ3DAayna2GaK4HvZ5+VyN5NHkDpy0/zmemntL CNbvKUt8s19YceEdj958vFRfLxAZIB8mW8vTgL8qi9fOyAsiR5i1RskdBwEwmdAvQbie lYhasBWOaidan4+v8GW2BNb13etWBnvz6Ahrxo7lBnft3X84MTnNtekAtRxQQwIbyYaf sBoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=436BrWsA80ToWEcQPbIaaI07QH/vu1GtRZGSncsEHfo=; b=EVxK3NUpSJI69/xDpevaQVsW2WylGfCahk6fUQMYtxoGBHNnwjY0Aezw0Yn2W0/OmZ g2a3OrvJZXLqdbKSR/4fci484ij8BoFS+/cliFfgKFBVCxhzb/wn1+Z3Ml1WHOY2xj17 WdLBNl8xMaP6Mo1tSv8sOOvrN5Ebj7DNglZfnQYrfqx7crWLnfy3/CArQ4htm10mfOP7 88Q/gKeK+1UjS/GUNHmD1yr5a9yiyngKjNJ7x5WuMDGF1JTTI1I2HN7P0Jlwkul2uu+s BlqsIMC+NLok7iWQXMX0n8TdqFWlllyqFN8O/d0dFzvlx48d15C4aeq3kAGSoEdAEwbo YT7w== X-Gm-Message-State: AOAM531pCLOe4NQbNZNtE/4g5SXTXZBe3SKaSALF5ajdIkIOOYqD1k2/ znfa4fvZGX3LM+dXR1qek2YlMwRzdvM= X-Google-Smtp-Source: ABdhPJyuPPbpUMwqX3IPQEiYAEuICvKIbNVAwXhb6e7wvZqFKIjr5FMU0tPLFewJcXvt5dtcht3UwKM1Y2g= Sender: "ycheng via sendgmr" X-Received: from ycheng.svl.corp.google.com ([2620:15c:2c4:201:f693:9fff:fef4:fc76]) (user=ycheng job=sendgmr) by 2002:a0c:8001:: with SMTP id 1mr267593qva.21.1601053484679; Fri, 25 Sep 2020 10:04:44 -0700 (PDT) Date: Fri, 25 Sep 2020 10:04:31 -0700 In-Reply-To: <20200925170431.1099943-1-ycheng@google.com> Message-Id: <20200925170431.1099943-5-ycheng@google.com> Mime-Version: 1.0 References: <20200925170431.1099943-1-ycheng@google.com> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH net-next 4/4] tcp: consolidate tcp_mark_skb_lost and tcp_skb_mark_lost From: Yuchung Cheng To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, ncardwell@google.com, Yuchung Cheng Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org tcp_skb_mark_lost is used by RFC6675-SACK and can easily be replaced with the new tcp_mark_skb_lost handler. Signed-off-by: Yuchung Cheng Signed-off-by: Neal Cardwell Signed-off-by: Eric Dumazet --- net/ipv4/tcp_input.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 9be41b69a75b..2ebfe87210f7 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1043,17 +1043,6 @@ void tcp_mark_skb_lost(struct sock *sk, struct sk_buff *skb) } } -static void tcp_skb_mark_lost(struct tcp_sock *tp, struct sk_buff *skb) -{ - if (!(TCP_SKB_CB(skb)->sacked & (TCPCB_LOST|TCPCB_SACKED_ACKED))) { - tcp_verify_retransmit_hint(tp, skb); - - tp->lost_out += tcp_skb_pcount(skb); - tcp_sum_lost(tp, skb); - TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; - } -} - /* Updates the delivered and delivered_ce counts */ static void tcp_count_delivered(struct tcp_sock *tp, u32 delivered, bool ece_ack) @@ -2308,7 +2297,8 @@ static void tcp_mark_head_lost(struct sock *sk, int packets, int mark_head) if (cnt > packets) break; - tcp_skb_mark_lost(tp, skb); + if (!(TCP_SKB_CB(skb)->sacked & TCPCB_LOST)) + tcp_mark_skb_lost(sk, skb); if (mark_head) break;