diff options
| author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2014-08-22 18:09:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-23 11:18:34 -0700 |
| commit | 5a9ee0be3371eb77d671a77e26261931c5c3fb31 (patch) | |
| tree | 6127a9c68edea30b97209bc6eedee1ce5b641c17 /net/tipc/port.h | |
| parent | 5b8fa7ce823a59a328e0a7661df2478bfb745de4 (diff) | |
| download | lwn-5a9ee0be3371eb77d671a77e26261931c5c3fb31.tar.gz lwn-5a9ee0be3371eb77d671a77e26261931c5c3fb31.zip | |
tipc: use registry when scanning sockets
The functions tipc_port_get_ports() and tipc_port_reinit() scan over
all sockets/ports to access each of them. This is done by using a
dedicated linked list, 'tipc_socks' where all sockets are members. The
list is in turn protected by a spinlock, 'port_list_lock', while each
socket is locked by using port_lock at the moment of access.
In order to reduce complexity and risk of deadlock, we want to get
rid of the linked list and the accompanying spinlock.
This is what we do in this commit. Instead of the linked list, we use
the port registry to scan across the sockets. We also add usage of
bh_lock_sock() inside the scope of port_lock in both functions, as a
preparation for the complete removal of port_lock.
Finally, we move the functions from port.c to socket.c, and rename them
to tipc_sk_sock_show() and tipc_sk_reinit() repectively.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/port.h')
| -rw-r--r-- | net/tipc/port.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/tipc/port.h b/net/tipc/port.h index 4c6cfdd36351..4a3c54e5d69c 100644 --- a/net/tipc/port.h +++ b/net/tipc/port.h @@ -73,7 +73,6 @@ struct tipc_port { u32 max_pkt; u32 ref; struct tipc_msg phdr; - struct list_head port_list; struct list_head publications; u32 pub_count; u32 probing_state; @@ -81,9 +80,6 @@ struct tipc_port { struct timer_list timer; }; -extern struct list_head tipc_socks; -extern spinlock_t tipc_port_list_lock; - /* * TIPC port manipulation routines */ @@ -100,7 +96,6 @@ int tipc_withdraw(struct tipc_port *p_ptr, unsigned int scope, int tipc_port_peer_msg(struct tipc_port *p_ptr, struct tipc_msg *msg); -struct sk_buff *tipc_port_get_ports(void); void tipc_port_reinit(void); /** |