Commit 37e22164 authored by Jon Paul Maloy's avatar Jon Paul Maloy Committed by David S. Miller
Browse files

tipc: rename and move message reassembly function 



The function tipc_link_frag_rcv() is in reality a re-entrant generic
message reassemby function that has nothing in particular to do with
the link, where it is defined now. This becomes obvious when we see
the need to call the function from other places in the code.

In this commit rename it to tipc_buf_append() and move it to the file
msg.c. We also simplify its signature by moving the tail pointer to
the control block of the head buffer, hence making the head buffer
self-contained.

Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Reviewed-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5074ab89

net/tipc/bcast.c

+3 −7
Original line number Diff line number Diff line
@@ -506,18 +506,14 @@ receive: 
			tipc_node_unlock(node);

			tipc_link_bundle_rcv(buf);

		} else if (msg_user(msg) == MSG_FRAGMENTER) {

			int ret;

			ret = tipc_link_frag_rcv(&node->bclink.reasm_head,

						 &node->bclink.reasm_tail,

						 &buf);

			if (ret == LINK_REASM_ERROR)

			tipc_buf_append(&node->bclink.reasm_buf, &buf);

			if (unlikely(!buf && !node->bclink.reasm_buf))

				goto unlock;

			tipc_bclink_lock();

			bclink_accept_pkt(node, seqno);

			bcl->stats.recv_fragments++;

			if (ret == LINK_REASM_COMPLETE) {

			if (buf) {

				bcl->stats.recv_fragmented++;

				/* Point msg to inner header */

				msg = buf_msg(buf);

				tipc_bclink_unlock();

				goto receive;

net/tipc/core.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ static inline void k_term_timer(struct timer_list *timer) 
struct tipc_skb_cb {

	void *handle;

	bool deferred;

	struct sk_buff *tail;

};



#define TIPC_SKB_CB(__skb) ((struct tipc_skb_cb *)&((__skb)->cb[0]))

net/tipc/link.c

+5 −62
Original line number Diff line number Diff line
@@ -398,9 +398,8 @@ static void link_release_outqueue(struct tipc_link *l_ptr) 
 */

void tipc_link_reset_fragments(struct tipc_link *l_ptr)

{

	kfree_skb(l_ptr->reasm_head);

	l_ptr->reasm_head = NULL;

	l_ptr->reasm_tail = NULL;

	kfree_skb(l_ptr->reasm_buf);

	l_ptr->reasm_buf = NULL;

}



/**
@@ -1573,17 +1572,12 @@ void tipc_rcv(struct sk_buff *head, struct tipc_bearer *b_ptr) 
			}

			msg = buf_msg(buf);

		} else if (msg_user(msg) == MSG_FRAGMENTER) {

			int rc;



			l_ptr->stats.recv_fragments++;

			rc = tipc_link_frag_rcv(&l_ptr->reasm_head,

						&l_ptr->reasm_tail,

						&buf);

			if (rc == LINK_REASM_COMPLETE) {

			if (tipc_buf_append(&l_ptr->reasm_buf, &buf)) {

				l_ptr->stats.recv_fragmented++;

				msg = buf_msg(buf);

			} else {

				if (rc == LINK_REASM_ERROR)

				if (!l_ptr->reasm_buf)

					tipc_link_reset(l_ptr);

				tipc_node_unlock(n_ptr);

				continue;
@@ -2169,9 +2163,7 @@ static struct sk_buff *tipc_link_failover_rcv(struct tipc_link *l_ptr, 
		}

		if (msg_user(msg) == MSG_FRAGMENTER) {

			l_ptr->stats.recv_fragments++;

			tipc_link_frag_rcv(&l_ptr->reasm_head,

					   &l_ptr->reasm_tail,

					   &buf);

			tipc_buf_append(&l_ptr->reasm_buf, &buf);

		}

	}

exit:
@@ -2309,55 +2301,6 @@ static int tipc_link_frag_xmit(struct tipc_link *l_ptr, struct sk_buff *buf) 
	return dsz;

}



/* tipc_link_frag_rcv(): Called with node lock on. Returns

 * the reassembled buffer if message is complete.

 */

int tipc_link_frag_rcv(struct sk_buff **head, struct sk_buff **tail,

		       struct sk_buff **fbuf)

{

	struct sk_buff *frag = *fbuf;

	struct tipc_msg *msg = buf_msg(frag);

	u32 fragid = msg_type(msg);

	bool headstolen;

	int delta;



	skb_pull(frag, msg_hdr_sz(msg));

	if (fragid == FIRST_FRAGMENT) {

		if (*head || skb_unclone(frag, GFP_ATOMIC))

			goto out_free;

		*head = frag;

		skb_frag_list_init(*head);

		*fbuf = NULL;

		return 0;

	} else if (*head &&

		   skb_try_coalesce(*head, frag, &headstolen, &delta)) {

		kfree_skb_partial(frag, headstolen);

	} else {

		if (!*head)

			goto out_free;

		if (!skb_has_frag_list(*head))

			skb_shinfo(*head)->frag_list = frag;

		else

			(*tail)->next = frag;

		*tail = frag;

		(*head)->truesize += frag->truesize;

		(*head)->data_len += frag->len;

		(*head)->len += frag->len;

	}

	if (fragid == LAST_FRAGMENT) {

		*fbuf = *head;

		*tail = *head = NULL;

		return LINK_REASM_COMPLETE;

	}

	*fbuf = NULL;

	return 0;

out_free:

	pr_warn_ratelimited("Link unable to reassemble fragmented message\n");

	kfree_skb(*fbuf);

	*fbuf = NULL;

	return LINK_REASM_ERROR;

}



static void link_set_supervision_props(struct tipc_link *l_ptr, u32 tolerance)

{

	if ((tolerance < TIPC_MIN_LINK_TOL) || (tolerance > TIPC_MAX_LINK_TOL))

net/tipc/link.h

+2 −12
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ 
#include "msg.h"

#include "node.h"



/* Link reassembly status codes

 */

#define LINK_REASM_ERROR	-1

#define LINK_REASM_COMPLETE	1



/* Out-of-range value for link sequence numbers

 */

#define INVALID_LINK_SEQ 0x10000
@@ -140,8 +135,7 @@ struct tipc_stats { 
 * @next_out: ptr to first unsent outbound message in queue

 * @waiting_ports: linked list of ports waiting for link congestion to abate

 * @long_msg_seq_no: next identifier to use for outbound fragmented messages

 * @reasm_head: list head of partially reassembled inbound message fragments

 * @reasm_tail: last fragment received

 * @reasm_buf: head of partially reassembled inbound message fragments

 * @stats: collects statistics regarding link activity

 */

struct tipc_link {
@@ -204,8 +198,7 @@ struct tipc_link { 


	/* Fragmentation/reassembly */

	u32 long_msg_seq_no;

	struct sk_buff *reasm_head;

	struct sk_buff *reasm_tail;

	struct sk_buff *reasm_buf;



	/* Statistics */

	struct tipc_stats stats;
@@ -242,9 +235,6 @@ int tipc_link_iovec_xmit_fast(struct tipc_port *sender, 
			      struct iovec const *msg_sect,

			      unsigned int len, u32 destnode);

void tipc_link_bundle_rcv(struct sk_buff *buf);

int tipc_link_frag_rcv(struct sk_buff **reasm_head,

		       struct sk_buff **reasm_tail,

		       struct sk_buff **fbuf);

void tipc_link_proto_xmit(struct tipc_link *l_ptr, u32 msg_typ, int prob,

			  u32 gap, u32 tolerance, u32 priority, u32 acked_mtu);

void tipc_link_push_queue(struct tipc_link *l_ptr);

net/tipc/msg.c

+54 −1
Original line number Diff line number Diff line 
/*

 * net/tipc/msg.c: TIPC message header routines

 *

 * Copyright (c) 2000-2006, Ericsson AB

 * Copyright (c) 2000-2006, 2014, Ericsson AB

 * Copyright (c) 2005, 2010-2011, Wind River Systems

 * All rights reserved.

 *
@@ -99,3 +99,56 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect, 
	}

	return dsz;

}



/* tipc_buf_append(): Append a buffer to the fragment list of another buffer

 * Let first buffer become head buffer

 * Returns 1 and sets *buf to headbuf if chain is complete, otherwise 0

 * Leaves headbuf pointer at NULL if failure

 */

int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf)

{

	struct sk_buff *head = *headbuf;

	struct sk_buff *frag = *buf;

	struct sk_buff *tail;

	struct tipc_msg *msg = buf_msg(frag);

	u32 fragid = msg_type(msg);

	bool headstolen;

	int delta;



	skb_pull(frag, msg_hdr_sz(msg));



	if (fragid == FIRST_FRAGMENT) {

		if (head || skb_unclone(frag, GFP_ATOMIC))

			goto out_free;

		head = *headbuf = frag;

		skb_frag_list_init(head);

		return 0;

	}

	if (!head)

		goto out_free;

	tail = TIPC_SKB_CB(head)->tail;

	if (skb_try_coalesce(head, frag, &headstolen, &delta)) {

		kfree_skb_partial(frag, headstolen);

	} else {

		if (!skb_has_frag_list(head))

			skb_shinfo(head)->frag_list = frag;

		else

			tail->next = frag;

		head->truesize += frag->truesize;

		head->data_len += frag->len;

		head->len += frag->len;

		TIPC_SKB_CB(head)->tail = frag;

	}

	if (fragid == LAST_FRAGMENT) {

		*buf = head;

		TIPC_SKB_CB(head)->tail = NULL;

		*headbuf = NULL;

		return 1;

	}

	*buf = NULL;

	return 0;

out_free:

	pr_warn_ratelimited("Unable to build fragment list\n");

	kfree_skb(*buf);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE