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

Commit 95b2d488 authored by Hoang Le's avatar Hoang Le Committed by Greg Kroah-Hartman
Browse files

tipc: eliminate checking netns if node established 



[ Upstream commit d408bef4bfa60bac665b6e7239269570039a968b ]

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: f73b12812a3d ("tipc: improve throughput between nodes in netns")
Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarHoang Le <hoang.h.le@dektech.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: c244c092f1ed ("tipc: fix unexpected link reset due to discovery messages")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d6418829

net/tipc/node.c

+5 −9
Original line number Diff line number Diff line
@@ -472,10 +472,6 @@ static struct tipc_node *tipc_node_create(struct net *net, u32 addr, 
				 tipc_bc_sndlink(net),

				 &n->bc_entry.link)) {

		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);

		n = NULL;

		goto exit;
@@ -1068,6 +1064,9 @@ void tipc_node_check_dest(struct net *net, u32 addr, 
	if (sign_match && addr_match && link_up) {

		/* All is fine. Do nothing. */

		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) {

		/* Respond. The link will come up in due time */

		*respond = true;
@@ -1393,11 +1392,8 @@ static void node_lost_contact(struct tipc_node *n, 


	/* Notify publications from this node */

	n->action_flags |= TIPC_NOTIFY_NODE_DOWN;



	if (n->peer_net) {

	n->peer_net = NULL;

	n->peer_hash_mix = 0;

	}

	/* Notify sockets connected to node */

	list_for_each_entry_safe(conn, safe, conns, list) {

		skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, TIPC_CONN_MSG,