mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-14 11:13:53 +02:00
0d2873df15
Manually rebased* generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch Added new backport* generic/backport-5.4/050-gro-fix-napi_gro_frags-Fast-GRO-breakage-due-to-IP-a.patch All others updated automatically. The new backport was included based on this[1] upstream commit that will be mainlined soon. This change is needed because Eric Dumazet's check for NET_IP_ALIGN (landed in 5.4.114) causes huge slowdowns on drivers which use napi_gro_frags(). Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional *Credit to Alexander Lobakin 1. https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=7ad18ff6449cbd6beb26b53128ddf56d2685aa93 Signed-off-by: John Audia <graysky@archlinux.us>
74 lines
2.3 KiB
Diff
74 lines
2.3 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: netfilter: optional tcp window check
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
net/netfilter/nf_conntrack_proto_tcp.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
--- a/net/netfilter/nf_conntrack_proto_tcp.c
|
|
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
|
|
@@ -31,6 +31,9 @@
|
|
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
|
|
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
|
|
|
|
+/* Do not check the TCP window for incoming packets */
|
|
+static int nf_ct_tcp_no_window_check __read_mostly = 1;
|
|
+
|
|
/* "Be conservative in what you do,
|
|
be liberal in what you accept from others."
|
|
If it's non-zero, we mark only out of window RST segments as INVALID. */
|
|
@@ -476,6 +479,9 @@ static bool tcp_in_window(const struct n
|
|
s32 receiver_offset;
|
|
bool res, in_recv_win;
|
|
|
|
+ if (nf_ct_tcp_no_window_check)
|
|
+ return true;
|
|
+
|
|
/*
|
|
* Get the required data from the packet.
|
|
*/
|
|
@@ -1130,7 +1136,7 @@ int nf_conntrack_tcp_packet(struct nf_co
|
|
IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
|
|
timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
|
|
timeout = timeouts[TCP_CONNTRACK_UNACK];
|
|
- else if (ct->proto.tcp.last_win == 0 &&
|
|
+ else if (!nf_ct_tcp_no_window_check && ct->proto.tcp.last_win == 0 &&
|
|
timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
|
|
timeout = timeouts[TCP_CONNTRACK_RETRANS];
|
|
else
|
|
--- a/net/netfilter/nf_conntrack_standalone.c
|
|
+++ b/net/netfilter/nf_conntrack_standalone.c
|
|
@@ -25,6 +25,9 @@
|
|
#include <net/netfilter/nf_conntrack_timestamp.h>
|
|
#include <linux/rculist_nulls.h>
|
|
|
|
+/* Do not check the TCP window for incoming packets */
|
|
+static int nf_ct_tcp_no_window_check __read_mostly = 1;
|
|
+
|
|
static bool enable_hooks __read_mostly;
|
|
MODULE_PARM_DESC(enable_hooks, "Always enable conntrack hooks");
|
|
module_param(enable_hooks, bool, 0000);
|
|
@@ -650,6 +653,7 @@ enum nf_ct_sysctl_index {
|
|
NF_SYSCTL_CT_PROTO_TIMEOUT_GRE_STREAM,
|
|
#endif
|
|
|
|
+ NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK,
|
|
__NF_SYSCTL_CT_LAST_SYSCTL,
|
|
};
|
|
|
|
@@ -976,6 +980,13 @@ static struct ctl_table nf_ct_sysctl_tab
|
|
.proc_handler = proc_dointvec_jiffies,
|
|
},
|
|
#endif
|
|
+ [NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK] = {
|
|
+ .procname = "nf_conntrack_tcp_no_window_check",
|
|
+ .data = &nf_ct_tcp_no_window_check,
|
|
+ .maxlen = sizeof(unsigned int),
|
|
+ .mode = 0644,
|
|
+ .proc_handler = proc_dointvec,
|
|
+ },
|
|
{}
|
|
};
|
|
|