Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net-timestamp: namespacify the sysctl_tstamp_allow_data

Let it be tuned in per netns by admins.

Signed-off-by: Jason Xing <kernelxing@tencent.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20241005222609.94980-1-kerneljasonxing@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Jason Xing and committed by
Jakub Kicinski
da5e06de ada5c322

+12 -14
+1
include/net/netns/core.h
··· 15 15 int sysctl_somaxconn; 16 16 int sysctl_optmem_max; 17 17 u8 sysctl_txrehash; 18 + u8 sysctl_tstamp_allow_data; 18 19 19 20 #ifdef CONFIG_PROC_FS 20 21 struct prot_inuse __percpu *prot_inuse;
-2
include/net/sock.h
··· 2824 2824 extern __u32 sysctl_wmem_max; 2825 2825 extern __u32 sysctl_rmem_max; 2826 2826 2827 - extern int sysctl_tstamp_allow_data; 2828 - 2829 2827 extern __u32 sysctl_wmem_default; 2830 2828 extern __u32 sysctl_rmem_default; 2831 2829
+1
net/core/net_namespace.c
··· 317 317 */ 318 318 net->core.sysctl_optmem_max = 128 * 1024; 319 319 net->core.sysctl_txrehash = SOCK_TXREHASH_ENABLED; 320 + net->core.sysctl_tstamp_allow_data = 1; 320 321 } 321 322 322 323 /* init code that must occur even if setup_net() is not called. */
+1 -1
net/core/skbuff.c
··· 5506 5506 { 5507 5507 bool ret; 5508 5508 5509 - if (likely(READ_ONCE(sysctl_tstamp_allow_data) || tsonly)) 5509 + if (likely(tsonly || READ_ONCE(sock_net(sk)->core.sysctl_tstamp_allow_data))) 5510 5510 return true; 5511 5511 5512 5512 read_lock_bh(&sk->sk_callback_lock);
-2
net/core/sock.c
··· 286 286 __u32 sysctl_wmem_default __read_mostly = SK_WMEM_MAX; 287 287 __u32 sysctl_rmem_default __read_mostly = SK_RMEM_MAX; 288 288 289 - int sysctl_tstamp_allow_data __read_mostly = 1; 290 - 291 289 DEFINE_STATIC_KEY_FALSE(memalloc_socks_key); 292 290 EXPORT_SYMBOL_GPL(memalloc_socks_key); 293 291
+9 -9
net/core/sysctl_net_core.c
··· 491 491 .mode = 0644, 492 492 .proc_handler = proc_dointvec, 493 493 }, 494 - { 495 - .procname = "tstamp_allow_data", 496 - .data = &sysctl_tstamp_allow_data, 497 - .maxlen = sizeof(int), 498 - .mode = 0644, 499 - .proc_handler = proc_dointvec_minmax, 500 - .extra1 = SYSCTL_ZERO, 501 - .extra2 = SYSCTL_ONE 502 - }, 503 494 #ifdef CONFIG_RPS 504 495 { 505 496 .procname = "rps_sock_flow_entries", ··· 655 664 .extra1 = SYSCTL_ZERO, 656 665 .extra2 = SYSCTL_ONE, 657 666 .proc_handler = proc_dou8vec_minmax, 667 + }, 668 + { 669 + .procname = "tstamp_allow_data", 670 + .data = &init_net.core.sysctl_tstamp_allow_data, 671 + .maxlen = sizeof(u8), 672 + .mode = 0644, 673 + .proc_handler = proc_dou8vec_minmax, 674 + .extra1 = SYSCTL_ZERO, 675 + .extra2 = SYSCTL_ONE 658 676 }, 659 677 /* sysctl_core_net_init() will set the values after this 660 678 * to readonly in network namespaces