From patchwork Tue Mar 18 00:27:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Chia-Yu Chang (Nokia)" X-Patchwork-Id: 14020093 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2078.outbound.protection.outlook.com [40.107.20.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7BE515AF6; Tue, 18 Mar 2025 00:27:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.78 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742257677; cv=fail; b=tl4V0FjNanPSPOHKkYJLxkohvJT/ZnaQ/sH5NN8tI/abt0lraaEQ6NDDiTqOnAYlBWK8RE7GLXq8sWRQGYL16eBpDJLghJIRb9swsCDJDJj57SpBwxRxhd8qpVb5dt6VoT5rE2acJsRxjTRfkzB22Gg92yeP9ZdB+WW+VmI7uVg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742257677; c=relaxed/simple; bh=rMfobB2LeDKZJJYDXDD1lvSwng3bBWFGEregY42JC0A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=XwISfv0Ga9U1viSM2jZZJ9znopD45gWbmNdj45fmcIrAaj4W3SWTjXxhFJ/XxQv2XEZVAZLTwSh2wWw/ZdAiM94c1Vx9EVlmlm8QfQidlSz3Bj/VrJAOK9K4Cz+Ly0/awrHSiSxhh/Egl5UKNccCDc8VWBZ+REJHllZ2HoZpEJE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nokia-bell-labs.com; spf=fail smtp.mailfrom=nokia-bell-labs.com; dkim=pass (2048-bit key) header.d=nokia-bell-labs.com header.i=@nokia-bell-labs.com header.b=BldSxLFC; arc=fail smtp.client-ip=40.107.20.78 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nokia-bell-labs.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nokia-bell-labs.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nokia-bell-labs.com header.i=@nokia-bell-labs.com header.b="BldSxLFC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uFck/jEbi2TY8j3LjwSqc+qfMfTPlmaqh6EjVswgkhgA2NaMrX49l4CdGq6y7E2A0qWzvTbcJbbi/WRTvAIYoL7dF4k7u7atW0RmVn8TxoZ0/s0OK+50ZcK5fC9GdEtLEDVQASGwy35hN3CY+Lty5CtFCRaVshzaAoZdWIqpK9GJKmOC0a+M7+QM7o9KxWawcjm42cCvOaM7JCOpE46fHsofayTncgFeT+xgm1FqCR6RQHFKKb8l+Kg27YqYFPu/scxW7z1gC/nzCVJF4LKroNAFQXcCzqKkD0okekOuSCwj8/+qH3Kvhn3gj8OIOIUYUwRq9NQOyC6v/8Wwm16cqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HSVkgj89C5bYbYKQw200DiEqhwGnKsoODxuUzbGElrw=; b=UL5dUg8eHvhY6l1VhOjecgj+dL8zCfgs0l2DPqyorbFKmWCGqk3GgW5Kz5gods0+lNSmjVLHmBOH+fHvB+obfPle5PnYAfYCVxjyfohzfnbRKrZTu6gE7kYhKbBgDMj07ixhUJy+cG8KVm1DOZ9ojrSYt44rDZJ1TUqEDC9nSWkoUPOOzkmq6mBXO45VzYp74HU0OvcPd0NIeS3myT3lgTV3rVjaYXQYW2wIJx3gtoLS0PkPBY26DlzVArrcPpTMv54kanEAnAl2xNotE/jEYfLn0X46Q4ic58JGtHrhqQrE+feUnW+StF09DPAbZWdJbFRsWpP30ctEwhwloXMbhQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.6.100) smtp.rcpttodomain=nokia-bell-labs.com smtp.mailfrom=nokia-bell-labs.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nokia-bell-labs.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia-bell-labs.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HSVkgj89C5bYbYKQw200DiEqhwGnKsoODxuUzbGElrw=; b=BldSxLFC/DJ9HmmxPtCn1LKyjtj8xbPkhzF+cuwJh4rBLEEEarniwYLde4AS7IAzMp0Ad66GZ0/epBN0OYcNppCJf2QG7RD7hyEol0FMs8kyEnaVMBZ1tEp4qLjEnJJ3JPYnRwbARTzkZEh2Y/pMmkxunvSXe96PLNl8h4Ly8m0Sl4WnkEjh0U41Czgav20WIcJygS/zoS0ruLrh3tzObc3xXzVy6o2b/kh+uhDps6TaflpU24d9Y+v53LFS+QWycWLN53xmdgYslYzNQaRlCuLsqzOfyFq0htFtuqCIS9YceYwIF3DKIcAe6JmQAwYDT63ay1wLtQ1fGU3PsR0s4g== Received: from DB9PR06CA0029.eurprd06.prod.outlook.com (2603:10a6:10:1db::34) by PR3PR07MB6812.eurprd07.prod.outlook.com (2603:10a6:102:79::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Tue, 18 Mar 2025 00:27:52 +0000 Received: from DB5PEPF00014B9F.eurprd02.prod.outlook.com (2603:10a6:10:1db:cafe::62) by DB9PR06CA0029.outlook.office365.com (2603:10a6:10:1db::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.33 via Frontend Transport; Tue, 18 Mar 2025 00:27:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.6.100) smtp.mailfrom=nokia-bell-labs.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nokia-bell-labs.com; Received-SPF: Pass (protection.outlook.com: domain of nokia-bell-labs.com designates 131.228.6.100 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.6.100; helo=fr711usmtp2.zeu.alcatel-lucent.com; pr=C Received: from fr711usmtp2.zeu.alcatel-lucent.com (131.228.6.100) by DB5PEPF00014B9F.mail.protection.outlook.com (10.167.8.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.20 via Frontend Transport; Tue, 18 Mar 2025 00:27:51 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fr711usmtp2.zeu.alcatel-lucent.com (GMO) with ESMTP id 52I0RNBl024935; Tue, 18 Mar 2025 00:27:59 GMT From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, dave.taht@gmail.com, pabeni@redhat.com, jhs@mojatatu.com, kuba@kernel.org, stephen@networkplumber.org, xiyou.wangcong@gmail.com, jiri@resnulli.us, davem@davemloft.net, edumazet@google.com, horms@kernel.org, andrew+netdev@lunn.ch, donald.hunter@gmail.com, ast@fiberby.net, liuhangbin@gmail.com, shuah@kernel.org, linux-kselftest@vger.kernel.org, ij@kernel.org, ncardwell@google.com, koen.de_schepper@nokia-bell-labs.com, g.white@cablelabs.com, ingemar.s.johansson@ericsson.com, mirja.kuehlewind@ericsson.com, cheshire@apple.com, rs.ietf@gmx.at, Jason_Livingood@comcast.com, vidhi_goel@apple.com Cc: Chia-Yu Chang Subject: [PATCH v2 net-next 05/15] tcp: accecn: AccECN needs to know delivered bytes Date: Tue, 18 Mar 2025 01:27:00 +0100 Message-Id: <20250318002710.29483-6-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250318002710.29483-1-chia-yu.chang@nokia-bell-labs.com> References: <20250318002710.29483-1-chia-yu.chang@nokia-bell-labs.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5PEPF00014B9F:EE_|PR3PR07MB6812:EE_ X-MS-Office365-Filtering-Correlation-Id: 67ffdb4e-3899-4400-37fb-08dd65b3b823 X-LD-Processed: 5d471751-9675-428d-917b-70f44f9630b0,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|376014|82310400026|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?uIKYX2cD4WaQHaZkKaABvPOpP+OYx3u?= =?utf-8?q?MqRpR55N07py5r1k4fy7h1iYfce9FvDXGYx9MZPX0anLvhxwE/wWQ5uuVXYBoyqS2?= =?utf-8?q?LgzScM4r8YnPX9SGIzGilWy3kD7u6s2O7bwsf0tHCrq1rYRJRhiBX7ToER1hc/gTF?= =?utf-8?q?Bdx6LUtq3lYfae12gKlhD0sEhXKHw4eJhHHeXt/eVNkG5qddoPA7RXsHtqJBprYru?= =?utf-8?q?5eJDuekJdV307WwQC8F4YM1+HUkxJ5iV4oHQAvQXe/SlSUAbq0FV93BZkNCRwvjNn?= =?utf-8?q?EGoizu/XgNBriPNxDtHiAKMv8clu80zfRmDc09unMML1FWeu3HndYw7GS8TsWvy28?= =?utf-8?q?FMF1Wk6WOs9j9dS2LmXXKXK28neCJbe3ZwcMBNXATX68mTNUkRklyU4suJRKye278?= =?utf-8?q?3HPkoPu8Ga43EwsUlx2fFkbtcDQ00yvfWj2mGHA6T6BE9xKbwk23/Whss6urNe6Az?= =?utf-8?q?CS1XnaodWyEGXrALpCnsH0oOdTAtxwOrVA/Fhy/MMvaZkblSYcp2Dt0E3yO885SoR?= =?utf-8?q?MmNatSiuu4KMtvGlsZdueCkz/bwZabwvBEA/cXH93s6L3pKtZJMoGouhWJLMViFvh?= =?utf-8?q?JSDMJ2fEh46hl8vm9wAVTooBCDS+8LnpufkEuirrVbcBJ1MNpjwaeu2ZLIK1mfCtt?= =?utf-8?q?9ZRC+hbyUp/XIzDI2amCQuHFfyKIRX6PZjreJlSOUueKY6/pYvZ62YieMoMe5RcOw?= =?utf-8?q?whI0W4H3PajDhFinnQfyVYyBjf/oAfr+Mu/JwGVk1HTjM/4FMwSKzl6gNKsuxlNau?= =?utf-8?q?hvwVmp12KEdKYgUhKSlw1u+RxRgZbRsll5j8N8xUpNKGDLvSmnUSpmvvJomNGYFjA?= =?utf-8?q?cbPwmMIK+tnreuI6sgikkC9dtiqGm828xA4p0Lj3FkBA2R2wc0pmqujhQf8Wu3BHx?= =?utf-8?q?FhDE1XwRgM1jXjBoW5SX84n5JtUoTeLYF8TUCmt5yp88iiWwgbtwNYe81GPc3t5iL?= =?utf-8?q?FOb1dSq385xSCOhIM4Ak5KFLydSvtG4KmtJlawUP0rS9MVUqEyqAHVsODUI1NyT/3?= =?utf-8?q?9MOruPEy8BSsmddYksnQGnYXBPw4Cousgv3ha07u2bUpm1U62O499posgyVh75QjU?= =?utf-8?q?Vi6RWAxec9l5ilPqe4koBayHOwOmkqmNNsVmSU0SwQQ71SBCzFtD66+95WAXalWLu?= =?utf-8?q?KuHOzOKtpB8tvTpCU+fD/3OKGjPl1Fra4+2iOFSZumZ0hSzup0L7edLxdj0giFgKL?= =?utf-8?q?FTtiO+9WBS/i8JHyqtikdYbeJ1lxwo6uTXG6Y0upugGHxMJ8l+QukJTCXmUy69py5?= =?utf-8?q?ZFcyo/SbUyrrvMJKy0T35tt9U9CS3y46/m9gtL+gkEAxpTxZfvkmjg9XwCgS94Soq?= =?utf-8?q?EUMQquQFKo+DxqQ8Vcso8rDgNY/TBXOLEVXDPdyIV+c8BjPrasM58B0cuHY2YTRGB?= =?utf-8?q?sSOGwDnzDpifv/TBdOKn0wlS0CBQAjvlRYpHH1cqSrNsht6Or/kStO7NWrDGKa9Iu?= =?utf-8?q?eXhV2D3rcc?= X-Forefront-Antispam-Report: CIP:131.228.6.100;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fr711usmtp2.zeu.alcatel-lucent.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(376014)(82310400026)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2025 00:27:51.6533 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67ffdb4e-3899-4400-37fb-08dd65b3b823 X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0;Ip=[131.228.6.100];Helo=[fr711usmtp2.zeu.alcatel-lucent.com] X-MS-Exchange-CrossTenant-AuthSource: DB5PEPF00014B9F.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR07MB6812 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen AccECN byte counter estimation requires delivered bytes which can be calculated while processing SACK blocks and cumulative ACK. The delivered bytes will be used to estimate the byte counters between AccECN option (on ACKs w/o the option). Non-SACK calculation is quite annoying, inaccurate, and likely bogus. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- net/ipv4/tcp_input.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 57e3cdb44a51..b7a9534eb47c 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1171,6 +1171,7 @@ struct tcp_sacktag_state { u64 last_sackt; u32 reord; u32 sack_delivered; + u32 delivered_bytes; int flag; unsigned int mss_now; struct rate_sample *rate; @@ -1532,7 +1533,7 @@ static int tcp_match_skb_to_sack(struct sock *sk, struct sk_buff *skb, static u8 tcp_sacktag_one(struct sock *sk, struct tcp_sacktag_state *state, u8 sacked, u32 start_seq, u32 end_seq, - int dup_sack, int pcount, + int dup_sack, int pcount, u32 plen, u64 xmit_time) { struct tcp_sock *tp = tcp_sk(sk); @@ -1592,6 +1593,7 @@ static u8 tcp_sacktag_one(struct sock *sk, tp->sacked_out += pcount; /* Out-of-order packets delivered */ state->sack_delivered += pcount; + state->delivered_bytes += plen; /* Lost marker hint past SACKed? Tweak RFC3517 cnt */ if (tp->lost_skb_hint && @@ -1633,7 +1635,7 @@ static bool tcp_shifted_skb(struct sock *sk, struct sk_buff *prev, * tcp_highest_sack_seq() when skb is highest_sack. */ tcp_sacktag_one(sk, state, TCP_SKB_CB(skb)->sacked, - start_seq, end_seq, dup_sack, pcount, + start_seq, end_seq, dup_sack, pcount, skb->len, tcp_skb_timestamp_us(skb)); tcp_rate_skb_delivered(sk, skb, state->rate); @@ -1925,6 +1927,7 @@ static struct sk_buff *tcp_sacktag_walk(struct sk_buff *skb, struct sock *sk, TCP_SKB_CB(skb)->end_seq, dup_sack, tcp_skb_pcount(skb), + skb->len, tcp_skb_timestamp_us(skb)); tcp_rate_skb_delivered(sk, skb, state->rate); if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED) @@ -3541,6 +3544,8 @@ static int tcp_clean_rtx_queue(struct sock *sk, const struct sk_buff *ack_skb, if (sacked & TCPCB_SACKED_ACKED) { tp->sacked_out -= acked_pcount; + /* snd_una delta covers these skbs */ + sack->delivered_bytes -= skb->len; } else if (tcp_is_sack(tp)) { tcp_count_delivered(tp, acked_pcount, ece_ack); if (!tcp_skb_spurious_retrans(tp, skb)) @@ -3644,6 +3649,10 @@ static int tcp_clean_rtx_queue(struct sock *sk, const struct sk_buff *ack_skb, delta = prior_sacked - tp->sacked_out; tp->lost_cnt_hint -= min(tp->lost_cnt_hint, delta); } + + sack->delivered_bytes = (skb ? + TCP_SKB_CB(skb)->seq : tp->snd_una) - + prior_snd_una; } else if (skb && rtt_update && sack_rtt_us >= 0 && sack_rtt_us > tcp_stamp_us_delta(tp->tcp_mstamp, tcp_skb_timestamp_us(skb))) { @@ -4098,6 +4107,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; + sack_state.delivered_bytes = 0; /* We very likely will need to access rtx queue. */ prefetch(sk->tcp_rtx_queue.rb_node);