From patchwork Tue Oct 15 10:29:01 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: 13836068 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2082.outbound.protection.outlook.com [40.107.22.82]) (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 9B4E51E3DC1 for ; Tue, 15 Oct 2024 10:30:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.82 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728988222; cv=fail; b=jkdV60phUSNJCrsUJJz8MYk4srar6LPiXMgKmp7X/mKX735wy7f2Ks1jfBCZmQgRNUqBakDLg/4XlaUL/eGizvsUThZ+CcmAdIXRRYe80bHWBx1FlIWrjT41Rc6wnx+f5GUU/aOb0ay+ugcnCFqJwqvGAaR+v0hUVdfFTfXp1Nc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728988222; c=relaxed/simple; bh=Hmdtr0We50ejAD355SghSxW3LOTq66I4DTi+GKYgG1U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=o+oPchYFMZ4heBBny4YuCqN1SuzjpDievc2G0K/pIx/O14Pb+MveXaO9X2BZDSXmjqMRvw+CcVi4/9L0XIj075VHHhRvs0gBBNRto8iUYZKZKMBj/fU2BuXJyGltg9pauAfmtTz5/Vz4amShpCDX4WoK6P2Vu4WZkrQgElhYjQs= 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=so6miN1D; arc=fail smtp.client-ip=40.107.22.82 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="so6miN1D" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JGxLq6yowkZG+5MY8XpDMQgKeNqobP01jLLrD7dy25+aRnew+AMRydKcvddOHfoEHrPqXytOkWiyVHWqs9FEZfcX9soeJzN8iVZg9hdRVNBdMuI3Xpen7qPZjrWekkcFBZA0BGf8SZsMzkv9USfk2F0a/VS+ROKdsF17ctNEIMwrjc9F2E9KwFAoc9PmvEqWRuacEltI1k9loolVdX1KfNIGlupjzlSCY22QwtaEUwlXv+S30uZO7ZZ7cFH6Uc/raFJC3rNCe7IwEWB86d7TRJ+wEWh/AMTyCVW6V29Nqnxary7rWV3sHv/e0/MItu8HN+RjqRYoDvysCzoAtcLTsQ== 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=WJtuM1nTfrSpcdQnGQbMn0HkkJCOFzlul0aCRL1BYBc=; b=yV9i011EaE/B3xMfJBfofLgH/mvgpdYFxW6OwWbrmKGo5GTvJD80n94W5wjcriihRtMaBWpxvQhvbJ3SsdjlX0qBjEJD79Ar249Q9/GyWWIvoNKPn/rrK2DMdjEy+FPqx3iWGR5AhH5FLZcm83xiF/QYuVr+x5+T46BTD/0Q+m6GmbTB7qS532OPbyrKa0+DVaBJbrYlPLkRKlNL9x8EuclDxDUKVBe0FA1v6mCt4gCC64UpMB+xtSnJJFdzJo7/CWVau/Az0+IYYZowilInhFw8SJR4Y6qm6djVBkZRlKT/oxNKs4d22niDAJLJL6/DPuXRVXIigk6Q0elr5Av/9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 131.228.6.101) smtp.rcpttodomain=nokia-bell-labs.com smtp.mailfrom=nokia-bell-labs.com; dmarc=temperror 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=WJtuM1nTfrSpcdQnGQbMn0HkkJCOFzlul0aCRL1BYBc=; b=so6miN1D2XlSCpUjOCZSyRqnKsP+k0u+CUgZTMxnBgLzdC/S0rJ0P7m4FOatAet1GI5qagketRTNQFNIp/Snj8Qo9/aVF8a/OB23QBvwcfjDkD0Gt49h8f19nmPmmvBzf3LyvKTzLr1ARBmX4h8vSxHj+u22L90TA0Ts9gF9G+PXtWxsHYEYG7PNBk63b31c1HnbbxY4qTcww2Hi/JJAKrDAh4e9BirS9P5Q8p3N1v3T/MjElD5z8+9bQvQGCbQYnIH5NvnAuz5c9Vdfv50inxfKRb+fetMjukeqodhqeCkXK7k+Qpdsvserj+cFEnOCZXL7fH9SE6eotJ+ziaOATg== Received: from DU2PR04CA0209.eurprd04.prod.outlook.com (2603:10a6:10:28d::34) by VI1PR0701MB6815.eurprd07.prod.outlook.com (2603:10a6:800:199::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27; Tue, 15 Oct 2024 10:30:17 +0000 Received: from DU2PEPF00028D06.eurprd03.prod.outlook.com (2603:10a6:10:28d:cafe::a9) by DU2PR04CA0209.outlook.office365.com (2603:10a6:10:28d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27 via Frontend Transport; Tue, 15 Oct 2024 10:30:17 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 131.228.6.101) smtp.mailfrom=nokia-bell-labs.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=nokia-bell-labs.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of nokia-bell-labs.com: DNS Timeout) Received: from fr712usmtp1.zeu.alcatel-lucent.com (131.228.6.101) by DU2PEPF00028D06.mail.protection.outlook.com (10.167.242.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.17 via Frontend Transport; Tue, 15 Oct 2024 10:30:15 +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 49FATtn9029578; Tue, 15 Oct 2024 10:30:14 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 05/44] tcp: extend TCP flags to allow AE bit/ACE field Date: Tue, 15 Oct 2024 12:29:01 +0200 Message-Id: <20241015102940.26157-6-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: DU2PEPF00028D06:EE_|VI1PR0701MB6815:EE_ X-MS-Office365-Filtering-Correlation-Id: 60af88fb-29c4-49c7-0826-08dced045c1d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|376014|1800799024|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?6zj8MUOtSzogcdFFFvkuYc5LiMR8knE?= =?utf-8?q?k9trDPUBMOjRD2JSTHfGROkR3chGysVonzwKvWJM7ny/jrF5rEUMUlxV+K7ggkC70?= =?utf-8?q?QjmTG+46PwyPDmerq0x+47LWz165sEv8gOszS7TyXNa7OpohH/mgRLvz4I286bAnC?= =?utf-8?q?/U2hHSDA9kdGvlsMp4+ODHfV67LCHqxkWx+fTxZ/DFZlH5kt/5kEZZ5NdkR5SZbse?= =?utf-8?q?vFgjiEUb6p1KQqP5IGYSna6Fn2VtCg21Ug1gTOXsHU/eG4jwCSguQ9ybimzMDZ7+s?= =?utf-8?q?d/6MLYKMocUyr0h57c5YC3uNvJMPA96FUZEvpFFM494TpQQGkfKy1/balgGVvzidw?= =?utf-8?q?XC1WrtYN1jIYI/GN3Znpjax1R0W+E8zA1R6bhmfiXsf/c6dl/ubpC6mg09tJLwFoY?= =?utf-8?q?GUOKIE2NxOSrXvyW9Xw17UdBlyBtdvpNNuHekrLrkktqOSmCau5NdHRYByYnWVCl4?= =?utf-8?q?BpPgOysovCoGLc+LjoJmPSVPVldhFn6fKOQ2StdynnhTlqc/JrpfnxAf2/R8q2YDd?= =?utf-8?q?yBndgyXv0EhTGcpAEICjcNYLU1sl6mlTV8xx8tDvtxDwe6HMjxuwUD8dyBD2DYLiG?= =?utf-8?q?6+2SD5Dq/oOq9iT+5p7j/rKJjbFyXkgCjKMEmePA4JBGGN3+1aGeSJuFKhfgUxZd3?= =?utf-8?q?OeW3Ap4PmLhkfg+O/P4sc0IxDVgXgMY8SXUrf/2infSPOA5U5xl7uSP4JA1hvqXrF?= =?utf-8?q?cmUlLjw6vSbrA4gYFvbs84GMf2pz8m6nCTiCALGgJmBNffUik1aPJJ7Z0HmugjJMX?= =?utf-8?q?z6BqY5eTf0isATMteMqu5hinHinWsmPTmvwZW18xLq09RXIdm2gZeThHtD+Xj/oT5?= =?utf-8?q?/vKQa5tEp0LsmbQT0fJGVz4UqBCJhJDXnHE+p2B7qqbSz8VRn6PerLcm+jGHW+wsk?= =?utf-8?q?eOSEqpcMjSAbP2TmGOIrT329I1HRbPl0tcQ1xhIllMQNd+XkdMwQgl1MLDBmp7+7Q?= =?utf-8?q?CD1+etnbdVO8et69c5fSQHvZs6ZFXDoAAKVgCg6ZIpQlwSG7ANkiQDMJNMylBIrg+?= =?utf-8?q?vItScMnOBzNQwEI4JbbEUhHocz4YBI/Hpokw14+uyjx6vEwKcslnHN2hiSZEKrHui?= =?utf-8?q?itr60oOVKf+xcEjI9s4qvLXReBBowIav87eZ2gB8LqrOZXiXrTbrjDe77dr9TRVeI?= =?utf-8?q?BIk3agOBq0nn4IPJ22dInuW5xnxOuW0sW0sfpIvWoYEzThrbE2GhSMPrhSsyO70TH?= =?utf-8?q?TroXy87mr3GEJX8L6DNDRyp/rhPH7lghoxVl46BXO0X1jEudXxHaK569o2uV7WkPm?= =?utf-8?q?+8guBavKK6RYS5aIqTZtFFnHaWjfMxZytVSE9f0e7iHZt4k5MANRPI3WHkxUfXW2K?= =?utf-8?q?g295nQ303xSZ?= 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)(7416014)(376014)(1800799024)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 10:30:15.6920 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60af88fb-29c4-49c7-0826-08dced045c1d 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: DU2PEPF00028D06.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB6815 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen With AccECN, there's one additional TCP flag to be used (AE) and ACE field that overloads the definition of AE, CWR, and ECE flags. As tcp_flags was previously only 1 byte, the byte-order stuff needs to be added to it's handling. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- include/net/tcp.h | 7 ++++++- include/uapi/linux/tcp.h | 9 ++++++--- net/ipv4/tcp_ipv4.c | 3 ++- net/ipv4/tcp_output.c | 8 ++++---- net/ipv6/tcp_ipv6.c | 3 ++- net/netfilter/nf_log_syslog.c | 8 +++++--- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index bc34b450929c..549fec6681d0 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -920,7 +920,12 @@ static inline u32 tcp_rsk_tsval(const struct tcp_request_sock *treq) #define TCPHDR_URG BIT(5) #define TCPHDR_ECE BIT(6) #define TCPHDR_CWR BIT(7) +#define TCPHDR_AE BIT(8) +#define TCPHDR_FLAGS_MASK (TCPHDR_FIN | TCPHDR_SYN | TCPHDR_RST | \ + TCPHDR_PSH | TCPHDR_ACK | TCPHDR_URG | \ + TCPHDR_ECE | TCPHDR_CWR | TCPHDR_AE) +#define TCPHDR_ACE (TCPHDR_ECE | TCPHDR_CWR | TCPHDR_AE) #define TCPHDR_SYN_ECN (TCPHDR_SYN | TCPHDR_ECE | TCPHDR_CWR) /* State flags for sacked in struct tcp_skb_cb */ @@ -955,7 +960,7 @@ struct tcp_skb_cb { u16 tcp_gso_size; }; }; - __u8 tcp_flags; /* TCP header flags. (tcp[13]) */ + __u16 tcp_flags; /* TCP header flags. (tcp[12-13]) */ __u8 sacked; /* State flags for SACK. */ __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */ diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index dbf896f3146c..3fe08d7dddaf 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -28,7 +28,8 @@ struct tcphdr { __be32 seq; __be32 ack_seq; #if defined(__LITTLE_ENDIAN_BITFIELD) - __u16 res1:4, + __u16 ae:1, + res1:3, doff:4, fin:1, syn:1, @@ -40,7 +41,8 @@ struct tcphdr { cwr:1; #elif defined(__BIG_ENDIAN_BITFIELD) __u16 doff:4, - res1:4, + res1:3, + ae:1, cwr:1, ece:1, urg:1, @@ -70,6 +72,7 @@ union tcp_word_hdr { #define tcp_flag_word(tp) (((union tcp_word_hdr *)(tp))->words[3]) enum { + TCP_FLAG_AE = __constant_cpu_to_be32(0x01000000), TCP_FLAG_CWR = __constant_cpu_to_be32(0x00800000), TCP_FLAG_ECE = __constant_cpu_to_be32(0x00400000), TCP_FLAG_URG = __constant_cpu_to_be32(0x00200000), @@ -78,7 +81,7 @@ enum { TCP_FLAG_RST = __constant_cpu_to_be32(0x00040000), TCP_FLAG_SYN = __constant_cpu_to_be32(0x00020000), TCP_FLAG_FIN = __constant_cpu_to_be32(0x00010000), - TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0F000000), + TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0E000000), TCP_DATA_OFFSET = __constant_cpu_to_be32(0xF0000000) }; diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 9d3dd101ea71..9fe314a59240 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2162,7 +2162,8 @@ static void tcp_v4_fill_cb(struct sk_buff *skb, const struct iphdr *iph, TCP_SKB_CB(skb)->end_seq = (TCP_SKB_CB(skb)->seq + th->syn + th->fin + skb->len - th->doff * 4); TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq); - TCP_SKB_CB(skb)->tcp_flags = tcp_flag_byte(th); + TCP_SKB_CB(skb)->tcp_flags = ntohs(*(__be16 *)&tcp_flag_word(th)) & + TCPHDR_FLAGS_MASK; TCP_SKB_CB(skb)->ip_dsfield = ipv4_get_dsfield(iph); TCP_SKB_CB(skb)->sacked = 0; TCP_SKB_CB(skb)->has_rxtstamp = diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 054244ce5117..45cb67c635be 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -400,7 +400,7 @@ static void tcp_ecn_send(struct sock *sk, struct sk_buff *skb, /* Constructs common control bits of non-data skb. If SYN/FIN is present, * auto increment end seqno. */ -static void tcp_init_nondata_skb(struct sk_buff *skb, u32 seq, u8 flags) +static void tcp_init_nondata_skb(struct sk_buff *skb, u32 seq, u16 flags) { skb->ip_summed = CHECKSUM_PARTIAL; @@ -1382,7 +1382,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, th->seq = htonl(tcb->seq); th->ack_seq = htonl(rcv_nxt); *(((__be16 *)th) + 6) = htons(((tcp_header_size >> 2) << 12) | - tcb->tcp_flags); + (tcb->tcp_flags & TCPHDR_FLAGS_MASK)); th->check = 0; th->urg_ptr = 0; @@ -1604,7 +1604,7 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue, int old_factor; long limit; int nlen; - u8 flags; + u16 flags; if (WARN_ON(len > skb->len)) return -EINVAL; @@ -2159,7 +2159,7 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, { int nlen = skb->len - len; struct sk_buff *buff; - u8 flags; + u16 flags; /* All of a TSO frame must be composed of paged data. */ DEBUG_NET_WARN_ON_ONCE(skb->len != skb->data_len); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 597920061a3a..252d3dac3a09 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1737,7 +1737,8 @@ static void tcp_v6_fill_cb(struct sk_buff *skb, const struct ipv6hdr *hdr, TCP_SKB_CB(skb)->end_seq = (TCP_SKB_CB(skb)->seq + th->syn + th->fin + skb->len - th->doff*4); TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq); - TCP_SKB_CB(skb)->tcp_flags = tcp_flag_byte(th); + TCP_SKB_CB(skb)->tcp_flags = ntohs(*(__be16 *)&tcp_flag_word(th)) & + TCPHDR_FLAGS_MASK; TCP_SKB_CB(skb)->ip_dsfield = ipv6_get_dsfield(hdr); TCP_SKB_CB(skb)->sacked = 0; TCP_SKB_CB(skb)->has_rxtstamp = diff --git a/net/netfilter/nf_log_syslog.c b/net/netfilter/nf_log_syslog.c index 58402226045e..86d5fc5d28e3 100644 --- a/net/netfilter/nf_log_syslog.c +++ b/net/netfilter/nf_log_syslog.c @@ -216,7 +216,9 @@ nf_log_dump_tcp_header(struct nf_log_buf *m, /* Max length: 9 "RES=0x3C " */ nf_log_buf_add(m, "RES=0x%02x ", (u_int8_t)(ntohl(tcp_flag_word(th) & TCP_RESERVED_BITS) >> 22)); - /* Max length: 32 "CWR ECE URG ACK PSH RST SYN FIN " */ + /* Max length: 35 "AE CWR ECE URG ACK PSH RST SYN FIN " */ + if (th->ae) + nf_log_buf_add(m, "AE "); if (th->cwr) nf_log_buf_add(m, "CWR "); if (th->ece) @@ -516,7 +518,7 @@ dump_ipv4_packet(struct net *net, struct nf_log_buf *m, /* Proto Max log string length */ /* IP: 40+46+6+11+127 = 230 */ - /* TCP: 10+max(25,20+30+13+9+32+11+127) = 252 */ + /* TCP: 10+max(25,20+30+13+9+35+11+127) = 255 */ /* UDP: 10+max(25,20) = 35 */ /* UDPLITE: 14+max(25,20) = 39 */ /* ICMP: 11+max(25, 18+25+max(19,14,24+3+n+10,3+n+10)) = 91+n */ @@ -526,7 +528,7 @@ dump_ipv4_packet(struct net *net, struct nf_log_buf *m, /* (ICMP allows recursion one level deep) */ /* maxlen = IP + ICMP + IP + max(TCP,UDP,ICMP,unknown) */ - /* maxlen = 230+ 91 + 230 + 252 = 803 */ + /* maxlen = 230+ 91 + 230 + 255 = 806 */ } static noinline_for_stack void