diff options
| author | Xin Long <lucien.xin@gmail.com> | 2015-12-30 23:50:47 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-05 12:24:01 -0500 |
| commit | 4f0087812648b7611157ae22954acfaed820d24e (patch) | |
| tree | 51dfe36a54bdf7161e188c3818d6d046d4d66c08 /net/sctp/protocol.c | |
| parent | d6c0256a60e685214cc8cc2b886809f11efc0084 (diff) | |
| download | linux-4f0087812648b7611157ae22954acfaed820d24e.tar.gz linux-4f0087812648b7611157ae22954acfaed820d24e.tar.bz2 linux-4f0087812648b7611157ae22954acfaed820d24e.zip | |
sctp: apply rhashtable api to send/recv path
apply lookup apis to two functions, for __sctp_endpoint_lookup_assoc
and __sctp_lookup_association, it's invoked in the protection of sock
lock, it will be safe, but sctp_lookup_association need to call
rcu_read_lock() and to detect the t->dead to protect it.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/protocol.c')
| -rw-r--r-- | net/sctp/protocol.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 010aced44b6b..631cfb380535 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -1467,6 +1467,9 @@ static __init int sctp_init(void) INIT_HLIST_HEAD(&sctp_port_hashtable[i].chain); } + if (sctp_transport_hashtable_init()) + goto err_thash_alloc; + pr_info("Hash tables configured (established %d bind %d)\n", sctp_assoc_hashsize, sctp_port_hashsize); @@ -1521,6 +1524,8 @@ err_register_defaults: get_order(sctp_port_hashsize * sizeof(struct sctp_bind_hashbucket))); err_bhash_alloc: + sctp_transport_hashtable_destroy(); +err_thash_alloc: kfree(sctp_ep_hashtable); err_ehash_alloc: free_pages((unsigned long)sctp_assoc_hashtable, @@ -1567,6 +1572,7 @@ static __exit void sctp_exit(void) free_pages((unsigned long)sctp_port_hashtable, get_order(sctp_port_hashsize * sizeof(struct sctp_bind_hashbucket))); + sctp_transport_hashtable_destroy(); percpu_counter_destroy(&sctp_sockets_allocated); |