OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tipc: eliminate checking netns if node established 

Currently, we scan over all network namespaces at each received
discovery message in order to check if the sending peer might be
present in a host local namespaces.

This is unnecessary since we can assume that a peer will not change its
location during an established session.

We now improve the condition for this testing so that we don't perform
any redundant scans.

Fixes: f73b12812a ("tipc: improve throughput between nodes in netns")
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hoang Le 2019-11-08 10:02:37 +07:00 committed by David S. Miller
parent f8cc62ca3e
commit d408bef4bf
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/tipc/node.c
View File

@ -472,10 +472,6 @@ static struct tipc_node *tipc_node_create(struct net *net, u32 addr,
tipc_bc_sndlink(net), tipc_bc_sndlink(net),
&n->bc_entry.link)) { &n->bc_entry.link)) {
pr_warn("Broadcast rcv link creation failed, no memory\n"); pr_warn("Broadcast rcv link creation failed, no memory\n");
if (n->peer_net) {
n->peer_net = NULL;
n->peer_hash_mix = 0;
}
kfree(n); kfree(n);
n = NULL; n = NULL;
goto exit; goto exit;
@ -1073,6 +1069,9 @@ void tipc_node_check_dest(struct net *net, u32 addr,
if (sign_match && addr_match && link_up) { if (sign_match && addr_match && link_up) {
/* All is fine. Do nothing. */ /* All is fine. Do nothing. */
reset = false; reset = false;
/* Peer node is not a container/local namespace */
if (!n->peer_hash_mix)
n->peer_hash_mix = hash_mixes;
} else if (sign_match && addr_match && !link_up) { } else if (sign_match && addr_match && !link_up) {
/* Respond. The link will come up in due time */ /* Respond. The link will come up in due time */
*respond = true; *respond = true;
@ -1398,11 +1397,8 @@ static void node_lost_contact(struct tipc_node *n,
/* Notify publications from this node */ /* Notify publications from this node */
n->action_flags |= TIPC_NOTIFY_NODE_DOWN; n->action_flags |= TIPC_NOTIFY_NODE_DOWN;
if (n->peer_net) {
n->peer_net = NULL; n->peer_net = NULL;
n->peer_hash_mix = 0; n->peer_hash_mix = 0;
}
/* Notify sockets connected to node */ /* Notify sockets connected to node */
list_for_each_entry_safe(conn, safe, conns, list) { list_for_each_entry_safe(conn, safe, conns, list) {
skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, TIPC_CONN_MSG, skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, TIPC_CONN_MSG,