From patchwork Tue Oct 15 10:29:07 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: 13836085 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2040.outbound.protection.outlook.com [40.107.241.40]) (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 977921EBA13 for ; Tue, 15 Oct 2024 10:30:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.241.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728988233; cv=fail; b=ggvaxSMVGT2ODkoYyhKxFEx0fTWhRn2XgKtTABds0opF/4F83ZkSYBWLzAT/cB7h+HRjNhT/uXRhTK0ENJ3vkE4zl1NVroWB6Z9OjsfzSF7mDaoBQ4vSkUkv8Nmk12Yu09bhnB30C+8/gDVr24qamf+Lv/9Im5J2iSdfqKYJD+A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728988233; c=relaxed/simple; bh=fKBbeaPVW8DcZ6DYlD8c8/FTqvLtUMcI3CoRxLvDMr4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=U7UHsDZx0DwHK2l5G0y6Mf5Z1SJ98/Bn3hxYGcHQHaFNxAuaB0hMdYIuLBDGqzqYSQBXbrw+rQt17UNHQG304P3xBYA7Me8y/2Ixlv7tzgdYNd1waGMNwNaClGUT4+V+vfWMxBwB7mFC8PdHKcI+1y1W87L0oM86iCxAa9Q+6e4= 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=n1yMvtCx; arc=fail smtp.client-ip=40.107.241.40 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="n1yMvtCx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ANPsIfYAUbp5cTeCLub9pATuvLnmRUG/txixFKuhDyDiqXJwE1l+c4vus48mhc3IjZ4uUzjZOum+cjnfRKMFwB1gYlBV7qt0in89vzgPlHiMDn2rJsoUgdk4WsJwzaPKktFfTGE173Urcdf0kSW1PuM+Z1hrXp3OuwkLBcXk7CrYef1EvCkKCF4Feh3wr6vwh1ctD+PCj/Sy7HiUKNvlUPjIkgyYi3LQeP/7Nm9ElZGVL7cHEhkyeQ2mODL525VR5bFzxPTOamhqnKw2Wjxs8aqhhNAfoKKAjXj8JXE9TFGef44v0eeiD/eVWp/URdk0dy4+5VPeK4bCzBrhrg2IOQ== 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=mx5tReg0dH5Cs5+i2DpxHaJsAtIKi/q7cP/TKxAB3Mq0mY1DMWqPcHP8rpUc8iJYilBelo/i1obZ1NKywuHHhu2Buhz5rxtjzduiFcQFETjSQJ912BEPghq9al3+FuCpmvP6dkKEFN94eIhee8lm92Z48QvdFIwMWwkA01oXaJYIrO+rnbM0YnR2kx9JiJnP34tBjg19vFdoK/12LqSN7l1+tB9SyUNDD1u2g73lmyHlM2TTFjK5j9Ay5tjlpOLQKPIXGDHJgx0ZKtQ1ke0PYEe1DSK7jq3xCF8c8kexX/KnqUwJHoO9POKfjD3hOgH0I5INDCOOAbPyxaSu3ZXIJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.6.101) 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=n1yMvtCx/KJDGCFFAFm3hRJkXdJwo6EjH55nWgGIXYZWRg1dGX2+btNvWhWKceauw/1DSiWq/HElsHlCEIxuyI2HS1B3QvXny6ndlDUyCJg9iZPaMfZ9VocckJRLh9oKx/nzeL3ofKZYG1CpZaa9Fw5e+3Y+b55ZsSnway9NLA/5HKYX5i4NO1hC3NWDmVZ153CfXVbYxcUO4oiT5p/NH1EqDbPh/5iX/DwTnAfGBVyAlLqvuN0X6r8wWL9tZD6m9llx/zY676OMhbNOhq4SlWBnecPwueE3vUWHoyEVbf/LMmtCkeG+Xo+WjN69sGYHNS9C4sw7t41ZaSaQsF/2qQ== Received: from AM7PR02CA0030.eurprd02.prod.outlook.com (2603:10a6:20b:100::40) by DBBPR07MB7467.eurprd07.prod.outlook.com (2603:10a6:10:1ea::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.26; Tue, 15 Oct 2024 10:30:19 +0000 Received: from AM2PEPF0001C711.eurprd05.prod.outlook.com (2603:10a6:20b:100:cafe::a8) by AM7PR02CA0030.outlook.office365.com (2603:10a6:20b:100::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.26 via Frontend Transport; Tue, 15 Oct 2024 10:30:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.6.101) 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.101 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.6.101; helo=fr712usmtp1.zeu.alcatel-lucent.com; pr=C Received: from fr712usmtp1.zeu.alcatel-lucent.com (131.228.6.101) by AM2PEPF0001C711.mail.protection.outlook.com (10.167.16.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.13 via Frontend Transport; Tue, 15 Oct 2024 10:30:19 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fr712usmtp1.zeu.alcatel-lucent.com (GMO) with ESMTP id 49FATtnF029578; Tue, 15 Oct 2024 10:30:18 GMT From: chia-yu.chang@nokia-bell-labs.com To: netdev@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 net-next 11/44] tcp: AccECN support to tcp_add_backlog Date: Tue, 15 Oct 2024 12:29:07 +0200 Message-Id: <20241015102940.26157-12-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241015102940.26157-1-chia-yu.chang@nokia-bell-labs.com> References: <20241015102940.26157-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: AM2PEPF0001C711:EE_|DBBPR07MB7467:EE_ X-MS-Office365-Filtering-Correlation-Id: a02c2fbc-6a9e-4e43-a810-08dced045dfd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|1800799024|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?gUxu9xB1F6JgjMTvzzhUuACJ5n0lNdB?= =?utf-8?q?4evDa8yN+lF0KhUB912kNc6HmYbi4EeGbFGhubKHXoptvUZU8HfZfCEWiyqQL1OeU?= =?utf-8?q?Qnz0cPqiQg42X0P0Tacc88eY8xZOA9JNKx444oWpb2HIfFwiZcAZpcu4jiUgxOqBB?= =?utf-8?q?5d+K8XNqbeA8wpOf0DqqEdUydAuJP8fKTGcNVbkcrfc9uTE9hVCQUtO9E0eIevG6c?= =?utf-8?q?cLlOjPAVciCVp2DN2Qcbalj/huYJ3JWEkmHEw5BcLod1y+jwADXXcK2RPqHDuzvtr?= =?utf-8?q?D7OpdqE36frx89JmUProb3zHDer+z93byF7XG2YoUn3vPI8wQfxYS99lDbZKP02Lx?= =?utf-8?q?5ObwDG5PHNNCMxmAuNfzhlVwDA5YQDISJk33EIw9pcUyPnBCTVoEZt4DL+JffLCYC?= =?utf-8?q?ZfNiLyR5h4NB0mvGSd8zhTSyUTzb65+Tl88tzx6Yt0q3l8qf95BUcCh6R+YMjgw76?= =?utf-8?q?IVI2/ucT/9DzZY2D0sjbG3t10ed8MPbMycj/QOO26xhTzQcJJtDKA+D6R9goKa1Wn?= =?utf-8?q?3TKEEBnbuHt3p/G6Df+OMGXqyo8FSZwiDCx2cQQJDc19DD8Q0D23E+qYdaaMamQlU?= =?utf-8?q?gEnO53SUCa2YFBn0LiGlTJh+T1EUYwaaO+aH56oPzsEQGXzaaCGIzUCM1yCiIQTbb?= =?utf-8?q?XucwIcGm5Cgm+kaxAWwTZkQ+DRjQ9qAsDhkt8+hqMmMtPN1zgnNbvvsdm3Iqd2KLE?= =?utf-8?q?LVR7IEJhMWVYY2/3MQGh5h2EcYr+sZnUi3HzG99rr6tePmb/D5brJgAaldYOo8OF2?= =?utf-8?q?Azxk/21FEzJMwCBButQr8IgPlvNV2j6u2JuiM54toyLza2zRVQyWlt4MSjdiVail/?= =?utf-8?q?gFTOQxglSI/hGU3/i3nBq/Jisnu6hpMKsyZSpaMuzzjd/5TIpTfCWzPplWxqGklc1?= =?utf-8?q?s04sV2Zb9q10RkJpAtBWuJWaCUTAF0zGinBQRMNMwnk7+9Su03tjqZy9ExlfwFl/g?= =?utf-8?q?HTiIpiBg9OtdKKO9PPzD0xLq1B0sgOw5cWO2S8ghhuDF1PEwHZ6WvMA6XRWHvq5Rd?= =?utf-8?q?aSUP/hcUj8HgvVWvkEhwRmeklNQeTPQ+NQIcflox8VT4M15MjactV+AjKxywlJNiw?= =?utf-8?q?DG2p06Hw8UGyArbrKx5MQpoER9wjll7WVWc09XgzTK+EIIbrHxmcwT+ybXTyse0mz?= =?utf-8?q?LTN1K5FAWwVighG+7fcZvtCUqtB8ObApIQeCezS9RdGw1tpDj58ZRgovV9gQlRM/j?= =?utf-8?q?UOOaFUE9OEtHWnGd3xtgTooWTcnvGYxZjhuWGhFCAKofwcNRkVDzz54BHa60RNTnd?= =?utf-8?q?h+ekeA9Rb9RjOBNpxR32YRp6ktwnNf0f6cof9V+O/VqC03NWsvV5ovfqjnmdNacJ7?= =?utf-8?q?ZmjOzm0KowQz?= X-Forefront-Antispam-Report: CIP:131.228.6.101;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fr712usmtp1.zeu.alcatel-lucent.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(7416014)(1800799024)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 10:30:19.1074 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a02c2fbc-6a9e-4e43-a810-08dced045dfd 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.101];Helo=[fr712usmtp1.zeu.alcatel-lucent.com] X-MS-Exchange-CrossTenant-AuthSource: AM2PEPF0001C711.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR07MB7467 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)))