Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc8717ba authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[RAW]: Add raw_hashinfo member on struct proto. 



Sorry for the patch sequence confusion :| but I found that the similar
thing can be done for raw sockets easily too late.

Expand the proto.h union with the raw_hashinfo member and use it in
raw_prot and rawv6_prot. This allows to drop the protocol specific
versions of hash and unhash callbacks.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ba5a3c5

include/net/raw.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ int raw_seq_open(struct inode *ino, struct file *file, 




#endif

#endif





void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h);

void raw_hash_sk(struct sock *sk);

void raw_unhash_sk(struct sock *sk, struct raw_hashinfo *h);

void raw_unhash_sk(struct sock *sk);





#endif	/* _RAW_H */
 
#endif	/* _RAW_H */

include/net/sock.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -504,6 +504,7 @@ extern int sk_wait_data(struct sock *sk, long *timeo); 
struct request_sock_ops;

struct request_sock_ops;

struct timewait_sock_ops;

struct timewait_sock_ops;

struct inet_hashinfo;

struct inet_hashinfo;

struct raw_hashinfo;





/* Networking protocol blocks we attach to sockets.

/* Networking protocol blocks we attach to sockets.

 * socket layer -> transport layer interface

 * socket layer -> transport layer interface
@@ -589,6 +590,7 @@ struct proto { 
	union {

	union {

		struct inet_hashinfo	*hashinfo;

		struct inet_hashinfo	*hashinfo;

		struct hlist_head	*udp_hash;

		struct hlist_head	*udp_hash;

		struct raw_hashinfo	*raw_hash;

	} h;

	} h;





	struct module		*owner;

	struct module		*owner;

net/ipv4/raw.c

+8 −14
Original line number Original line Diff line number Diff line
@@ -84,8 +84,9 @@ static struct raw_hashinfo raw_v4_hashinfo = { 
	.lock = __RW_LOCK_UNLOCKED(raw_v4_hashinfo.lock),

	.lock = __RW_LOCK_UNLOCKED(raw_v4_hashinfo.lock),

};

};





void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h)

void raw_hash_sk(struct sock *sk)

{

{

	struct raw_hashinfo *h = sk->sk_prot->h.raw_hash;

	struct hlist_head *head;

	struct hlist_head *head;





	head = &h->ht[inet_sk(sk)->num & (RAW_HTABLE_SIZE - 1)];

	head = &h->ht[inet_sk(sk)->num & (RAW_HTABLE_SIZE - 1)];
@@ -97,8 +98,10 @@ void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h) 
}

}

EXPORT_SYMBOL_GPL(raw_hash_sk);

EXPORT_SYMBOL_GPL(raw_hash_sk);





void raw_unhash_sk(struct sock *sk, struct raw_hashinfo *h)

void raw_unhash_sk(struct sock *sk)

{

{

	struct raw_hashinfo *h = sk->sk_prot->h.raw_hash;



	write_lock_bh(&h->lock);

	write_lock_bh(&h->lock);

	if (sk_del_node_init(sk))

	if (sk_del_node_init(sk))

		sock_prot_inuse_add(sk->sk_prot, -1);

		sock_prot_inuse_add(sk->sk_prot, -1);
@@ -106,16 +109,6 @@ void raw_unhash_sk(struct sock *sk, struct raw_hashinfo *h) 
}

}

EXPORT_SYMBOL_GPL(raw_unhash_sk);

EXPORT_SYMBOL_GPL(raw_unhash_sk);





static void raw_v4_hash(struct sock *sk)

{

	raw_hash_sk(sk, &raw_v4_hashinfo);

}



static void raw_v4_unhash(struct sock *sk)

{

	raw_unhash_sk(sk, &raw_v4_hashinfo);

}



static struct sock *__raw_v4_lookup(struct net *net, struct sock *sk,

static struct sock *__raw_v4_lookup(struct net *net, struct sock *sk,

		unsigned short num, __be32 raddr, __be32 laddr, int dif)

		unsigned short num, __be32 raddr, __be32 laddr, int dif)

{

{
@@ -841,9 +834,10 @@ struct proto raw_prot = { 
	.recvmsg	   = raw_recvmsg,

	.recvmsg	   = raw_recvmsg,

	.bind		   = raw_bind,

	.bind		   = raw_bind,

	.backlog_rcv	   = raw_rcv_skb,

	.backlog_rcv	   = raw_rcv_skb,

	.hash		   = raw_v4_hash,

	.hash		   = raw_hash_sk,

	.unhash		   = raw_v4_unhash,

	.unhash		   = raw_unhash_sk,

	.obj_size	   = sizeof(struct raw_sock),

	.obj_size	   = sizeof(struct raw_sock),

	.h.raw_hash	   = &raw_v4_hashinfo,

#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_raw_setsockopt,

	.compat_setsockopt = compat_raw_setsockopt,

	.compat_getsockopt = compat_raw_getsockopt,

	.compat_getsockopt = compat_raw_getsockopt,

net/ipv6/raw.c

+3 −13
Original line number Original line Diff line number Diff line
@@ -65,17 +65,6 @@ static struct raw_hashinfo raw_v6_hashinfo = { 
	.lock = __RW_LOCK_UNLOCKED(raw_v6_hashinfo.lock),

	.lock = __RW_LOCK_UNLOCKED(raw_v6_hashinfo.lock),

};

};





static void raw_v6_hash(struct sock *sk)

{

	raw_hash_sk(sk, &raw_v6_hashinfo);

}



static void raw_v6_unhash(struct sock *sk)

{

	raw_unhash_sk(sk, &raw_v6_hashinfo);

}





static struct sock *__raw_v6_lookup(struct net *net, struct sock *sk,

static struct sock *__raw_v6_lookup(struct net *net, struct sock *sk,

		unsigned short num, struct in6_addr *loc_addr,

		unsigned short num, struct in6_addr *loc_addr,

		struct in6_addr *rmt_addr, int dif)

		struct in6_addr *rmt_addr, int dif)
@@ -1201,9 +1190,10 @@ struct proto rawv6_prot = { 
	.recvmsg	   = rawv6_recvmsg,

	.recvmsg	   = rawv6_recvmsg,

	.bind		   = rawv6_bind,

	.bind		   = rawv6_bind,

	.backlog_rcv	   = rawv6_rcv_skb,

	.backlog_rcv	   = rawv6_rcv_skb,

	.hash		   = raw_v6_hash,

	.hash		   = raw_hash_sk,

	.unhash		   = raw_v6_unhash,

	.unhash		   = raw_unhash_sk,

	.obj_size	   = sizeof(struct raw6_sock),

	.obj_size	   = sizeof(struct raw6_sock),

	.h.raw_hash	   = &raw_v6_hashinfo,

#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_rawv6_setsockopt,

	.compat_setsockopt = compat_rawv6_setsockopt,

	.compat_getsockopt = compat_rawv6_getsockopt,

	.compat_getsockopt = compat_rawv6_getsockopt,