Skip to contentSkip to conversation

NET : makes ipv4 use the {DEFINE|REF}_PROTO_INUSE infrastructure

PATCH Applied Eric Dumazet 1 participant 1 message Nov 5, 2007

Subsystems (4)
Networking Network drivers TCP UDP
lore
Share & tools
lore

Eric Dumazet

author
#0 lore raw

PATCH 2/4 NET : makes ipv4 use the {DEFINE|REF}_PROTO_INUSE infrastructure

Trivial patch to make "tcp,udp,udplite,raw" protocols uses the fast "inuse sockets" infrastructure

Each protocol use then a static percpu var, instead of a dynamic one. This saves some ram and some cpu cycles

Signed-off-by Eric Dumazet <[email protected]>
net/ipv4/raw.c      |    3 +++
net/ipv4/tcp_ipv4.c |    3 +++
net/ipv4/udp.c      |    3 +++
net/ipv4/udplite.c  |    3 +++
4 files changed, 12 insertions(+)
net/ipv4/raw.c +3 -0
index 3916fac..66b42f5 100644
@@ -760,6 +760,8 @@ static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg)
 	}
 }
 
+DEFINE_PROTO_INUSE(raw)
+
 struct proto raw_prot = {
 	.name		   = "RAW",
 	.owner		   = THIS_MODULE,

@@ -781,6 +783,7 @@ struct proto raw_prot = {
 	.compat_setsockopt = compat_raw_setsockopt,
 	.compat_getsockopt = compat_raw_getsockopt,
 #endif
+	REF_PROTO_INUSE(raw)
 };
 
 #ifdef CONFIG_PROC_FS
net/ipv4/tcp_ipv4.c +3 -0
index eec02b2..a5c8e4b 100644
@@ -2417,6 +2417,8 @@ void tcp4_proc_exit(void)
 }
 #endif /* CONFIG_PROC_FS */
 
+DEFINE_PROTO_INUSE(tcp)
+
 struct proto tcp_prot = {
 	.name			= "TCP",
 	.owner			= THIS_MODULE,

@@ -2451,6 +2453,7 @@ struct proto tcp_prot = {
 	.compat_setsockopt	= compat_tcp_setsockopt,
 	.compat_getsockopt	= compat_tcp_getsockopt,
 #endif
+	REF_PROTO_INUSE(tcp)
 };
 
 void __init tcp_v4_init(struct net_proto_family *ops)
net/ipv4/udp.c +3 -0
index 4bc25b4..03c400c 100644
@@ -1430,6 +1430,8 @@ unsigned int udp_poll(struct file *file, struct socket *sock, poll_table *wait)
 
 }
 
+DEFINE_PROTO_INUSE(udp)
+
 struct proto udp_prot = {
 	.name		   = "UDP",
 	.owner		   = THIS_MODULE,

@@ -1452,6 +1454,7 @@ struct proto udp_prot = {
 	.compat_setsockopt = compat_udp_setsockopt,
 	.compat_getsockopt = compat_udp_getsockopt,
 #endif
+	REF_PROTO_INUSE(udp)
 };
 
 /* ------------------------------------------------------------------------ */
net/ipv4/udplite.c +3 -0
index 9497720..f5baeb3 100644
@@ -44,6 +44,8 @@ static	struct net_protocol udplite_protocol = {
 	.no_policy	= 1,
 };
 
+DEFINE_PROTO_INUSE(udplite)
+
 struct proto 	udplite_prot = {
 	.name		   = "UDP-Lite",
 	.owner		   = THIS_MODULE,

@@ -67,6 +69,7 @@ struct proto 	udplite_prot = {
 	.compat_setsockopt = compat_udp_setsockopt,
 	.compat_getsockopt = compat_udp_getsockopt,
 #endif
+	REF_PROTO_INUSE(udplite)
 };
 
 static struct inet_protosw udplite4_protosw = {