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

Commit 2db88851 authored Mar 26, 2020 by Hoang Le Committed by Greg Kroah-Hartman Jan 18, 2023

tipc: Add a missing case of TIPC_DIRECT_MSG type



commit 8b1e5b0a99f04bda2d6c85ecfe5e68a356c10914 upstream.

In the commit f73b12812a3d
("tipc: improve throughput between nodes in netns"), we're missing a check
to handle TIPC_DIRECT_MSG type, it's still using old sending mechanism for
this message type. So, throughput improvement is not significant as
expected.

Besides that, when sending a large message with that type, we're also
handle wrong receiving queue, it should be enqueued in socket receiving
instead of multicast messages.

Fix this by adding the missing case for TIPC_DIRECT_MSG.

Fixes: f73b12812a3d ("tipc: improve throughput between nodes in netns")
Reported-by: Tuong Lien <tuong.t.lien@dektech.com.au>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
Acked-by: Jon Maloy <jmaloy@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 38b5d705

net/tipc/msg.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -358,6 +358,11 @@ static inline u32 msg_connected(struct tipc_msg *m)
		return msg_type(m) == TIPC_CONN_MSG;
		}

		static inline u32 msg_direct(struct tipc_msg *m)
		{
		return msg_type(m) == TIPC_DIRECT_MSG;
		}

		static inline u32 msg_errcode(struct tipc_msg *m)
		{
		return msg_bits(m, 1, 25, 0xf);

net/tipc/node.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1489,7 +1489,8 @@ static void tipc_lxc_xmit(struct net peer_net, struct sk_buff_head list)
		case TIPC_MEDIUM_IMPORTANCE:
		case TIPC_HIGH_IMPORTANCE:
		case TIPC_CRITICAL_IMPORTANCE:
		if (msg_connected(hdr) \|\| msg_named(hdr)) {
		if (msg_connected(hdr) \|\| msg_named(hdr) \|\|
		msg_direct(hdr)) {
		tipc_loopback_trace(peer_net, list);
		spin_lock_init(&list->lock);
		tipc_sk_rcv(peer_net, list);

net/tipc/socket.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1407,7 +1407,7 @@ static int __tipc_sendmsg(struct socket sock, struct msghdr m, size_t dlen)
		}

		__skb_queue_head_init(&pkts);
		mtu = tipc_node_get_mtu(net, dnode, tsk->portid, false);
		mtu = tipc_node_get_mtu(net, dnode, tsk->portid, true);
		rc = tipc_msg_build(hdr, m, 0, dlen, mtu, &pkts);
		if (unlikely(rc != dlen))
		return rc;