From 64414277da82dcb26dd03186d4e2c41f280e2be2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 4 Aug 2023 07:22:29 +0000 Subject: [PATCH] Revert "net: Introduce net.ipv4.tcp_migrate_req." This reverts commit cf6c06ac74879726c88fe1ec013727006cdbdd58 which is commit f9ac779f881c2ec3d1cdcd7fa9d4f9442bf60e80 upstream. It breaks the Android abi. If it is required in the future, it can come back in an abi-safe way. Bug: 161946584 Change-Id: Ia4d18c9acdd553b1806ca844c47e34a76f6c6b93 Signed-off-by: Greg Kroah-Hartman --- Documentation/networking/ip-sysctl.rst | 25 ------------------------- include/net/netns/ipv4.h | 1 - net/ipv4/sysctl_net_ipv4.c | 9 --------- 3 files changed, 35 deletions(-) diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst index d0bf386d1239..eedce7474ad3 100644 --- a/Documentation/networking/ip-sysctl.rst +++ b/Documentation/networking/ip-sysctl.rst @@ -711,31 +711,6 @@ tcp_syncookies - INTEGER network connections you can set this knob to 2 to enable unconditionally generation of syncookies. -tcp_migrate_req - BOOLEAN - The incoming connection is tied to a specific listening socket when - the initial SYN packet is received during the three-way handshake. - When a listener is closed, in-flight request sockets during the - handshake and established sockets in the accept queue are aborted. - - If the listener has SO_REUSEPORT enabled, other listeners on the - same port should have been able to accept such connections. This - option makes it possible to migrate such child sockets to another - listener after close() or shutdown(). - - The BPF_SK_REUSEPORT_SELECT_OR_MIGRATE type of eBPF program should - usually be used to define the policy to pick an alive listener. - Otherwise, the kernel will randomly pick an alive listener only if - this option is enabled. - - Note that migration between listeners with different settings may - crash applications. Let's say migration happens from listener A to - B, and only B has TCP_SAVE_SYN enabled. B cannot read SYN data from - the requests migrated from A. To avoid such a situation, cancel - migration by returning SK_DROP in the type of eBPF program, or - disable this option. - - Default: 0 - tcp_fastopen - INTEGER Enable TCP Fast Open (RFC7413) to send and accept data in the opening SYN packet. diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 084ced1e9446..fb94551d03e6 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -133,7 +133,6 @@ struct netns_ipv4 { int sysctl_tcp_syn_retries; int sysctl_tcp_synack_retries; int sysctl_tcp_syncookies; - u8 sysctl_tcp_migrate_req; int sysctl_tcp_reordering; int sysctl_tcp_retries1; int sysctl_tcp_retries2; diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index eb5a96d905b4..3e3542bb8be6 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -884,15 +884,6 @@ static struct ctl_table ipv4_net_table[] = { .proc_handler = proc_dointvec }, #endif - { - .procname = "tcp_migrate_req", - .data = &init_net.ipv4.sysctl_tcp_migrate_req, - .maxlen = sizeof(u8), - .mode = 0644, - .proc_handler = proc_dou8vec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE - }, { .procname = "tcp_reordering", .data = &init_net.ipv4.sysctl_tcp_reordering,