From patchwork Wed Mar 5 22:38:50 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: 14003550 X-Patchwork-Delegate: kuba@kernel.org Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11011012.outbound.protection.outlook.com [52.101.65.12]) (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 207ED2676DB; Wed, 5 Mar 2025 22:39:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741214353; cv=fail; b=lyssJGxtNljFo98UStC/35w0OmvnvBdn/8HpaeGs5fbnsN2KtPKEXaAcclwkkD2sOo6xBrEu+pWWysIlUrcENDH9xf7wOuBuz/BCi3F2f568KITv6xAbgnAkgq59FQOg1y1TgvMMKt6/Ewwy5NXAozGDva3PB0db9phPhAx3HnA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741214353; c=relaxed/simple; bh=YCA5S/+m0auxbfcaXBPT8sCED3C7jO+RvSZW50TCA0s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=pGOCAmwxsVarlIWOqa3/GasbZD58alwMyQRJExffnoO6lE5NsfKvMMPgtB9SEmXMnj3XbTmF3+XBwXt7W8Pj93NDkifj+F7BUfm0MG/Yt6oSB32MPk1voNK9XGs2vrkbYCBHzbzWvcRIt8CjBKqWosxDCbMM6eAtmT+f4RcxMQY= 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=aPOnApGi; arc=fail smtp.client-ip=52.101.65.12 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="aPOnApGi" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IewCSr6tNbWrQT615kHJ8mRzttcy1UAuhwFQ9LPGCyH/K+q1qVsKmH/sHOUtXY8Ovnvle/+f7CcuwQrodsLGgJK7xV9fpwOF46+nzmTkGveKXoiBEnYpdgvXCVwWQW+pUq+qksJ3UTzp73yaZW7wZBJ4RNWJA3RFS2H/M8ASFsYg/ngmbT55Q/n46Rn+pb+bQhqUYS4XrCIH/+qPZLGH47/xjGSwQuctsqy4BV4lIYo/4oyb0RvUKys74FNQ1i0mqzRF8jflycarO380tn7qJT3N0BiD42nbMVUi3WhEO6PhIWe/w9N32vXkiWoz3bX7PydWlXrmXxMnk64D/Dww0Q== 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=ytA/PdolvmtxyX3VKJFZRkoKIZjgm8rKjzdxQWuHeE0=; b=UTJkpSM/iDHXCzdW9brBR6FMO9DICb9PDh3Ac/1rTu6j+Qjm9v+oeM/eqQBoLYMJpuz4FQkAGwyEW3b4PZWFvkBOHt/c7kNshDfiO4I6Jai5tPBaybLJZ7iOnoHp1Ukpr44yq2W44dHzAxXPTKrS5Cqqvo3oVks/+j/zQYwxJfAFaIt+HsDu+2huPtMew5xX4Yq2POgZT7bHjy8kc7+RJDiHVE/Ce2ZZ5ofE7SvFniWgi+uDpmP2MzwjyCUbaNAAUm2k8F9e0nomeykHd3aplYBWva6gedupy2o6HTABZWRmPG7QXTGcuUapJcP0oXqbj/3ttFNER3uoI/Zm0eu/uA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.20) smtp.rcpttodomain=amazon.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=ytA/PdolvmtxyX3VKJFZRkoKIZjgm8rKjzdxQWuHeE0=; b=aPOnApGiM8thfgIh8AFHSRS2PzpIp8nyE8wX+IJP9Vs2UBEZhPbzkWA2HgEu9GIQlOuLVwD+OChnyPvB2jpPusFVpU81pmtDlVdx2XX6crqfvzzi3N56Dt4qKYwkAo/W1eWyXDMLdM2Fysvu5LeFee2mn7+ZnCXB+46sPp6mQIZyioy907Jv7NwlyUhpMi0FH3hIVDzsrIKalMOqVLvQ+baLLaZq4zl0/6ySU4IAg+TbnR2vzDanzzEfzOcMaEUN0YshS/JzdwoawDGEIMwXN5xAv2xGW+cPWgepzLKcIe93MNAZJnqMwpy4vbI4BiHzBM2v9a7cCVEmLs2dqTyEYg== Received: from AS9PR05CA0318.eurprd05.prod.outlook.com (2603:10a6:20b:491::25) by AM8PR07MB7649.eurprd07.prod.outlook.com (2603:10a6:20b:244::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.16; Wed, 5 Mar 2025 22:39:08 +0000 Received: from AMS0EPF00000198.eurprd05.prod.outlook.com (2603:10a6:20b:491:cafe::48) by AS9PR05CA0318.outlook.office365.com (2603:10a6:20b:491::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.16 via Frontend Transport; Wed, 5 Mar 2025 22:39:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.20) 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.2.20 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.20; helo=fihe3nok0734.emea.nsn-net.net; pr=C Received: from fihe3nok0734.emea.nsn-net.net (131.228.2.20) by AMS0EPF00000198.mail.protection.outlook.com (10.167.16.244) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Wed, 5 Mar 2025 22:39:08 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fihe3nok0734.emea.nsn-net.net (Postfix) with ESMTP id 0EC75251D4; Thu, 6 Mar 2025 00:39:07 +0200 (EET) From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, dsahern@gmail.com, davem@davemloft.net, edumazet@google.com, dsahern@kernel.org, pabeni@redhat.com, joel.granados@kernel.org, kuba@kernel.org, andrew+netdev@lunn.ch, horms@kernel.org, pablo@netfilter.org, kadlec@netfilter.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, kory.maincent@bootlin.com, bpf@vger.kernel.org, kuniyu@amazon.com, andrew@lunn.ch, 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 v7 net-next 10/12] tcp: AccECN support to tcp_add_backlog Date: Wed, 5 Mar 2025 23:38:50 +0100 Message-Id: <20250305223852.85839-11-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250305223852.85839-1-chia-yu.chang@nokia-bell-labs.com> References: <20250305223852.85839-1-chia-yu.chang@nokia-bell-labs.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF00000198:EE_|AM8PR07MB7649:EE_ X-MS-Office365-Filtering-Correlation-Id: 9588c3d2-ee94-4931-f622-08dd5c368b1a 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|82310400026|1800799024|36860700013|7416014|376014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?Avf4mZA/w4J8mVBQhYBFARqAivMgMkS?= =?utf-8?q?IaED5l7Vz0UISO0XUtLEKGIU0KiZdSLjRlpoFOReEZ/L6aXb8L1+FfIazAxHzjd7V?= =?utf-8?q?dKJ6SUDdKElcMtLM/0esKjrY2zyJs0uZjITpYrR7nMtHm749M7GMu4UPXAfASjhHT?= =?utf-8?q?NBeZ46QcBA+bNLk5EBySDqMmHDKXTCekjj42UBMwyvxOV24GRFbKn+CsIHG/16oNr?= =?utf-8?q?a5QlKnbWDZtASj0WMzrxdwHmfohDODmvogP6l3SKRBr/a1Fl9R2RBt+/EFMlInPx7?= =?utf-8?q?AfOlFT3uWFFjaDcHI/0bEe1/M6w0YCPSOOV8YLiTsBCzfbUPdOq6Pw/3bhOJE/myV?= =?utf-8?q?ItSAAnxc3BRIohf0aiuf0H7cfm0kWxlrDWPe9Ij6EaTJM+GqgL0GVNUwuhf3BzOcY?= =?utf-8?q?Wbc7CjIlaWem98fqyW9WeV5bukT+rEEGX5cSgRBJfHbzoT79pNknGZ2cCt+cgoLPE?= =?utf-8?q?FGHVReGUcWX6TNbqN+091RNhHpwFZWqyGzUo9/DpYkuRRXR7PIK+z+wJXra5fEyve?= =?utf-8?q?VLBgucSFaMbsGtzcINZpIAXaqBy++oH7eV8GceEsLvHbzhvmWLouRd0yrMB1s4Wsp?= =?utf-8?q?KBxN1POMwJ1r/dv/ZBV34dSKSJqQwPJkvk7G1Ap6n9AofFAq/2kkYxz3k48Xhzj9f?= =?utf-8?q?MvpOKe6z9Q8jy9tbKLZTM8Io/xTe+ffrlEYg2w5iMZX3d2F+yNpXM6r+OGYLMGOgD?= =?utf-8?q?MoIEPExH60rj4G9hiV8dGl6k+9TcMaSzDfwFd5KkYKYBIv/q7wx/HVr85RUt9AF+1?= =?utf-8?q?A3l74r9nUxo2DDzZ9HyL7C0u/qcPTJyj+4/N+WEoAmD+k+DXVvuEmPjlieAeFq5bO?= =?utf-8?q?Ox2PY0rmwu7I208U7QuqZEq6zbx2CifJq39EJJcXcyy6VCsv9FYXsQE9WK4+R7jSj?= =?utf-8?q?VKl9FhXRlJGkQC8H+gywgzhoV1XYGRU90aficPNtA2/MVQN5iRlFKPWqnNqtUjR9S?= =?utf-8?q?Zx5iQ4+DT2pCc4JEMHG8V2iP8sQlfASPHPj+sbzsmgUSwIa/Lf2RmXMK7nr85Rd2D?= =?utf-8?q?f57pAZycthRQa5tEgZpxSbCoU+vSxBKjLG1HSnJhr5tj1A2fC7i8QpS7k9FjjV9BK?= =?utf-8?q?Zzt0zmTn/Z/XojU3b0vbhnfgu4xkBoDBGbszJQnhCLI/QZ0m5VO3ufzhqflE0EJYf?= =?utf-8?q?CziAYq/5g2c9C6ZZpfPZyTHx/G33atLolWLIAYh1aKLXTkUMjLNmnThs1kQ2irV5F?= =?utf-8?q?shg4D1cu4LzrTBw05Mp4dIgd+ZfjBE4kU6pKCDWV8RULJ08ce2bFLz31FRxM4jBNG?= =?utf-8?q?IehSZPbIVhi+DaT7rDkUQSnBClqmam6ucKKR8AsqwIvMzK8xerhghel4en/Zw0uki?= =?utf-8?q?UjVxh/oNV59b5KV9zQMNMfpLAG8rTgtVU68AVrp/4g2loJX4PcVXVynxuYcOnRvxl?= =?utf-8?q?nsxk1KlSfPE6PDC9TjHBnRUb7Inw+mTr5nJLHfMeCxqWRqmKe7gMSyBXD8jki6vQv?= =?utf-8?q?dtE1Hfvm22?= X-Forefront-Antispam-Report: CIP:131.228.2.20;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0734.emea.nsn-net.net;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: 05 Mar 2025 22:39:08.7486 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9588c3d2-ee94-4931-f622-08dd5c368b1a X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0;Ip=[131.228.2.20];Helo=[fihe3nok0734.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF00000198.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR07MB7649 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 Reviewed-by: Eric Dumazet --- net/ipv4/tcp_ipv4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index fab684221bf7..87f270ebc635 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2051,7 +2051,8 @@ 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)))