tipc: separate building and sending of rejected messages

The way we build and send rejected message is currenty perceived as
hard to follow, partly because we let the transmission go via deep
call chains through functions such as tipc_reject_msg() and
net_route_msg().

We want to remove those functions, and make the call sequences shallower
and simpler. For this purpose, we separate building and sending of
rejected messages. We build the reject message using the new function
tipc_msg_reverse(), and let the transmission go via the newly introduced
tipc_link_xmit2() function, as all transmission eventually will do. We
also ensure that all calls to tipc_link_xmit2() are made outside
port_lock/bh_lock_sock.

Finally, we replace all calls to tipc_reject_msg() with the two new
calls at all locations in the code that we want to keep. The remaining
calls are made from code that we are planning to remove, along with
tipc_reject_msg() itself.

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>

1 files changed, 42 insertions, 0 deletions

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 4093b4c94d26..6070dd0ec634 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -37,6 +37,8 @@
 #include "core.h"
 #include "msg.h"
 
+#define MAX_FORWARD_SIZE 1024
+
 static unsigned int align(unsigned int i)
 {
         return (i + 3) & ~3u;
@@ -328,3 +330,43 @@ bool tipc_msg_make_bundle(struct sk_buff **buf, u32 mtu, u32 dnode)
         *buf = bbuf;
         return true;
 }
+
+/**
+ * tipc_msg_reverse(): swap source and destination addresses and add error code
+ * @buf:  buffer containing message to be reversed
+ * @dnode: return value: node where to send message after reversal
+ * @err:  error code to be set in message
+ * Consumes buffer if failure
+ * Returns true if success, otherwise false
+ */
+bool tipc_msg_reverse(struct sk_buff *buf, u32 *dnode, int err)
+{
+        struct tipc_msg *msg = buf_msg(buf);
+        uint imp = msg_importance(msg);
+        struct tipc_msg ohdr;
+        uint rdsz = min_t(uint, msg_data_sz(msg), MAX_FORWARD_SIZE);
+
+        if (skb_linearize(buf) || !msg_isdata(msg))
+                goto exit;
+        if (msg_dest_droppable(msg) || msg_errcode(msg))
+                goto exit;
+
+        memcpy(&ohdr, msg, msg_hdr_sz(msg));
+        msg_set_importance(msg, min_t(uint, ++imp, TIPC_CRITICAL_IMPORTANCE));
+        msg_set_errcode(msg, err);
+        msg_set_origport(msg, msg_destport(&ohdr));
+        msg_set_destport(msg, msg_origport(&ohdr));
+        msg_set_prevnode(msg, tipc_own_addr);
+        if (!msg_short(msg)) {
+                msg_set_orignode(msg, msg_destnode(&ohdr));
+                msg_set_destnode(msg, msg_orignode(&ohdr));
+        }
+        msg_set_size(msg, msg_hdr_sz(msg) + rdsz);
+        skb_trim(buf, msg_size(msg));
+        skb_orphan(buf);
+        *dnode = msg_orignode(&ohdr);
+        return true;
+exit:
+        kfree_skb(buf);
+        return false;
+}