[SOCK]: Add udp_hash member to struct proto.

Inspired by the commit ab1e0a13 ([SOCK] proto: Add hashinfo member to
struct proto) from Arnaldo, I made similar thing for UDP/-Lite IPv4
and -v6 protocols.

The result is not that exciting, but it removes some levels of
indirection in udpxxx_get_port and saves some space in code and text.

The first step is to union existing hashinfo and new udp_hash on the
struct proto and give a name to this union, since future initialization
of tcpxxx_prot, dccp_vx_protinfo and udpxxx_protinfo will cause gcc
warning about inability to initialize anonymous member this way.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 97dc35ad09bef3c8618445f44d5e97976b0aa2a9..d99c1ba2ece0e0ff98488859abc30e8cde549b77 100644 (file)
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -223,7 +223,7 @@ static inline int inet_sk_listen_hashfn(const struct sock *sk)
 /* Caller must disable local BH processing. */
 static inline void __inet_inherit_port(struct sock *sk, struct sock *child)
 {
-       struct inet_hashinfo *table = sk->sk_prot->hashinfo;
+       struct inet_hashinfo *table = sk->sk_prot->h.hashinfo;
        const int bhash = inet_bhashfn(inet_sk(child)->num, table->bhash_size);
        struct inet_bind_hashbucket *head = &table->bhash[bhash];
        struct inet_bind_bucket *tb;

diff --git a/include/net/sock.h b/include/net/sock.h
index b89680d2693befc81052e743052f4dbf580c8cb3..c3175c400b79ce3b6f064647bcbc2feacf376b8d 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -586,7 +586,10 @@ struct proto {
        struct request_sock_ops *rsk_prot;
        struct timewait_sock_ops *twsk_prot;
 
-       struct inet_hashinfo    *hashinfo;
+       union {
+               struct inet_hashinfo    *hashinfo;
+               struct hlist_head       *udp_hash;
+       } h;
 
        struct module           *owner;
 

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 17ad69e90e4890b982a56fb4afda11caeb6cbf21..4ca8b0c93c80781ea6ce7b181b8ce05afbdb52fb 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -941,7 +941,7 @@ static struct proto dccp_v4_prot = {
        .obj_size               = sizeof(struct dccp_sock),
        .rsk_prot               = &dccp_request_sock_ops,
        .twsk_prot              = &dccp_timewait_sock_ops,
-       .hashinfo               = &dccp_hashinfo,
+       .h.hashinfo             = &dccp_hashinfo,
 #ifdef CONFIG_COMPAT
        .compat_setsockopt      = compat_dccp_setsockopt,
        .compat_getsockopt      = compat_dccp_getsockopt,

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 1a5e50b9067764a1ffa85442010a9551ee7ebafe..2fec1af1a8c39e6e1e70472f2633d41f8dae6d68 100644 (file)
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1126,7 +1126,7 @@ static struct proto dccp_v6_prot = {
        .obj_size          = sizeof(struct dccp6_sock),
        .rsk_prot          = &dccp6_request_sock_ops,
        .twsk_prot         = &dccp6_timewait_sock_ops,
-       .hashinfo          = &dccp_hashinfo,
+       .h.hashinfo        = &dccp_hashinfo,
 #ifdef CONFIG_COMPAT
        .compat_setsockopt = compat_dccp_setsockopt,
        .compat_getsockopt = compat_dccp_getsockopt,

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index cc1a1859a61b69c3fab62b2044e015f23e2000ef..f9c5c4def1baba5a910d9f7f6563ea67e03f0a8e 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -80,7 +80,7 @@ EXPORT_SYMBOL_GPL(inet_csk_bind_conflict);
  */
 int inet_csk_get_port(struct sock *sk, unsigned short snum)
 {
-       struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+       struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
        struct inet_bind_hashbucket *head;
        struct hlist_node *node;
        struct inet_bind_bucket *tb;

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 1aba606f6bbb610249dcc06291d3435907b53a30..8cd1ad9b91118248e2fb8243afc2c7f3e413c6ed 100644 (file)
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -68,7 +68,7 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,
  */
 static void __inet_put_port(struct sock *sk)
 {
-       struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+       struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
        const int bhash = inet_bhashfn(inet_sk(sk)->num, hashinfo->bhash_size);
        struct inet_bind_hashbucket *head = &hashinfo->bhash[bhash];
        struct inet_bind_bucket *tb;
@@ -318,7 +318,7 @@ static inline u32 inet_sk_port_offset(const struct sock *sk)
 
 void __inet_hash_nolisten(struct sock *sk)
 {
-       struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+       struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
        struct hlist_head *list;
        rwlock_t *lock;
        struct inet_ehash_bucket *head;
@@ -339,7 +339,7 @@ EXPORT_SYMBOL_GPL(__inet_hash_nolisten);
 
 static void __inet_hash(struct sock *sk)
 {
-       struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+       struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
        struct hlist_head *list;
        rwlock_t *lock;
 
@@ -372,7 +372,7 @@ EXPORT_SYMBOL_GPL(inet_hash);
 void inet_unhash(struct sock *sk)
 {
        rwlock_t *lock;
-       struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+       struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
 
        if (sk_unhashed(sk))
                goto out;

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 167a0f557531968e1bf8464765d7223ce277e794..1a47719a55ad87fe876f99470125ae626c2f6b15 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2468,7 +2468,7 @@ struct proto tcp_prot = {
        .obj_size               = sizeof(struct tcp_sock),
        .twsk_prot              = &tcp_timewait_sock_ops,
        .rsk_prot               = &tcp_request_sock_ops,
-       .hashinfo               = &tcp_hashinfo,
+       .h.hashinfo             = &tcp_hashinfo,
 #ifdef CONFIG_COMPAT
        .compat_setsockopt      = compat_tcp_setsockopt,
        .compat_getsockopt      = compat_tcp_getsockopt,

diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index 99fd25f7f005879ec28b78b6af51890c7abb5fd8..c0c8d2d176823a74cf7d6db3bcf5cb4c4ab32ccc 100644 (file)
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -24,7 +24,7 @@
 
 void __inet6_hash(struct sock *sk)
 {
-       struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+       struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
        struct hlist_head *list;
        rwlock_t *lock;
 

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 56d0cea7d578cd211b049f01a139c5dc55926d2d..8dd72966ff784bbadbe3558a94e07980efc7362e 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2172,7 +2172,7 @@ struct proto tcpv6_prot = {
        .obj_size               = sizeof(struct tcp6_sock),
        .twsk_prot              = &tcp6_timewait_sock_ops,
        .rsk_prot               = &tcp6_request_sock_ops,
-       .hashinfo               = &tcp_hashinfo,
+       .h.hashinfo             = &tcp_hashinfo,
 #ifdef CONFIG_COMPAT
        .compat_setsockopt      = compat_tcp_setsockopt,
        .compat_getsockopt      = compat_tcp_getsockopt,