Commit f373b53b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: replace ehash_size by ehash_mask 



Storing the mask (size - 1) instead of the size allows fast path to be
a bit faster.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3faca05

include/net/inet_hashtables.h

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ struct inet_hashinfo { 
	 */

	struct inet_ehash_bucket	*ehash;

	spinlock_t			*ehash_locks;

	unsigned int			ehash_size;

	unsigned int			ehash_mask;

	unsigned int			ehash_locks_mask;



	/* Ok, let's try this, I give up, we do need a local binding
@@ -158,7 +158,7 @@ static inline struct inet_ehash_bucket *inet_ehash_bucket( 
	struct inet_hashinfo *hashinfo,

	unsigned int hash)

{

	return &hashinfo->ehash[hash & (hashinfo->ehash_size - 1)];

	return &hashinfo->ehash[hash & hashinfo->ehash_mask];

}



static inline spinlock_t *inet_ehash_lockp(

net/dccp/proto.c

+7 −6
Original line number Diff line number Diff line
@@ -1060,11 +1060,12 @@ static int __init dccp_init(void) 
	for (ehash_order = 0; (1UL << ehash_order) < goal; ehash_order++)

		;

	do {

		dccp_hashinfo.ehash_size = (1UL << ehash_order) * PAGE_SIZE /

		unsigned long hash_size = (1UL << ehash_order) * PAGE_SIZE /

					sizeof(struct inet_ehash_bucket);

		while (dccp_hashinfo.ehash_size &

		       (dccp_hashinfo.ehash_size - 1))

			dccp_hashinfo.ehash_size--;



		while (hash_size & (hash_size - 1))

			hash_size--;

		dccp_hashinfo.ehash_mask = hash_size - 1;

		dccp_hashinfo.ehash = (struct inet_ehash_bucket *)

			__get_free_pages(GFP_ATOMIC|__GFP_NOWARN, ehash_order);

	} while (!dccp_hashinfo.ehash && --ehash_order > 0);
@@ -1074,7 +1075,7 @@ static int __init dccp_init(void) 
		goto out_free_bind_bucket_cachep;

	}



	for (i = 0; i < dccp_hashinfo.ehash_size; i++) {

	for (i = 0; i <= dccp_hashinfo.ehash_mask; i++) {

		INIT_HLIST_NULLS_HEAD(&dccp_hashinfo.ehash[i].chain, i);

		INIT_HLIST_NULLS_HEAD(&dccp_hashinfo.ehash[i].twchain, i);

	}
@@ -1153,7 +1154,7 @@ static void __exit dccp_fini(void) 
		   get_order(dccp_hashinfo.bhash_size *

			     sizeof(struct inet_bind_hashbucket)));

	free_pages((unsigned long)dccp_hashinfo.ehash,

		   get_order(dccp_hashinfo.ehash_size *

		   get_order((dccp_hashinfo.ehash_mask + 1) *

			     sizeof(struct inet_ehash_bucket)));

	inet_ehash_locks_free(&dccp_hashinfo);

	kmem_cache_destroy(dccp_hashinfo.bind_bucket_cachep);

net/ipv4/inet_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) 
	if (!(r->idiag_states & ~(TCPF_LISTEN | TCPF_SYN_RECV)))

		goto unlock;



	for (i = s_i; i < hashinfo->ehash_size; i++) {

	for (i = s_i; i <= hashinfo->ehash_mask; i++) {

		struct inet_ehash_bucket *head = &hashinfo->ehash[i];

		spinlock_t *lock = inet_ehash_lockp(hashinfo, i);

		struct sock *sk;

net/ipv4/inet_hashtables.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ struct sock * __inet_lookup_established(struct net *net, 
	 * have wildcards anyways.

	 */

	unsigned int hash = inet_ehashfn(net, daddr, hnum, saddr, sport);

	unsigned int slot = hash & (hashinfo->ehash_size - 1);

	unsigned int slot = hash & hashinfo->ehash_mask;

	struct inet_ehash_bucket *head = &hashinfo->ehash[slot];



	rcu_read_lock();

net/ipv4/inet_timewait_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ void inet_twsk_purge(struct net *net, struct inet_hashinfo *hashinfo, 
	int h;



	local_bh_disable();

	for (h = 0; h < (hashinfo->ehash_size); h++) {

	for (h = 0; h <= hashinfo->ehash_mask; h++) {

		struct inet_ehash_bucket *head =

			inet_ehash_bucket(hashinfo, h);

		spinlock_t *lock = inet_ehash_lockp(hashinfo, h);