net: add EXPORT_IPV6_MOD()
Subsystems (5)
v2 cover net: add EXPORT_IPV6_MOD()
In this series I am adding EXPORT_IPV6_MOD and EXPORT_IPV6_MOD_GPL() so that we can replace some EXPORT_SYMBOL() when IPV6 is not modular.
This is making all the selected symbols internal to core linux networking.
v2: add feedback from Mateusz, Willem and Sabrina.
v1: https://lore.kernel.org/netdev/[email protected]/T/
Eric Dumazet (4):
net: introduce EXPORT_IPV6_MOD() and EXPORT_IPV6_MOD_GPL()
inetpeer: use EXPORT_IPV6_MOD[_GPL]()
tcp: use EXPORT_IPV6_MOD[_GPL]()
udp: use EXPORT_IPV6_MOD[_GPL]()
include/net/ip.h | 8 +++++ net/core/secure_seq.c | 2 +- net/ipv4/inetpeer.c | 8 ++--- net/ipv4/syncookies.c | 8 ++--- net/ipv4/tcp.c | 44 ++++++++++++++-------------- net/ipv4/tcp_fastopen.c | 2 +- net/ipv4/tcp_input.c | 14 ++++----- net/ipv4/tcp_ipv4.c | 47 +++++++++++++++--------------- net/ipv4/tcp_minisocks.c | 11 ++++--- net/ipv4/tcp_output.c | 12 ++++---- net/ipv4/tcp_timer.c | 4 +-- net/ipv4/udp.c | 63 ++++++++++++++++++++-------------------- 12 files changed, 114 insertions(+), 109 deletions(-)
Signature · 1 line
2.48.1.502.g6dc24dfdaf-goog
PATCH v2 1/4 net: introduce EXPORT_IPV6_MOD() and EXPORT_IPV6_MOD_GPL()
We have many EXPORT_SYMBOL(x) in networking tree because IPv6 can be built as a module.
CONFIG_IPV6=y is becoming the norm.
Define a EXPORT_IPV6_MOD(x) which only exports x
for modular IPv6.
Same principle applies to EXPORT_IPV6_MOD_GPL()
--- include/net/ip.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/net/ip.h +8 -0
@@ -666,6 +666,14 @@ static inline void ip_ipgre_mc_map(__be32 naddr, const unsigned char *broadcast,memcpy (buf, &naddr,sizeof (naddr)); } +#if IS_MODULE (CONFIG_IPV6 ) +#define EXPORT_IPV6_MOD (X ) EXPORT_SYMBOL(X) +#define EXPORT_IPV6_MOD_GPL (X ) EXPORT_SYMBOL_GPL(X) +#else +#define EXPORT_IPV6_MOD (X ) +#define EXPORT_IPV6_MOD_GPL (X ) +#endif +#if IS_ENABLED (CONFIG_IPV6 )#include <linux/ipv6.h> #endif
Signature · 1 line
2.48.1.502.g6dc24dfdaf-goog
Re: [PATCH v2 net-next 1/4] net: introduce EXPORT_IPV6_MOD() and EXPORT_IPV6_MOD_GPL()
From: Eric Dumazet <[email protected]>
Date: Wed, 12 Feb 2025 13:24:15 +0000
Quoted 11 lines
We have many
EXPORT_SYMBOL(x)in networking tree because IPv6 can be built as a module.
CONFIG_IPV6=yis becoming the norm.Define a
EXPORT_IPV6_MOD(x)which only exports x
for modular IPv6.Same principle applies to
EXPORT_IPV6_MOD_GPL()Signed-off-by Eric Dumazet <[email protected]>
Re: [PATCH v2 net-next 1/4] net: introduce EXPORT_IPV6_MOD() and EXPORT_IPV6_MOD_GPL()
In reply to Eric DumazetQuoted 24 lines · Eric Dumazet
We have many
EXPORT_SYMBOL(x)in networking tree because IPv6 can be built as a module.
CONFIG_IPV6=yis becoming the norm.Define a
EXPORT_IPV6_MOD(x)which only exports x
for modular IPv6.Same principle applies to
EXPORT_IPV6_MOD_GPL()Signed-off-by Eric Dumazet <[email protected]>--- include/net/ip.h | 8 ++++++++ 1 file changed, 8 insertions(+)include/net/ip.h +1
-0@@ -666,6 +666,14 @@ static inline void ip_ipgre_mc_map(__be32 naddr, const unsigned char *broadcast,memcpy (buf, &naddr,sizeof (naddr)); } +#if IS_MODULE (CONFIG_IPV6 )
include/net/ip.h static inline void ip_ipgre_mc_map(__be32 naddr, const unsigned char *broadcast, · line 679
Quoted 10 lines
include/net/ip.h +7
-0+#define EXPORT_IPV6_MOD (X ) EXPORT_SYMBOL(X) +#define EXPORT_IPV6_MOD_GPL (X ) EXPORT_SYMBOL_GPL(X) +#else +#define EXPORT_IPV6_MOD (X ) +#define EXPORT_IPV6_MOD_GPL (X ) +#endif +#if IS_ENABLED (CONFIG_IPV6 )#include <linux/ipv6.h> #endif
PATCH v2 2/4 inetpeer: use EXPORT_IPV6_MOD[_GPL]()
In reply to Eric DumazetUse EXPORT_IPV6_MOD[_GPL]() for symbols that do not need to to be exported unless CONFIG_IPV6=m
--- net/ipv4/inetpeer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/ipv4/inetpeer.c +4 -4
@@ -60,7 +60,7 @@ void inet_peer_base_init(struct inet_peer_base *bp)seqlock_init (&bp->lock); bp->total =0 ; } -EXPORT_SYMBOL_GPL (inet_peer_base_init); +EXPORT_IPV6_MOD_GPL (inet_peer_base_init);#define PEER_MAX_GC 32
@@ -218,7 +218,7 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,return p; } -EXPORT_SYMBOL_GPL (inet_getpeer); +EXPORT_IPV6_MOD_GPL (inet_getpeer);void inet_putpeer (struct inet_peer *p) {
@@ -269,7 +269,7 @@ bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout)WRITE_ONCE (peer->rate_tokens, token);return rc; } -EXPORT_SYMBOL (inet_peer_xrlim_allow); +EXPORT_IPV6_MOD (inet_peer_xrlim_allow);void inetpeer_invalidate_tree (struct inet_peer_base *base) {
@@ -286,4 +286,4 @@ void inetpeer_invalidate_tree(struct inet_peer_base *base) base->total =0 ; } -EXPORT_SYMBOL (inetpeer_invalidate_tree); +EXPORT_IPV6_MOD (inetpeer_invalidate_tree);
Signature · 1 line
2.48.1.502.g6dc24dfdaf-goog
Re: [PATCH v2 net-next 2/4] inetpeer: use EXPORT_IPV6_MOD[_GPL]()
From: Eric Dumazet <[email protected]>
Date: Wed, 12 Feb 2025 13:24:16 +0000
Quoted 4 lines
Use EXPORT_IPV6_MOD[_GPL]() for symbols that do not need to to be exported unless
CONFIG_IPV6=mSigned-off-by Eric Dumazet <[email protected]>
Re: [PATCH v2 net-next 2/4] inetpeer: use EXPORT_IPV6_MOD[_GPL]()
In reply to Eric DumazetQuoted 40 lines · Eric Dumazet
Use EXPORT_IPV6_MOD[_GPL]() for symbols that do not need to to be exported unless
CONFIG_IPV6=mSigned-off-by Eric Dumazet <[email protected]>--- net/ipv4/inetpeer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)net/ipv4/inetpeer.c +3
-3@@ -60,7 +60,7 @@ void inet_peer_base_init(struct inet_peer_base *bp)seqlock_init (&bp->lock); bp->total =0 ; } -EXPORT_SYMBOL_GPL (inet_peer_base_init); +EXPORT_IPV6_MOD_GPL (inet_peer_base_init);#define PEER_MAX_GC 32@@ -218,7 +218,7 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,return p; } -EXPORT_SYMBOL_GPL (inet_getpeer); +EXPORT_IPV6_MOD_GPL (inet_getpeer);void inet_putpeer (struct inet_peer *p) {@@ -269,7 +269,7 @@ bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout)WRITE_ONCE (peer->rate_tokens, token);return rc; } -EXPORT_SYMBOL (inet_peer_xrlim_allow); +EXPORT_IPV6_MOD (inet_peer_xrlim_allow);void inetpeer_invalidate_tree (struct inet_peer_base *base) {
net/ipv4/inetpeer.c void inetpeer_invalidate_tree(struct inet_peer_base *base) · line 289
Quoted 5 lines
net/ipv4/inetpeer.c +1
-1@@ -286,4 +286,4 @@ void inetpeer_invalidate_tree(struct inet_peer_base *base) base->total =0 ; } -EXPORT_SYMBOL (inetpeer_invalidate_tree); +EXPORT_IPV6_MOD (inetpeer_invalidate_tree);
PATCH v2 3/4 tcp: use EXPORT_IPV6_MOD[_GPL]()
In reply to Eric DumazetUse EXPORT_IPV6_MOD[_GPL]() for symbols that don't need to be exported unless CONFIG_IPV6=m
tcp_hashinfo and tcp_openreq_init_rwin() are no longer used from any module anyway.
--- net/core/secure_seq.c | 2 +- net/ipv4/syncookies.c | 8 +++---- net/ipv4/tcp.c | 44 ++++++++++++++++++------------------- net/ipv4/tcp_fastopen.c | 2 +- net/ipv4/tcp_input.c | 14 ++++++------ net/ipv4/tcp_ipv4.c | 47 ++++++++++++++++++++-------------------- net/ipv4/tcp_minisocks.c | 11 +++++----- net/ipv4/tcp_output.c | 12 +++++----- net/ipv4/tcp_timer.c | 4 ++-- 9 files changed, 71 insertions(+), 73 deletions(-)
net/core/secure_seq.c +1 -1
@@ -71,7 +71,7 @@ u32 secure_tcpv6_ts_off(const struct net *net,return siphash (&combined,offsetofend (typeof (combined), daddr), &ts_secret); } -EXPORT_SYMBOL (secure_tcpv6_ts_off); +EXPORT_IPV6_MOD (secure_tcpv6_ts_off);u32 secure_tcpv6_seq (const __be32 *saddr,const __be32 *daddr,__be16 sport,__be16 dport)
net/ipv4/syncookies.c +4 -4
@@ -222,7 +222,7 @@ struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb,return NULL ; } -EXPORT_SYMBOL (tcp_get_cookie_sock); +EXPORT_IPV6_MOD (tcp_get_cookie_sock);/* * when syncookies are in effect and tcp timestamps are enabled we stored
@@ -259,7 +259,7 @@ bool cookie_timestamp_decode(const struct net *net,return READ_ONCE (net->ipv4.sysctl_tcp_window_scaling) !=0 ; } -EXPORT_SYMBOL (cookie_timestamp_decode); +EXPORT_IPV6_MOD (cookie_timestamp_decode);static int cookie_tcp_reqsk_init (struct sock *sk,struct sk_buff *skb,struct request_sock *req)
@@ -310,7 +310,7 @@ struct request_sock *cookie_bpf_check(struct sock *sk, struct sk_buff *skb)return req; } -EXPORT_SYMBOL_GPL (cookie_bpf_check); +EXPORT_IPV6_MOD_GPL (cookie_bpf_check);#endif struct request_sock *cookie_tcp_reqsk_alloc(const struct request_sock_ops *ops,
@@ -351,7 +351,7 @@ struct request_sock *cookie_tcp_reqsk_alloc(const struct request_sock_ops *ops,return req; } -EXPORT_SYMBOL_GPL (cookie_tcp_reqsk_alloc); +EXPORT_IPV6_MOD_GPL (cookie_tcp_reqsk_alloc);static struct request_sock *cookie_tcp_check (struct net *net,struct sock *sk,struct sk_buff *skb)
net/ipv4/tcp.c +22 -22
169 lines not on this page · raw message
net/ipv4/tcp_fastopen.c +1 -1
@@ -468,7 +468,7 @@ bool tcp_fastopen_defer_connect(struct sock *sk, int *err) }return false; } -EXPORT_SYMBOL (tcp_fastopen_defer_connect); +EXPORT_IPV6_MOD (tcp_fastopen_defer_connect);/* * The following code block is to deal with middle box issues with TFO:
net/ipv4/tcp_input.c +7 -7
@@ -630,7 +630,7 @@ void tcp_initialize_rcv_mss(struct sock *sk)inet_csk (sk)->icsk_ack.rcv_mss = hint; } -EXPORT_SYMBOL (tcp_initialize_rcv_mss); +EXPORT_IPV6_MOD (tcp_initialize_rcv_mss);/* Receiver "autotuning" code. *
@@ -2891,7 +2891,7 @@ void tcp_simple_retransmit(struct sock *sk)*/ tcp_non_congestion_loss_retransmit (sk); } -EXPORT_SYMBOL (tcp_simple_retransmit); +EXPORT_IPV6_MOD (tcp_simple_retransmit);void tcp_enter_recovery (struct sock *sk,bool ece_ack) {
@@ -4521,7 +4521,7 @@ void tcp_done_with_error(struct sock *sk, int err)if (!sock_flag (sk,SOCK_DEAD ))sk_error_report (sk); } -EXPORT_SYMBOL (tcp_done_with_error); +EXPORT_IPV6_MOD (tcp_done_with_error);/* When we get a reset we do this. */ void tcp_reset (struct sock *sk,struct sk_buff *skb)
@@ -6291,7 +6291,7 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb) discard:tcp_drop_reason (sk, skb, reason); } -EXPORT_SYMBOL (tcp_rcv_established); +EXPORT_IPV6_MOD (tcp_rcv_established);void tcp_init_transfer (struct sock *sk,int bpf_op,struct sk_buff *skb) {
@@ -7004,7 +7004,7 @@ tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)__kfree_skb (skb);return 0 ; } -EXPORT_SYMBOL (tcp_rcv_state_process); +EXPORT_IPV6_MOD (tcp_rcv_state_process);static inline void pr_drop_req (struct request_sock *req,__u16 port,int family) {
@@ -7186,7 +7186,7 @@ u16 tcp_get_syncookie_mss(struct request_sock_ops *rsk_ops,return mss; } -EXPORT_SYMBOL_GPL (tcp_get_syncookie_mss); +EXPORT_IPV6_MOD_GPL (tcp_get_syncookie_mss); int tcp_conn_request(struct request_sock_ops *rsk_ops, const struct tcp_request_sock_ops *af_ops,
@@ -7367,4 +7367,4 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,tcp_listendrop (sk);return 0 ; } -EXPORT_SYMBOL (tcp_conn_request); +EXPORT_IPV6_MOD (tcp_conn_request);
net/ipv4/tcp_ipv4.c +23 -24
191 lines not on this page · raw message
net/ipv4/tcp_minisocks.c +5 -6
@@ -264,7 +264,7 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,inet_twsk_put (tw);return TCP_TW_SUCCESS ; } -EXPORT_SYMBOL (tcp_timewait_state_process); +EXPORT_IPV6_MOD (tcp_timewait_state_process);static void tcp_time_wait_init (struct sock *sk,struct tcp_timewait_sock *tcptw) {
@@ -398,7 +398,7 @@ void tcp_twsk_destructor(struct sock *sk)#endif tcp_ao_destroy_sock (sk, true); } -EXPORT_SYMBOL_GPL (tcp_twsk_destructor); +EXPORT_IPV6_MOD_GPL (tcp_twsk_destructor);void tcp_twsk_purge (struct list_head *net_exit_list) {
@@ -457,7 +457,6 @@ void tcp_openreq_init_rwin(struct request_sock *req, rcv_wnd); ireq->rcv_wscale = rcv_wscale; } -EXPORT_SYMBOL (tcp_openreq_init_rwin);static void tcp_ecn_openreq_child (struct tcp_sock *tp,const struct request_sock *req)
@@ -492,7 +491,7 @@ void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst)tcp_set_ca_state (sk, TCP_CA_Open); } -EXPORT_SYMBOL_GPL (tcp_ca_openreq_child); +EXPORT_IPV6_MOD_GPL (tcp_ca_openreq_child); static void smc_check_reset_syn_req(const struct tcp_sock *oldtp, struct request_sock *req,
@@ -909,7 +908,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, }return NULL ; } -EXPORT_SYMBOL (tcp_check_req); +EXPORT_IPV6_MOD (tcp_check_req);/* * Queue segment on the new socket if the new socket is active,
@@ -951,4 +950,4 @@ enum skb_drop_reason tcp_child_process(struct sock *parent, struct sock *child,sock_put (child);return reason; } -EXPORT_SYMBOL (tcp_child_process); +EXPORT_IPV6_MOD (tcp_child_process);
net/ipv4/tcp_output.c +6 -6
@@ -250,7 +250,7 @@ void tcp_select_initial_window(const struct sock *sk, int __space, __u32 mss,WRITE_ONCE (*__window_clamp,min_t (__u32,U16_MAX << (*rcv_wscale), window_clamp)); } -EXPORT_SYMBOL (tcp_select_initial_window); +EXPORT_IPV6_MOD (tcp_select_initial_window);/* Chose a new window to advertise, update state in tcp_sock for the * socket, and return result with RFC1323 scaling applied. The return
@@ -1171,7 +1171,7 @@ void tcp_release_cb(struct sock *sk)if ((flags &TCPF_ACK_DEFERRED ) &&inet_csk_ack_scheduled (sk))tcp_send_ack (sk); } -EXPORT_SYMBOL (tcp_release_cb); +EXPORT_IPV6_MOD (tcp_release_cb);void __init tcp_tasklet_init (void ) {
@@ -1783,7 +1783,7 @@ int tcp_mtu_to_mss(struct sock *sk, int pmtu)return __tcp_mtu_to_mss (sk, pmtu) - (tcp_sk (sk)->tcp_header_len -sizeof (struct tcphdr )); } -EXPORT_SYMBOL (tcp_mtu_to_mss); +EXPORT_IPV6_MOD (tcp_mtu_to_mss);/* Inverse of above */ int tcp_mss_to_mtu (struct sock *sk,int mss)
@@ -1856,7 +1856,7 @@ unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu)return mss_now; } -EXPORT_SYMBOL (tcp_sync_mss); +EXPORT_IPV6_MOD (tcp_sync_mss);/* Compute the current effective MSS, taking SACKs and IP options, * and even PMTU discovery events into account.
@@ -3851,7 +3851,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst,return skb; } -EXPORT_SYMBOL (tcp_make_synack); +EXPORT_IPV6_MOD (tcp_make_synack);static void tcp_ca_dst_init (struct sock *sk,const struct dst_entry *dst) {
@@ -4428,4 +4428,4 @@ int tcp_rtx_synack(const struct sock *sk, struct request_sock *req) }return res; } -EXPORT_SYMBOL (tcp_rtx_synack); +EXPORT_IPV6_MOD (tcp_rtx_synack);
net/ipv4/tcp_timer.c +2 -2
@@ -750,7 +750,7 @@ void tcp_syn_ack_timeout(const struct request_sock *req)__NET_INC_STATS (net,LINUX_MIB_TCPTIMEOUTS ); } -EXPORT_SYMBOL (tcp_syn_ack_timeout); +EXPORT_IPV6_MOD (tcp_syn_ack_timeout);void tcp_reset_keepalive_timer (struct sock *sk,unsigned long len) {
@@ -772,7 +772,7 @@ void tcp_set_keepalive(struct sock *sk, int val)else if (!val)tcp_delete_keepalive_timer (sk); } -EXPORT_SYMBOL_GPL (tcp_set_keepalive); +EXPORT_IPV6_MOD_GPL (tcp_set_keepalive);static void tcp_keepalive_timer (struct timer_list *t) {
Signature · 1 line
2.48.1.502.g6dc24dfdaf-goog
Re: [PATCH v2 net-next 3/4] tcp: use EXPORT_IPV6_MOD[_GPL]()
From: Eric Dumazet <[email protected]>
Date: Wed, 12 Feb 2025 13:24:17 +0000
Quoted 7 lines
Use EXPORT_IPV6_MOD[_GPL]() for symbols that don't need to be exported unless
CONFIG_IPV6=m
tcp_hashinfoandtcp_openreq_init_rwin()are no longer used from any module anyway.Signed-off-by Eric Dumazet <[email protected]>
allmodconfig + IPV6=y built successfully.
Re: [PATCH v2 net-next 3/4] tcp: use EXPORT_IPV6_MOD[_GPL]()
In reply to Eric DumazetQuoted 30 lines · Eric Dumazet
Use EXPORT_IPV6_MOD[_GPL]() for symbols that don't need to be exported unless
CONFIG_IPV6=m
tcp_hashinfoandtcp_openreq_init_rwin()are no longer used from any module anyway.Signed-off-by Eric Dumazet <[email protected]>--- net/core/secure_seq.c | 2 +- net/ipv4/syncookies.c | 8 +++---- net/ipv4/tcp.c | 44 ++++++++++++++++++------------------- net/ipv4/tcp_fastopen.c | 2 +- net/ipv4/tcp_input.c | 14 ++++++------ net/ipv4/tcp_ipv4.c | 47 ++++++++++++++++++++-------------------- net/ipv4/tcp_minisocks.c | 11 +++++----- net/ipv4/tcp_output.c | 12 +++++----- net/ipv4/tcp_timer.c | 4 ++-- 9 files changed, 71 insertions(+), 73 deletions(-)net/core/secure_seq.c +1
-1@@ -71,7 +71,7 @@ u32 secure_tcpv6_ts_off(const struct net *net,return siphash (&combined,offsetofend (typeof (combined), daddr), &ts_secret); } -EXPORT_SYMBOL (secure_tcpv6_ts_off); +EXPORT_IPV6_MOD (secure_tcpv6_ts_off);
[..]
net/core/secure_seq.c
Quoted 5 lines
net/core/secure_seq.c +1
-1-EXPORT_SYMBOL_GPL (tcp_set_keepalive); +EXPORT_IPV6_MOD_GPL (tcp_set_keepalive);static void tcp_keepalive_timer (struct timer_list *t) {
PATCH v2 4/4 udp: use EXPORT_IPV6_MOD[_GPL]()
In reply to Eric DumazetUse EXPORT_IPV6_MOD[_GPL]() for symbols that don't need to be exported unless CONFIG_IPV6=m
udp_table is no longer used from any modules, and does not need to be exported anyway.
--- net/ipv4/udp.c | 63 +++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 32 deletions(-)
net/ipv4/udp.c +31 -32
@@ -121,13 +121,12 @@#endif struct udp_table udp_table__read_mostly ; -EXPORT_SYMBOL (udp_table);long sysctl_udp_mem[3 ]__read_mostly ; -EXPORT_SYMBOL (sysctl_udp_mem); +EXPORT_IPV6_MOD (sysctl_udp_mem);atomic_long_t udp_memory_allocated____cacheline_aligned_in_smp ; -EXPORT_SYMBOL (udp_memory_allocated); +EXPORT_IPV6_MOD (udp_memory_allocated);DEFINE_PER_CPU (int, udp_memory_per_cpu_fw_alloc);EXPORT_PER_CPU_SYMBOL_GPL (udp_memory_per_cpu_fw_alloc);
@@ -352,7 +351,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum, fail:return error; } -EXPORT_SYMBOL (udp_lib_get_port); +EXPORT_IPV6_MOD (udp_lib_get_port);int udp_v4_get_port (struct sock *sk,unsigned short snum) {
@@ -418,7 +417,7 @@ u32 udp_ehashfn(const struct net *net, const __be32 laddr, const __u16 lport,return __inet_ehashfn (laddr, lport, faddr, fport, udp_ehash_secret +net_hash_mix (net)); } -EXPORT_SYMBOL (udp_ehashfn); +EXPORT_IPV6_MOD (udp_ehashfn);/** * udp4_lib_lookup1() - Simplified lookup using primary hash (destination port)
@@ -653,7 +652,7 @@ void udp_lib_hash4(struct sock *sk, u16 hash)spin_unlock_bh (&hslot->lock); } -EXPORT_SYMBOL (udp_lib_hash4); +EXPORT_IPV6_MOD (udp_lib_hash4);/* call with sock lock */ void udp4_hash4 (struct sock *sk)
@@ -669,7 +668,7 @@ void udp4_hash4(struct sock *sk) udp_lib_hash4(sk, hash); } -EXPORT_SYMBOL (udp4_hash4); +EXPORT_IPV6_MOD (udp4_hash4);#endif /* CONFIG_BASE_SMALL */ /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
@@ -809,11 +808,11 @@ static inline bool __udp_is_mcast_sock(struct net *net, const struct sock *sk, }DEFINE_STATIC_KEY_FALSE (udp_encap_needed_key); -EXPORT_SYMBOL (udp_encap_needed_key); +EXPORT_IPV6_MOD (udp_encap_needed_key);#if IS_ENABLED (CONFIG_IPV6 )DEFINE_STATIC_KEY_FALSE (udpv6_encap_needed_key); -EXPORT_SYMBOL (udpv6_encap_needed_key); +EXPORT_IPV6_MOD (udpv6_encap_needed_key);#endif void udp_encap_enable (void )
@@ -1041,7 +1040,7 @@ void udp_flush_pending_frames(struct sock *sk)ip_flush_pending_frames (sk); } } -EXPORT_SYMBOL (udp_flush_pending_frames); +EXPORT_IPV6_MOD (udp_flush_pending_frames);/** * udp4_hwcsum - handle outgoing HW checksumming
@@ -1229,7 +1228,7 @@ int udp_push_pending_frames(struct sock *sk)WRITE_ONCE (up->pending,0 );return err; } -EXPORT_SYMBOL (udp_push_pending_frames); +EXPORT_IPV6_MOD (udp_push_pending_frames);static int __udp_cmsg_send (struct cmsghdr *cmsg,u16 *gso_size) {
@@ -1266,7 +1265,7 @@ int udp_cmsg_send(struct sock *sk, struct msghdr *msg, u16 *gso_size)return need_ip; } -EXPORT_SYMBOL_GPL (udp_cmsg_send); +EXPORT_IPV6_MOD_GPL (udp_cmsg_send);int udp_sendmsg (struct sock *sk,struct msghdr *msg,size_t len) {
@@ -1561,7 +1560,7 @@ void udp_splice_eof(struct socket *sock)udp_push_pending_frames (sk);release_sock (sk); } -EXPORT_SYMBOL_GPL (udp_splice_eof); +EXPORT_IPV6_MOD_GPL (udp_splice_eof);#define UDP_SKB_IS_STATELESS 0x80000000
@@ -1678,7 +1677,7 @@ void udp_skb_destructor(struct sock *sk, struct sk_buff *skb)prefetch (&skb->data);udp_rmem_release (sk,udp_skb_truesize (skb),1 , false); } -EXPORT_SYMBOL (udp_skb_destructor); +EXPORT_IPV6_MOD (udp_skb_destructor);/* as above, but the caller held the rx queue lock, too */ static void udp_skb_dtor_locked (struct sock *sk,struct sk_buff *skb)
@@ -1785,7 +1784,7 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)busylock_release (busy);return err; } -EXPORT_SYMBOL_GPL (__udp_enqueue_schedule_skb); +EXPORT_IPV6_MOD_GPL (__udp_enqueue_schedule_skb);void udp_destruct_common (struct sock *sk) {
@@ -1801,7 +1800,7 @@ void udp_destruct_common(struct sock *sk) }udp_rmem_release (sk, total,0 , true); } -EXPORT_SYMBOL_GPL (udp_destruct_common); +EXPORT_IPV6_MOD_GPL (udp_destruct_common);static void udp_destruct_sock (struct sock *sk) {
@@ -1832,7 +1831,7 @@ void skb_consume_udp(struct sock *sk, struct sk_buff *skb, int len)skb_release_head_state (skb);__consume_stateless_skb (skb); } -EXPORT_SYMBOL_GPL (skb_consume_udp); +EXPORT_IPV6_MOD_GPL (skb_consume_udp); static struct sk_buff *__first_packet_length(struct sock *sk, struct sk_buff_head *rcvq,
@@ -1914,7 +1913,7 @@ int udp_ioctl(struct sock *sk, int cmd, int *karg)return 0 ; } -EXPORT_SYMBOL (udp_ioctl); +EXPORT_IPV6_MOD (udp_ioctl);struct sk_buff *__skb_recv_udp (struct sock *sk,unsigned int flags,int *off,int *err)
@@ -2010,7 +2009,7 @@ int udp_read_skb(struct sock *sk, skb_read_actor_t recv_actor)WARN_ON_ONCE (!skb_set_owner_sk_safe (skb, sk));return recv_actor (sk, skb); } -EXPORT_SYMBOL (udp_read_skb); +EXPORT_IPV6_MOD (udp_read_skb);/* * This should be easy, if there is something there we
@@ -2137,7 +2136,7 @@ int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, &addr_len); } -EXPORT_SYMBOL (udp_pre_connect); +EXPORT_IPV6_MOD (udp_pre_connect);static int udp_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len) {
@@ -2186,7 +2185,7 @@ int udp_disconnect(struct sock *sk, int flags)release_sock (sk);return 0 ; } -EXPORT_SYMBOL (udp_disconnect); +EXPORT_IPV6_MOD (udp_disconnect);void udp_lib_unhash (struct sock *sk) {
@@ -2216,7 +2215,7 @@ void udp_lib_unhash(struct sock *sk)spin_unlock_bh (&hslot->lock); } } -EXPORT_SYMBOL (udp_lib_unhash); +EXPORT_IPV6_MOD (udp_lib_unhash);/* * inet_rcv_saddr was changed, we must rehash secondary hash
@@ -2280,7 +2279,7 @@ void udp_lib_rehash(struct sock *sk, u16 newhash, u16 newhash4) } } } -EXPORT_SYMBOL (udp_lib_rehash); +EXPORT_IPV6_MOD (udp_lib_rehash);void udp_v4_rehash (struct sock *sk) {
@@ -2485,7 +2484,7 @@ bool udp_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst) }return false; } -EXPORT_SYMBOL (udp_sk_rx_dst_set); +EXPORT_IPV6_MOD (udp_sk_rx_dst_set);/* * Multicasts and broadcasts go to each listener.
@@ -3041,7 +3040,7 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,return err; } -EXPORT_SYMBOL (udp_lib_setsockopt); +EXPORT_IPV6_MOD (udp_lib_setsockopt);int udp_setsockopt (struct sock *sk,int level,int optname,sockptr_t optval,unsigned int optlen)
@@ -3112,7 +3111,7 @@ int udp_lib_getsockopt(struct sock *sk, int level, int optname,return -EFAULT ;return 0 ; } -EXPORT_SYMBOL (udp_lib_getsockopt); +EXPORT_IPV6_MOD (udp_lib_getsockopt);int udp_getsockopt (struct sock *sk,int level,int optname,char __user *optval,int __user *optlen)
@@ -3154,7 +3153,7 @@ __poll_t udp_poll(struct file *file, struct socket *sock, poll_table *wait)return mask; } -EXPORT_SYMBOL (udp_poll); +EXPORT_IPV6_MOD (udp_poll);int udp_abort (struct sock *sk,int err) {
@@ -3177,7 +3176,7 @@ int udp_abort(struct sock *sk, int err)return 0 ; } -EXPORT_SYMBOL_GPL (udp_abort); +EXPORT_IPV6_MOD_GPL (udp_abort);struct proto udp_prot = { .name ="UDP" ,
@@ -3311,7 +3310,7 @@ void *udp_seq_start(struct seq_file *seq, loff_t *pos)return *pos ?udp_get_idx (seq, *pos-1 ) :SEQ_START_TOKEN ; } -EXPORT_SYMBOL (udp_seq_start); +EXPORT_IPV6_MOD (udp_seq_start);void *udp_seq_next (struct seq_file *seq,void *v,loff_t *pos) {
@@ -3325,7 +3324,7 @@ void *udp_seq_next(struct seq_file *seq, void *v, loff_t *pos) ++*pos;return sk; } -EXPORT_SYMBOL (udp_seq_next); +EXPORT_IPV6_MOD (udp_seq_next);void udp_seq_stop (struct seq_file *seq,void *v) {
@@ -3337,7 +3336,7 @@ void udp_seq_stop(struct seq_file *seq, void *v)if (state->bucket <= udptable->mask)spin_unlock_bh (&udptable->hash[state->bucket].lock); } -EXPORT_SYMBOL (udp_seq_stop); +EXPORT_IPV6_MOD (udp_seq_stop);/* ------------------------------------------------------------------------ */ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
@@ -3616,7 +3615,7 @@ const struct seq_operations udp_seq_ops = { .stop = udp_seq_stop, .show = udp4_seq_show, }; -EXPORT_SYMBOL (udp_seq_ops); +EXPORT_IPV6_MOD (udp_seq_ops);static struct udp_seq_afinfo udp4_seq_afinfo = { .family =AF_INET ,
Signature · 1 line
2.48.1.502.g6dc24dfdaf-goog
Re: [PATCH v2 net-next 4/4] udp: use EXPORT_IPV6_MOD[_GPL]()
Quoted 7 lines · Eric Dumazet
Use EXPORT_IPV6_MOD[_GPL]() for symbols that don't need to be exported unless
CONFIG_IPV6=m
udp_tableis no longer used from any modules, and does not need to be exported anyway.Signed-off-by Eric Dumazet <[email protected]>
Re: [PATCH v2 net-next 4/4] udp: use EXPORT_IPV6_MOD[_GPL]()
In reply to Eric DumazetQuoted 20 lines · Eric Dumazet
Use EXPORT_IPV6_MOD[_GPL]() for symbols that don't need to be exported unless
CONFIG_IPV6=m
udp_tableis no longer used from any modules, and does not need to be exported anyway.Signed-off-by Eric Dumazet <[email protected]>--- net/ipv4/udp.c | 63 +++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 32 deletions(-)net/ipv4/udp.c +0
-1@@ -121,13 +121,12 @@#endif struct udp_table udp_table__read_mostly ; -EXPORT_SYMBOL (udp_table);
[...]
Quoted 6 lines
net/ipv4/udp.c +1
-1-EXPORT_SYMBOL (udp_seq_stop); +EXPORT_IPV6_MOD (udp_seq_stop);/* ------------------------------------------------------------------------ */ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
net/ipv4/udp.c const struct seq_operations udp_seq_ops = { · line 3621
Quoted 8 lines
net/ipv4/udp.c +1
-1@@ -3616,7 +3615,7 @@ const struct seq_operations udp_seq_ops = { .stop = udp_seq_stop, .show = udp4_seq_show, }; -EXPORT_SYMBOL (udp_seq_ops); +EXPORT_IPV6_MOD (udp_seq_ops);static struct udp_seq_afinfo udp4_seq_afinfo = { .family =AF_INET ,
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Wed, 12 Feb 2025 13:24:14 +0000 you wrote:
In this series I am adding
EXPORT_IPV6_MODandEXPORT_IPV6_MOD_GPL()so that we can replace someEXPORT_SYMBOL()when IPV6 is not modular.This is making all the selected symbols internal to core linux networking.
[...]
Here is the summary with links:
- [v2,net-next,1/4] net: introduce EXPORT_IPV6_MOD() and EXPORT_IPV6_MOD_GPL()
https://git.kernel.org/netdev/net-next/c/54568a84c95b - [v2,net-next,2/4] inetpeer: use EXPORT_IPV6_MOD[_GPL]() https://git.kernel.org/netdev/net-next/c/95a3c96c7460 - [v2,net-next,3/4] tcp: use EXPORT_IPV6_MOD[_GPL]() https://git.kernel.org/netdev/net-next/c/6dc4c2526f6d - [v2,net-next,4/4] udp: use EXPORT_IPV6_MOD[_GPL]() https://git.kernel.org/netdev/net-next/c/2f8f4f22452a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html