Commit 22d6c9ee authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

net: Unexport shared functions for DCCP. 



DCCP was removed, so many inet functions no longer need to
be exported.

Let's unexport or use EXPORT_IPV6_MOD() for such functions.

sk_free_unlock_clone() is inlined in sk_clone_lock() as it's
the only caller.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250410023921.11307-4-kuniyu@amazon.com


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

include/net/sock.h

+0 −1
Original line number Diff line number Diff line
@@ -1781,7 +1781,6 @@ void sk_free(struct sock *sk); 
void sk_net_refcnt_upgrade(struct sock *sk);

void sk_destruct(struct sock *sk);

struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority);

void sk_free_unlock_clone(struct sock *sk);



struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force,

			     gfp_t priority);

net/core/sock.c

+14 −18
Original line number Diff line number Diff line
@@ -2494,17 +2494,14 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) 
		 */

		if (!is_charged)

			RCU_INIT_POINTER(newsk->sk_filter, NULL);

		sk_free_unlock_clone(newsk);

		newsk = NULL;

		goto out;



		goto free;

	}



	RCU_INIT_POINTER(newsk->sk_reuseport_cb, NULL);



	if (bpf_sk_storage_clone(sk, newsk)) {

		sk_free_unlock_clone(newsk);

		newsk = NULL;

		goto out;

	}

	if (bpf_sk_storage_clone(sk, newsk))

		goto free;



	/* Clear sk_user_data if parent had the pointer tagged

	 * as not suitable for copying when cloning.
@@ -2534,18 +2531,17 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) 
		net_enable_timestamp();

out:

	return newsk;

}

EXPORT_SYMBOL_GPL(sk_clone_lock);



void sk_free_unlock_clone(struct sock *sk)

{

free:

	/* It is still raw copy of parent, so invalidate

	 * destructor and make plain sk_free() */

	sk->sk_destruct = NULL;

	bh_unlock_sock(sk);

	sk_free(sk);

	 * destructor and make plain sk_free()

	 */

	newsk->sk_destruct = NULL;

	bh_unlock_sock(newsk);

	sk_free(newsk);

	newsk = NULL;

	goto out;

}

EXPORT_SYMBOL_GPL(sk_free_unlock_clone);

EXPORT_SYMBOL_GPL(sk_clone_lock);



static u32 sk_dst_gso_max_size(struct sock *sk, struct dst_entry *dst)

{

net/ipv4/inet_connection_sock.c

+1 −11
Original line number Diff line number Diff line
@@ -767,7 +767,6 @@ void inet_csk_init_xmit_timers(struct sock *sk, 
	timer_setup(&sk->sk_timer, keepalive_handler, 0);

	icsk->icsk_pending = icsk->icsk_ack.pending = 0;

}

EXPORT_SYMBOL(inet_csk_init_xmit_timers);



void inet_csk_clear_xmit_timers(struct sock *sk)

{
@@ -780,7 +779,6 @@ void inet_csk_clear_xmit_timers(struct sock *sk) 
	sk_stop_timer(sk, &icsk->icsk_delack_timer);

	sk_stop_timer(sk, &sk->sk_timer);

}

EXPORT_SYMBOL(inet_csk_clear_xmit_timers);



void inet_csk_clear_xmit_timers_sync(struct sock *sk)

{
@@ -831,7 +829,6 @@ struct dst_entry *inet_csk_route_req(const struct sock *sk, 
	__IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);

	return NULL;

}

EXPORT_SYMBOL_GPL(inet_csk_route_req);



struct dst_entry *inet_csk_route_child_sock(const struct sock *sk,

					    struct sock *newsk,
@@ -898,7 +895,6 @@ int inet_rtx_syn_ack(const struct sock *parent, struct request_sock *req) 
		req->num_retrans++;

	return err;

}

EXPORT_SYMBOL(inet_rtx_syn_ack);



static struct request_sock *

reqsk_alloc_noprof(const struct request_sock_ops *ops, struct sock *sk_listener,
@@ -1058,14 +1054,13 @@ bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req) 
{

	return __inet_csk_reqsk_queue_drop(sk, req, false);

}

EXPORT_SYMBOL(inet_csk_reqsk_queue_drop);



void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req)

{

	inet_csk_reqsk_queue_drop(sk, req);

	reqsk_put(req);

}

EXPORT_SYMBOL(inet_csk_reqsk_queue_drop_and_put);

EXPORT_IPV6_MOD(inet_csk_reqsk_queue_drop_and_put);



static void reqsk_timer_handler(struct timer_list *t)

{
@@ -1209,7 +1204,6 @@ bool inet_csk_reqsk_queue_hash_add(struct sock *sk, struct request_sock *req, 
	inet_csk_reqsk_queue_added(sk);

	return true;

}

EXPORT_SYMBOL_GPL(inet_csk_reqsk_queue_hash_add);



static void inet_clone_ulp(const struct request_sock *req, struct sock *newsk,

			   const gfp_t priority)
@@ -1290,7 +1284,6 @@ struct sock *inet_csk_clone_lock(const struct sock *sk, 


	return newsk;

}

EXPORT_SYMBOL_GPL(inet_csk_clone_lock);



/*

 * At this point, there should be no process reference to this
@@ -1380,7 +1373,6 @@ int inet_csk_listen_start(struct sock *sk) 
	inet_sk_set_state(sk, TCP_CLOSE);

	return err;

}

EXPORT_SYMBOL_GPL(inet_csk_listen_start);



static void inet_child_forget(struct sock *sk, struct request_sock *req,

			      struct sock *child)
@@ -1475,7 +1467,6 @@ struct sock *inet_csk_complete_hashdance(struct sock *sk, struct sock *child, 
	sock_put(child);

	return NULL;

}

EXPORT_SYMBOL(inet_csk_complete_hashdance);



/*

 *	This routine closes sockets which have been at least partially
@@ -1590,4 +1581,3 @@ struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu) 
out:

	return dst;

}
 
EXPORT_SYMBOL_GPL(inet_csk_update_pmtu);

net/ipv4/inet_hashtables.c

+5 −11
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ bool inet_ehash_nolisten(struct sock *sk, struct sock *osk, bool *found_dup_sk) 
	}

	return ok;

}

EXPORT_SYMBOL_GPL(inet_ehash_nolisten);

EXPORT_IPV6_MOD(inet_ehash_nolisten);



static int inet_reuseport_add_sock(struct sock *sk,

				   struct inet_listen_hashbucket *ilb)
@@ -771,7 +771,7 @@ int __inet_hash(struct sock *sk, struct sock *osk) 


	return err;

}

EXPORT_SYMBOL(__inet_hash);

EXPORT_IPV6_MOD(__inet_hash);



int inet_hash(struct sock *sk)

{
@@ -782,7 +782,6 @@ int inet_hash(struct sock *sk) 


	return err;

}

EXPORT_SYMBOL_GPL(inet_hash);



void inet_unhash(struct sock *sk)

{
@@ -823,7 +822,7 @@ void inet_unhash(struct sock *sk) 
		spin_unlock_bh(lock);

	}

}

EXPORT_SYMBOL_GPL(inet_unhash);

EXPORT_IPV6_MOD(inet_unhash);



static bool inet_bind2_bucket_match(const struct inet_bind2_bucket *tb,

				    const struct net *net, unsigned short port,
@@ -982,14 +981,14 @@ int inet_bhash2_update_saddr(struct sock *sk, void *saddr, int family) 
{

	return __inet_bhash2_update_saddr(sk, saddr, family, false);

}

EXPORT_SYMBOL_GPL(inet_bhash2_update_saddr);

EXPORT_IPV6_MOD(inet_bhash2_update_saddr);



void inet_bhash2_reset_saddr(struct sock *sk)

{

	if (!(sk->sk_userlocks & SOCK_BINDADDR_LOCK))

		__inet_bhash2_update_saddr(sk, NULL, 0, true);

}

EXPORT_SYMBOL_GPL(inet_bhash2_reset_saddr);

EXPORT_IPV6_MOD(inet_bhash2_reset_saddr);



/* RFC 6056 3.3.4.  Algorithm 4: Double-Hash Port Selection Algorithm

 * Note that we use 32bit integers (vs RFC 'short integers')
@@ -1214,7 +1213,6 @@ int inet_hash_connect(struct inet_timewait_death_row *death_row, 
	return __inet_hash_connect(death_row, sk, port_offset, hash_port0,

				   __inet_check_established);

}

EXPORT_SYMBOL_GPL(inet_hash_connect);



static void init_hashinfo_lhash2(struct inet_hashinfo *h)

{
@@ -1265,7 +1263,6 @@ int inet_hashinfo2_init_mod(struct inet_hashinfo *h) 
	init_hashinfo_lhash2(h);

	return 0;

}

EXPORT_SYMBOL_GPL(inet_hashinfo2_init_mod);



int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo)

{
@@ -1305,7 +1302,6 @@ int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo) 
	hashinfo->ehash_locks_mask = nblocks - 1;

	return 0;

}

EXPORT_SYMBOL_GPL(inet_ehash_locks_alloc);



struct inet_hashinfo *inet_pernet_hashinfo_alloc(struct inet_hashinfo *hashinfo,

						 unsigned int ehash_entries)
@@ -1341,7 +1337,6 @@ struct inet_hashinfo *inet_pernet_hashinfo_alloc(struct inet_hashinfo *hashinfo, 
err:

	return NULL;

}

EXPORT_SYMBOL_GPL(inet_pernet_hashinfo_alloc);



void inet_pernet_hashinfo_free(struct inet_hashinfo *hashinfo)

{
@@ -1352,4 +1347,3 @@ void inet_pernet_hashinfo_free(struct inet_hashinfo *hashinfo) 
	vfree(hashinfo->ehash);

	kfree(hashinfo);

}
 
EXPORT_SYMBOL_GPL(inet_pernet_hashinfo_free);

net/ipv4/inet_timewait_sock.c

+0 −4
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ void inet_twsk_hashdance_schedule(struct inet_timewait_sock *tw, 
	spin_unlock(lock);

	local_bh_enable();

}

EXPORT_SYMBOL_GPL(inet_twsk_hashdance_schedule);



static void tw_timer_handler(struct timer_list *t)

{
@@ -223,7 +222,6 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, 


	return tw;

}

EXPORT_SYMBOL_GPL(inet_twsk_alloc);



/* These are always called from BH context.  See callers in

 * tcp_input.c to verify this.
@@ -306,7 +304,6 @@ void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo, bool rearm) 
		mod_timer_pending(&tw->tw_timer, jiffies + timeo);

	}

}

EXPORT_SYMBOL_GPL(__inet_twsk_schedule);



/* Remove all non full sockets (TIME_WAIT and NEW_SYN_RECV) for dead netns */

void inet_twsk_purge(struct inet_hashinfo *hashinfo)
@@ -365,4 +362,3 @@ void inet_twsk_purge(struct inet_hashinfo *hashinfo) 
		rcu_read_unlock();

	}

}
 
EXPORT_SYMBOL_GPL(inet_twsk_purge);