@@ -16,6 +16,11 @@ struct netns_core {
int sysctl_optmem_max;
u8 sysctl_txrehash;
+ u32 sysctl_wmem_max;
+ u32 sysctl_rmem_max;
+ u32 sysctl_wmem_default;
+ u32 sysctl_rmem_default;
+
#ifdef CONFIG_PROC_FS
struct prot_inuse __percpu *prot_inuse;
#endif
@@ -2818,14 +2818,8 @@ void sk_get_meminfo(const struct sock *sk, u32 *meminfo);
#define SK_WMEM_MAX (_SK_MEM_OVERHEAD * _SK_MEM_PACKETS)
#define SK_RMEM_MAX (_SK_MEM_OVERHEAD * _SK_MEM_PACKETS)
-extern __u32 sysctl_wmem_max;
-extern __u32 sysctl_rmem_max;
-
extern int sysctl_tstamp_allow_data;
-extern __u32 sysctl_wmem_default;
-extern __u32 sysctl_rmem_default;
-
#define SKB_FRAG_PAGE_ORDER get_order(32768)
DECLARE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key);
@@ -317,6 +317,27 @@ static __net_init void preinit_net_sysctl(struct net *net)
*/
net->core.sysctl_optmem_max = 128 * 1024;
net->core.sysctl_txrehash = SOCK_TXREHASH_ENABLED;
+
+ /*
+ * net.core.{r,w}mem_{default,max} used to be non-namespaced.
+ * For backward compatibility, inherit values from the current netns
+ * when creating a new one, so that setting them in init_net
+ * affects new namespaces like it used to. This avoids causing
+ * surprising performance regressions for namespaced applications
+ * relying on tuned rmem/wmem.
+ */
+ if (net == &init_net) {
+ net->core.sysctl_wmem_max = SK_WMEM_MAX;
+ net->core.sysctl_rmem_max = SK_RMEM_MAX;
+ net->core.sysctl_wmem_default = SK_WMEM_MAX;
+ net->core.sysctl_rmem_default = SK_RMEM_MAX;
+ } else {
+ struct net *current_net = current->nsproxy->net_ns;
+ net->core.sysctl_wmem_max = current_net->core.sysctl_wmem_max;
+ net->core.sysctl_rmem_max = current_net->core.sysctl_rmem_max;
+ net->core.sysctl_wmem_default = current_net->core.sysctl_wmem_default;
+ net->core.sysctl_rmem_default = current_net->core.sysctl_rmem_default;
+ }
}
/* init code that must occur even if setup_net() is not called. */
@@ -278,14 +278,6 @@ static struct lock_class_key af_wlock_keys[AF_MAX];
static struct lock_class_key af_elock_keys[AF_MAX];
static struct lock_class_key af_kern_callback_keys[AF_MAX];
-/* Run time adjustable parameters. */
-__u32 sysctl_wmem_max __read_mostly = SK_WMEM_MAX;
-EXPORT_SYMBOL(sysctl_wmem_max);
-__u32 sysctl_rmem_max __read_mostly = SK_RMEM_MAX;
-EXPORT_SYMBOL(sysctl_rmem_max);
-__u32 sysctl_wmem_default __read_mostly = SK_WMEM_MAX;
-__u32 sysctl_rmem_default __read_mostly = SK_RMEM_MAX;
-
int sysctl_tstamp_allow_data __read_mostly = 1;
DEFINE_STATIC_KEY_FALSE(memalloc_socks_key);
@@ -1322,7 +1314,7 @@ int sk_setsockopt(struct sock *sk, int level, int optname,
* play 'guess the biggest size' games. RCVBUF/SNDBUF
* are treated in BSD as hints
*/
- val = min_t(u32, val, READ_ONCE(sysctl_wmem_max));
+ val = min_t(u32, val, READ_ONCE(sock_net(sk)->core.sysctl_wmem_max));
set_sndbuf:
/* Ensure val * 2 fits into an int, to prevent max_t()
* from treating it as a negative value.
@@ -1354,7 +1346,7 @@ int sk_setsockopt(struct sock *sk, int level, int optname,
* play 'guess the biggest size' games. RCVBUF/SNDBUF
* are treated in BSD as hints
*/
- __sock_set_rcvbuf(sk, min_t(u32, val, READ_ONCE(sysctl_rmem_max)));
+ __sock_set_rcvbuf(sk, min_t(u32, val, READ_ONCE(sock_net(sk)->core.sysctl_rmem_max)));
break;
case SO_RCVBUFFORCE:
@@ -3545,8 +3537,8 @@ void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid)
timer_setup(&sk->sk_timer, NULL, 0);
sk->sk_allocation = GFP_KERNEL;
- sk->sk_rcvbuf = READ_ONCE(sysctl_rmem_default);
- sk->sk_sndbuf = READ_ONCE(sysctl_wmem_default);
+ sk->sk_rcvbuf = READ_ONCE(sock_net(sk)->core.sysctl_rmem_default);
+ sk->sk_sndbuf = READ_ONCE(sock_net(sk)->core.sysctl_wmem_default);
sk->sk_state = TCP_CLOSE;
sk->sk_use_task_frag = true;
sk_set_socket(sk, sock);
@@ -668,12 +668,9 @@ static struct ctl_table netns_core_table[] = {
.extra2 = SYSCTL_ONE,
.proc_handler = proc_dou8vec_minmax,
},
- /* sysctl_core_net_init() will set the values after this
- * to readonly in network namespaces
- */
{
.procname = "wmem_max",
- .data = &sysctl_wmem_max,
+ .data = &init_net.core.sysctl_wmem_max,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
@@ -681,7 +678,7 @@ static struct ctl_table netns_core_table[] = {
},
{
.procname = "rmem_max",
- .data = &sysctl_rmem_max,
+ .data = &init_net.core.sysctl_rmem_max,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
@@ -689,7 +686,7 @@ static struct ctl_table netns_core_table[] = {
},
{
.procname = "wmem_default",
- .data = &sysctl_wmem_default,
+ .data = &init_net.core.sysctl_wmem_default,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
@@ -697,12 +694,13 @@ static struct ctl_table netns_core_table[] = {
},
{
.procname = "rmem_default",
- .data = &sysctl_rmem_default,
+ .data = &init_net.core.sysctl_rmem_default,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = &min_rcvbuf,
},
+ // dummy line to cause merge conflict if this changes
};
static int __init fb_tunnels_only_for_init_net_sysctl_setup(char *str)
@@ -731,13 +729,8 @@ static __net_init int sysctl_core_net_init(struct net *net)
goto err_dup;
for (i = 0; i < table_size; ++i) {
- if (tbl[i].data == &sysctl_wmem_max)
- break;
-
tbl[i].data += (char *)net - (char *)&init_net;
}
- for (; i < table_size; ++i)
- tbl[i].mode &= ~0222;
}
net->core.sysctl_hdr = register_net_sysctl_sz(net, "net/core", tbl, table_size);
@@ -1637,7 +1637,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb,
sk->sk_protocol = ip_hdr(skb)->protocol;
sk->sk_bound_dev_if = arg->bound_dev_if;
- sk->sk_sndbuf = READ_ONCE(sysctl_wmem_default);
+ sk->sk_sndbuf = READ_ONCE(net->core.sysctl_wmem_default);
ipc.sockc.mark = fl4.flowi4_mark;
err = ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base,
len, 0, &ipc, &rt, MSG_DONTWAIT);
@@ -241,7 +241,7 @@ void tcp_select_initial_window(const struct sock *sk, int __space, __u32 mss,
if (wscale_ok) {
/* Set window scaling on max possible window */
space = max_t(u32, space, READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_rmem[2]));
- space = max_t(u32, space, READ_ONCE(sysctl_rmem_max));
+ space = max_t(u32, space, READ_ONCE(sock_net(sk)->core.sysctl_rmem_max));
space = min_t(u32, space, window_clamp);
*rcv_wscale = clamp_t(int, ilog2(space) - 15,
0, TCP_MAX_WSCALE);
@@ -1280,12 +1280,12 @@ static void set_sock_size(struct sock *sk, int mode, int val)
lock_sock(sk);
if (mode) {
val = clamp_t(int, val, (SOCK_MIN_SNDBUF + 1) / 2,
- READ_ONCE(sysctl_wmem_max));
+ READ_ONCE(sock_net(sk)->core.sysctl_wmem_max));
sk->sk_sndbuf = val * 2;
sk->sk_userlocks |= SOCK_SNDBUF_LOCK;
} else {
val = clamp_t(int, val, (SOCK_MIN_RCVBUF + 1) / 2,
- READ_ONCE(sysctl_rmem_max));
+ READ_ONCE(sock_net(sk)->core.sysctl_rmem_max));
sk->sk_rcvbuf = val * 2;
sk->sk_userlocks |= SOCK_RCVBUF_LOCK;
}
This builds on commit 19249c0724f2 ("net: make net.core.{r,w}mem_{default,max} namespaced") by adding support for writing the sysctls from within net namespaces, rather than only reading the values that were set in init_net. These are relatively commonly-used sysctls, so programs may try to set them without knowing that they're in a container. It can be surprising for such attempts to fail with EACCES. Unlike other net sysctls that were converted to namespaced ones, many systems have a sysctl.conf (or other configs) that globally write to net.core.rmem_default on boot and expect the value to propagate to containers, and programs running in containers may depend on the increased buffer sizes in order to work properly. This means that namespacing the sysctls and using the kernel default values in each new netns would break existing workloads. As a compromise, inherit the initial net.core.*mem_* values from the current process' netns when creating a new netns. This is not standard behavior for most netns sysctls, but it avoids breaking existing workloads. Signed-off-by: Danny Lin <danny@orbstack.dev> --- include/net/netns/core.h | 5 +++++ include/net/sock.h | 6 ------ net/core/net_namespace.c | 21 +++++++++++++++++++++ net/core/sock.c | 16 ++++------------ net/core/sysctl_net_core.c | 17 +++++------------ net/ipv4/ip_output.c | 2 +- net/ipv4/tcp_output.c | 2 +- net/netfilter/ipvs/ip_vs_sync.c | 4 ++-- 8 files changed, 39 insertions(+), 34 deletions(-)