| Message ID | 20240930092416.80830-4-kerneljasonxing@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | net-timestamp: add some trivial | expand |
On Mon, Sep 30, 2024 at 6:47 PM Willem de Bruijn <willemdebruijn.kernel@gmail.com> wrote: > > Jason Xing wrote: > > From: Jason Xing <kernelxing@tencent.com> > > > > Let it be tuned in per netns by admins. > > > > Signed-off-by: Jason Xing <kernelxing@tencent.com> > > +1 on the idea > > > --- > > include/net/netns/core.h | 1 + > > include/net/sock.h | 2 -- > > also remove the static global from sock.c Thanks for pointing this out. > > > net/core/net_namespace.c | 1 + > > net/core/skbuff.c | 2 +- > > net/core/sysctl_net_core.c | 18 +++++++++--------- > > 5 files changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/include/net/netns/core.h b/include/net/netns/core.h > > index 78214f1b43a2..ef8b3105c632 100644 > > --- a/include/net/netns/core.h > > +++ b/include/net/netns/core.h > > @@ -23,6 +23,7 @@ struct netns_core { > > #if IS_ENABLED(CONFIG_RPS) && IS_ENABLED(CONFIG_SYSCTL) > > struct cpumask *rps_default_mask; > > #endif > > + int sysctl_tstamp_allow_data; > > }; > > > > #endif > > diff --git a/include/net/sock.h b/include/net/sock.h > > index c58ca8dd561b..4f31be0fd671 100644 > > --- a/include/net/sock.h > > +++ b/include/net/sock.h > > @@ -2808,8 +2808,6 @@ void sk_get_meminfo(const struct sock *sk, u32 *meminfo); > > 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; > > > > diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c > > index e39479f1c9a4..e78c01912c64 100644 > > --- a/net/core/net_namespace.c > > +++ b/net/core/net_namespace.c > > @@ -317,6 +317,7 @@ 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.sysctl_tstamp_allow_data = 1; > > } > > > > /* init code that must occur even if setup_net() is not called. */ > > diff --git a/net/core/skbuff.c b/net/core/skbuff.c > > index 74149dc4ee31..ad727d924f73 100644 > > --- a/net/core/skbuff.c > > +++ b/net/core/skbuff.c > > @@ -5506,7 +5506,7 @@ static bool skb_may_tx_timestamp(struct sock *sk, bool tsonly) > > { > > bool ret; > > > > - if (likely(READ_ONCE(sysctl_tstamp_allow_data) || tsonly)) > > + if (likely(READ_ONCE(sock_net(sk)->core.sysctl_tstamp_allow_data) || tsonly)) > > return true; > > Let's switch order of the tests here too Got it. Will do it. Thanks, Jason
diff --git a/include/net/netns/core.h b/include/net/netns/core.h index 78214f1b43a2..ef8b3105c632 100644 --- a/include/net/netns/core.h +++ b/include/net/netns/core.h @@ -23,6 +23,7 @@ struct netns_core { #if IS_ENABLED(CONFIG_RPS) && IS_ENABLED(CONFIG_SYSCTL) struct cpumask *rps_default_mask; #endif + int sysctl_tstamp_allow_data; }; #endif diff --git a/include/net/sock.h b/include/net/sock.h index c58ca8dd561b..4f31be0fd671 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2808,8 +2808,6 @@ void sk_get_meminfo(const struct sock *sk, u32 *meminfo); 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; diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index e39479f1c9a4..e78c01912c64 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -317,6 +317,7 @@ 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.sysctl_tstamp_allow_data = 1; } /* init code that must occur even if setup_net() is not called. */ diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 74149dc4ee31..ad727d924f73 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5506,7 +5506,7 @@ static bool skb_may_tx_timestamp(struct sock *sk, bool tsonly) { bool ret; - if (likely(READ_ONCE(sysctl_tstamp_allow_data) || tsonly)) + if (likely(READ_ONCE(sock_net(sk)->core.sysctl_tstamp_allow_data) || tsonly)) return true; read_lock_bh(&sk->sk_callback_lock); diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 86a2476678c4..83622799eb80 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -491,15 +491,6 @@ static struct ctl_table net_core_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { - .procname = "tstamp_allow_data", - .data = &sysctl_tstamp_allow_data, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE - }, #ifdef CONFIG_RPS { .procname = "rps_sock_flow_entries", @@ -665,6 +656,15 @@ static struct ctl_table netns_core_table[] = { .extra2 = SYSCTL_ONE, .proc_handler = proc_dou8vec_minmax, }, + { + .procname = "tstamp_allow_data", + .data = &init_net.core.sysctl_tstamp_allow_data, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE + }, /* sysctl_core_net_init() will set the values after this * to readonly in network namespaces */