Commit da5e06de authored by Jason Xing's avatar Jason Xing Committed by Jakub Kicinski
Browse files

net-timestamp: namespacify the sysctl_tstamp_allow_data 



Let it be tuned in per netns by admins.

Signed-off-by: default avatarJason Xing <kernelxing@tencent.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20241005222609.94980-1-kerneljasonxing@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ada5c322

include/net/netns/core.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct netns_core { 
	int	sysctl_somaxconn;

	int	sysctl_optmem_max;

	u8	sysctl_txrehash;

	u8	sysctl_tstamp_allow_data;



#ifdef CONFIG_PROC_FS

	struct prot_inuse __percpu *prot_inuse;

include/net/sock.h

+0 −2
Original line number Diff line number Diff line
@@ -2824,8 +2824,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;

net/core/net_namespace.c

+1 −0
Original line number Diff line number Diff line
@@ -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. */

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -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(tsonly || READ_ONCE(sock_net(sk)->core.sysctl_tstamp_allow_data)))

		return true;



	read_lock_bh(&sk->sk_callback_lock);

net/core/sock.c

+0 −2
Original line number Diff line number Diff line
@@ -286,8 +286,6 @@ 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);

EXPORT_SYMBOL_GPL(memalloc_socks_key);