From patchwork Fri Oct 18 23:20:13 2024 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: 13842503 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2055.outbound.protection.outlook.com [40.107.21.55]) (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 7AB3A19259A for ; Fri, 18 Oct 2024 23:20:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729293638; cv=fail; b=djRFQHS04TrAMsxzmTfgv8ObCIKsBKCI20CeHe3Tq4VNNB+hnGEbtsubCWhZ0deU1XfzUEyB5QTyqyBsjn7VxVAK9oE85O/iIkoSKkLOT8CTPw4BlCfGQQSdqUDE22twkgX5mlVURA3fdTJ1H8OD/3SXSmXOh6UH+CH3vA1eLos= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729293638; c=relaxed/simple; bh=fKBbeaPVW8DcZ6DYlD8c8/FTqvLtUMcI3CoRxLvDMr4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=ED/jmWYLq1LRKbz/TEENkfdc9H3NrRViSEPaP++DVdfUw+wSQ8dlLC6R3LMU6OwA6yl+iZEnZMR87ZZkovxqepoCWW3VylRzz/elPEWAYsgwEQSi/NeZOTSBBY5+Loc0j/CKbSxVIzC57inyRUSJpPOhPsDh2ETtaJaLW7Hu0VU= 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=YrtDuW4E; arc=fail smtp.client-ip=40.107.21.55 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="YrtDuW4E" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bPFLNFOnKkakfAF5RcF4FpxAOXgLri3NChCsJQozp8jDKLJ6O5tb75g+g0QvDvnwp1LwAbpB0KYgvoW/MGJ2VOHybqti5EWlAw2LTpoNhUJGy9J0hiTLB7Glqgmwd4vHjnkNJ+hFaYJr0hZBVeaOYcPRj8YYaEU/Ns5Ncl/XHvj1nzy7ztgMQO9Vh3rRmSN5oYrTGOdjkht6B+RoozBEwyiVtjkcigvVCqUjvMlRbDoXC6MA08McHvrSj7OTetF7GENqPUjGHeiPGxlj+j9KFE/u+e1pGsDmS8k1oHgopTxJCP1o2vnVea+/oIPQO6sCj6sEWGvo/TBEZ7nKp9WZ3A== 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=JS+bjUXzLdWxU/fiVihhJtOmIUpj4scV3/uP4j163Rs=; b=N7OzOgGMzk4Uzdtef4aEFeU7Bjq0JmqDsrpRf/Cwtpf+1/G5ap6+AGEr53I7Pf5yxykHkVsYIq05OJxlTy2Tg/jkwLFLBMkHjTTzxR0kS5bKrEPLMSlxBQjpzK6DIRVdc2F6e1NzvRuyNPda13ZYf6KqURWLAqgVowikHpk1ctOQws3t6QSCjBm8lBgaa8bomR1kDQJ4QXeMp9x2+jo3pT7O1tBM9MjOanubzWY4DfhlV6oQCY3mKkWGyefFkF+1/2eFS9K8F+84wSE8GHxb+dt0qWSsv37aXUxtt4LTQnBXHqyS23Ra/HQejpBML5w0Yai/CK3DPUwC0g/Ofb8YRQ== 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=JS+bjUXzLdWxU/fiVihhJtOmIUpj4scV3/uP4j163Rs=; b=YrtDuW4EcPysS8Cacv2vWbprGp7YI30lNN1uxdr5t+4j2mxOpjVaxbEojNyVx/yxSFoiFDCUD0LZZPaexgqe7DGcK1D17uO+ZWMmL6wO7EztNE+5RsWDsYBsGRav2VqcjnkdBXI2DJBvZ5Kf/Uthl2DqDkQnzgdKeEopFrrOFyNI7i2HVw5Bbcxq6hk9CrDM2lGv7iZbabyifIIpYIrfx2sewUpMw41FEwmE7h86t1LLH5bPmQAzxtGDtufRxh0pKPV/5vqTLVAN24RMrPDmh6Vz/Sz+cbrMzlqjpEOCDjCEexNDCpFLVnlRzxp+8OPVviUQvPD5MIyoZ4SraINN6g== Received: from AM0PR02CA0186.eurprd02.prod.outlook.com (2603:10a6:20b:28e::23) by AM0PR07MB6418.eurprd07.prod.outlook.com (2603:10a6:20b:158::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.24; Fri, 18 Oct 2024 23:20:32 +0000 Received: from AM3PEPF0000A796.eurprd04.prod.outlook.com (2603:10a6:20b:28e:cafe::38) by AM0PR02CA0186.outlook.office365.com (2603:10a6:20b:28e::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.24 via Frontend Transport; Fri, 18 Oct 2024 23:20:32 +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 AM3PEPF0000A796.mail.protection.outlook.com (10.167.16.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.17 via Frontend Transport; Fri, 18 Oct 2024 23:20:32 +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 49INKJJZ010239; Fri, 18 Oct 2024 23:20:31 GMT From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@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 v3 net-next 10/14] tcp: AccECN support to tcp_add_backlog Date: Sat, 19 Oct 2024 01:20:13 +0200 Message-Id: <20241018232017.46833-11-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241018232017.46833-1-chia-yu.chang@nokia-bell-labs.com> References: <20241018232017.46833-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: AM3PEPF0000A796:EE_|AM0PR07MB6418:EE_ X-MS-Office365-Filtering-Correlation-Id: 981c5f48-0e84-4b88-8f12-08dcefcb7693 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|7416014|376014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?aSln5LrJsPtcTIORsrrBVf6rO0d0hyP?= =?utf-8?q?X18PmKUSssHMEK1nlrzdYYopyQd/WMfpHKgJ3jM9YeU6CjlMo/XmoJlnnJ4JTmOmD?= =?utf-8?q?PJa/Ku+SN/4A/eo0bkZvlghUPql6jYsvg++v0oDT60p0MSLEgJ6ggplpeOlqNYg38?= =?utf-8?q?GbDSoj2BVIZS2YMpOQmY+rxiXILhHVH44OLugOsLMvtsyOWhUF4GSRy+zBTpzmAQX?= =?utf-8?q?PQoTC5q5qQrnMjS5eog/0VwwOz6pnJJlFwr5iBVcEv9mekRaABsshc8iyHSG7zYLz?= =?utf-8?q?KZh/MaG2M7E/LyOLEG0nFudP6VctfejMBU0RQR7ygJNGk09ned2zsx1Y4giYb8cGc?= =?utf-8?q?oyFpMa1YtA6a3Dmcx6FpVoxURYvbOqf+0wFRNI7CQ1E47EUHuewpIvh3HAa7e5fyD?= =?utf-8?q?/649+KRRUNexaDTSZzIblV6aqePuZNpC1kdCdtUuIsWd9PshXMl4ke433gKJlAdt0?= =?utf-8?q?IkgbJJT1VOo4lpp1D1Gtfng9KbaPHTdBmWdjruIvOCBRVyWFMBFgnRFnyopUEGw1a?= =?utf-8?q?1G+E+KN3bVYrZBlDnyEAqf3LfRLU9wT0RhVXJ6TAvUD42z7AY9ck7+PqH8ba8eb7b?= =?utf-8?q?zJXhohrfedZ7hPIbsAot6Ia+9AdzdLDWcnR8DmCQ8X+WnpeBQFukEAxtpYw5nsvV0?= =?utf-8?q?m7liCBfh9DmroxbuVq2WwhP5DQ5nrIVrGHUmz6xkvkeKA+ksZc+9IHzBGYYZ1izKR?= =?utf-8?q?uj8xhRVFhNf2ZkzQglQJXSEoHiy+UG0bA5o+F2iyshWI3mcV5gv76rWSLSC4M5RbS?= =?utf-8?q?B++0wVrYBdpyE4k3q57JIUsP2wiOfTcJ9aFhIBpvdDvshPKGnihUI3RPPjuJTRGfr?= =?utf-8?q?obkf0gQ0Ab2iFuG6mxpiqcwlh17Q4C8IGH6HKFeEHlD28ARJLpPRAzJcb8MtPNmS4?= =?utf-8?q?eo+kWCz6ATRQCTvLyKFxOszj8AQt0fihulmwgi+oBDM9Sbbl0XaznQuxG3N/E/rnW?= =?utf-8?q?kZEhm1SJhKZPS2aNKxwbjIBNli6SimOa/cGP3MX3GzO5s9gthGEEef3QnZGJz2DAO?= =?utf-8?q?MR3KP1UeF1AZylxx6aopwW+xbzOrZIUE+TRLfDRIO3t5sNsdj7no9GA4Zb/l4GSRg?= =?utf-8?q?dK5zjZM6nyEreqjFotlyMKIWTe4QDsdLKEpj7skWZrLQ4Nw71N8/25e/DulHaCf9w?= =?utf-8?q?B4jcSAdGQUZb+0j0Y264P8LG0VhCgRTqqI18jLnzF9ykElN7KPvReSyOKa1rHiTGC?= =?utf-8?q?HJ+KNrDjbvLTCicEOBMaG0n3aPf/JfK674b4I0epr+0609uDguDibsMteoZoaWSgH?= =?utf-8?q?OxRqA8qfxIvz/dTsuJEHQ3nEhf4AV3TE0YXqOwPFJ/vnxG3E5+9d4WMFWSmi8nTSi?= =?utf-8?q?eQKRLa3Zrqf9tjoumrhYsBtJGuTj+oP+Brq1SNwRfapUjS6cEiJEyms=3D?= 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)(82310400026)(1800799024)(36860700013)(7416014)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2024 23:20:32.5299 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 981c5f48-0e84-4b88-8f12-08dcefcb7693 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: AM3PEPF0000A796.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR07MB6418 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen AE flag needs to be preserved for AccECN. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- net/ipv4/tcp_ipv4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 9fe314a59240..d5aa248125f5 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2054,7 +2054,7 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb, !((TCP_SKB_CB(tail)->tcp_flags & TCP_SKB_CB(skb)->tcp_flags) & TCPHDR_ACK) || ((TCP_SKB_CB(tail)->tcp_flags ^ - TCP_SKB_CB(skb)->tcp_flags) & (TCPHDR_ECE | TCPHDR_CWR)) || + TCP_SKB_CB(skb)->tcp_flags) & (TCPHDR_ECE | TCPHDR_CWR | TCPHDR_AE)) || !tcp_skb_can_collapse_rx(tail, skb) || thtail->doff != th->doff || memcmp(thtail + 1, th + 1, hdrlen - sizeof(*th)))