Commit c51da3f7 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

net: remove sock_i_uid() 



Difference between sock_i_uid() and sk_uid() is that
after sock_orphan(), sock_i_uid() returns GLOBAL_ROOT_UID
while sk_uid() returns the last cached sk->sk_uid value.

None of sock_i_uid() callers care about this.

Use sk_uid() which is much faster and inlined.

Note that diag/dump users are calling sock_i_ino() and
can not see the full benefit yet.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Lorenzo Colitti <lorenzo@google.com>
Reviewed-by: default avatarMaciej Żenczykowski <maze@google.com>
Link: https://patch.msgid.link/20250620133001.4090592-3-edumazet@google.com


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

include/net/sock.h

+0 −2
Original line number Diff line number Diff line
@@ -2092,8 +2092,6 @@ static inline void sock_graft(struct sock *sk, struct socket *parent) 
	write_unlock_bh(&sk->sk_callback_lock);

}



kuid_t sock_i_uid(struct sock *sk);



static inline kuid_t sk_uid(const struct sock *sk)

{

	/* Paired with WRITE_ONCE() in sockfs_setattr() */

net/appletalk/atalk_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int atalk_seq_socket_show(struct seq_file *seq, void *v) 
		   sk_wmem_alloc_get(s),

		   sk_rmem_alloc_get(s),

		   s->sk_state,

		   from_kuid_munged(seq_user_ns(seq), sock_i_uid(s)));

		   from_kuid_munged(seq_user_ns(seq), sk_uid(s)));

out:

	return 0;

}

net/bluetooth/af_bluetooth.c

+1 −1
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ static int bt_seq_show(struct seq_file *seq, void *v) 
			   refcount_read(&sk->sk_refcnt),

			   sk_rmem_alloc_get(sk),

			   sk_wmem_alloc_get(sk),

			   from_kuid(seq_user_ns(seq), sock_i_uid(sk)),

			   from_kuid(seq_user_ns(seq), sk_uid(sk)),

			   sock_i_ino(sk),

			   bt->parent ? sock_i_ino(bt->parent) : 0LU);

net/core/sock.c

+0 −11
Original line number Diff line number Diff line
@@ -2780,17 +2780,6 @@ void sock_pfree(struct sk_buff *skb) 
EXPORT_SYMBOL(sock_pfree);

#endif /* CONFIG_INET */



kuid_t sock_i_uid(struct sock *sk)

{

	kuid_t uid;



	read_lock_bh(&sk->sk_callback_lock);

	uid = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_uid : GLOBAL_ROOT_UID;

	read_unlock_bh(&sk->sk_callback_lock);

	return uid;

}

EXPORT_SYMBOL(sock_i_uid);



unsigned long __sock_i_ino(struct sock *sk)

{

	unsigned long ino;

net/ipv4/inet_connection_sock.c

+12 −15
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static bool inet_use_bhash2_on_bind(const struct sock *sk) 
}



static bool inet_bind_conflict(const struct sock *sk, struct sock *sk2,

			       kuid_t sk_uid, bool relax,

			       kuid_t uid, bool relax,

			       bool reuseport_cb_ok, bool reuseport_ok)

{

	int bound_dev_if2;
@@ -185,12 +185,12 @@ static bool inet_bind_conflict(const struct sock *sk, struct sock *sk2, 
			if (!relax || (!reuseport_ok && sk->sk_reuseport &&

				       sk2->sk_reuseport && reuseport_cb_ok &&

				       (sk2->sk_state == TCP_TIME_WAIT ||

					uid_eq(sk_uid, sock_i_uid(sk2)))))

					uid_eq(uid, sk_uid(sk2)))))

				return true;

		} else if (!reuseport_ok || !sk->sk_reuseport ||

			   !sk2->sk_reuseport || !reuseport_cb_ok ||

			   (sk2->sk_state != TCP_TIME_WAIT &&

			    !uid_eq(sk_uid, sock_i_uid(sk2)))) {

			    !uid_eq(uid, sk_uid(sk2)))) {

			return true;

		}

	}
@@ -198,7 +198,7 @@ static bool inet_bind_conflict(const struct sock *sk, struct sock *sk2, 
}



static bool __inet_bhash2_conflict(const struct sock *sk, struct sock *sk2,

				   kuid_t sk_uid, bool relax,

				   kuid_t uid, bool relax,

				   bool reuseport_cb_ok, bool reuseport_ok)

{

	if (ipv6_only_sock(sk2)) {
@@ -211,20 +211,20 @@ static bool __inet_bhash2_conflict(const struct sock *sk, struct sock *sk2, 
#endif

	}



	return inet_bind_conflict(sk, sk2, sk_uid, relax,

	return inet_bind_conflict(sk, sk2, uid, relax,

				  reuseport_cb_ok, reuseport_ok);

}



static bool inet_bhash2_conflict(const struct sock *sk,

				 const struct inet_bind2_bucket *tb2,

				 kuid_t sk_uid,

				 kuid_t uid,

				 bool relax, bool reuseport_cb_ok,

				 bool reuseport_ok)

{

	struct sock *sk2;



	sk_for_each_bound(sk2, &tb2->owners) {

		if (__inet_bhash2_conflict(sk, sk2, sk_uid, relax,

		if (__inet_bhash2_conflict(sk, sk2, uid, relax,

					   reuseport_cb_ok, reuseport_ok))

			return true;

	}
@@ -242,8 +242,8 @@ static int inet_csk_bind_conflict(const struct sock *sk, 
				  const struct inet_bind2_bucket *tb2, /* may be null */

				  bool relax, bool reuseport_ok)

{

	kuid_t uid = sock_i_uid((struct sock *)sk);

	struct sock_reuseport *reuseport_cb;

	kuid_t uid = sk_uid(sk);

	bool reuseport_cb_ok;

	struct sock *sk2;
@@ -287,11 +287,11 @@ static int inet_csk_bind_conflict(const struct sock *sk, 
static bool inet_bhash2_addr_any_conflict(const struct sock *sk, int port, int l3mdev,

					  bool relax, bool reuseport_ok)

{

	kuid_t uid = sock_i_uid((struct sock *)sk);

	const struct net *net = sock_net(sk);

	struct sock_reuseport *reuseport_cb;

	struct inet_bind_hashbucket *head2;

	struct inet_bind2_bucket *tb2;

	kuid_t uid = sk_uid(sk);

	bool conflict = false;

	bool reuseport_cb_ok;
@@ -425,15 +425,13 @@ inet_csk_find_open_port(const struct sock *sk, struct inet_bind_bucket **tb_ret, 
static inline int sk_reuseport_match(struct inet_bind_bucket *tb,

				     struct sock *sk)

{

	kuid_t uid = sock_i_uid(sk);



	if (tb->fastreuseport <= 0)

		return 0;

	if (!sk->sk_reuseport)

		return 0;

	if (rcu_access_pointer(sk->sk_reuseport_cb))

		return 0;

	if (!uid_eq(tb->fastuid, uid))

	if (!uid_eq(tb->fastuid, sk_uid(sk)))

		return 0;

	/* We only need to check the rcv_saddr if this tb was once marked

	 * without fastreuseport and then was reset, as we can only know that
@@ -458,14 +456,13 @@ static inline int sk_reuseport_match(struct inet_bind_bucket *tb, 
void inet_csk_update_fastreuse(struct inet_bind_bucket *tb,

			       struct sock *sk)

{

	kuid_t uid = sock_i_uid(sk);

	bool reuse = sk->sk_reuse && sk->sk_state != TCP_LISTEN;



	if (hlist_empty(&tb->bhash2)) {

		tb->fastreuse = reuse;

		if (sk->sk_reuseport) {

			tb->fastreuseport = FASTREUSEPORT_ANY;

			tb->fastuid = uid;

			tb->fastuid = sk_uid(sk);

			tb->fast_rcv_saddr = sk->sk_rcv_saddr;

			tb->fast_ipv6_only = ipv6_only_sock(sk);

			tb->fast_sk_family = sk->sk_family;
@@ -492,7 +489,7 @@ void inet_csk_update_fastreuse(struct inet_bind_bucket *tb, 
			 */

			if (!sk_reuseport_match(tb, sk)) {

				tb->fastreuseport = FASTREUSEPORT_STRICT;

				tb->fastuid = uid;

				tb->fastuid = sk_uid(sk);

				tb->fast_rcv_saddr = sk->sk_rcv_saddr;

				tb->fast_ipv6_only = ipv6_only_sock(sk);

				tb->fast_sk_family = sk->sk_family;