Commit 1b61e70a authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: remove size variable from publ_list struct 



The size variable is introduced in publ_list struct to help us exactly
calculate SKB buffer sizes needed by publications when all publications
in name table are delivered in bulk in named_distribute(). But if
publication SKB buffer size is assumed to MTU, the size variable in
publ_list struct can be completely eliminated at the cost of wasting
a bit memory space for last SKB.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarTero Aho <tero.aho@coriant.com>
Reviewed-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Tested-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60c04aec

net/tipc/name_distr.c

+7 −12
Original line number Diff line number Diff line
@@ -41,26 +41,21 @@ 
/**

 * struct publ_list - list of publications made by this node

 * @list: circular list of publications

 * @list_size: number of entries in list

 */

struct publ_list {

	struct list_head list;

	u32 size;

};



static struct publ_list publ_zone = {

	.list = LIST_HEAD_INIT(publ_zone.list),

	.size = 0,

};



static struct publ_list publ_cluster = {

	.list = LIST_HEAD_INIT(publ_cluster.list),

	.size = 0,

};



static struct publ_list publ_node = {

	.list = LIST_HEAD_INIT(publ_node.list),

	.size = 0,

};



static struct publ_list *publ_lists[] = {
@@ -147,7 +142,6 @@ struct sk_buff *tipc_named_publish(struct publication *publ) 
	struct distr_item *item;



	list_add_tail(&publ->local_list, &publ_lists[publ->scope]->list);

	publ_lists[publ->scope]->size++;



	if (publ->scope == TIPC_NODE_SCOPE)

		return NULL;
@@ -172,7 +166,6 @@ struct sk_buff *tipc_named_withdraw(struct publication *publ) 
	struct distr_item *item;



	list_del(&publ->local_list);

	publ_lists[publ->scope]->size--;



	if (publ->scope == TIPC_NODE_SCOPE)

		return NULL;
@@ -200,16 +193,12 @@ static void named_distribute(struct sk_buff_head *list, u32 dnode, 
	struct publication *publ;

	struct sk_buff *skb = NULL;

	struct distr_item *item = NULL;

	uint dsz = pls->size * ITEM_SIZE;

	uint msg_dsz = (tipc_node_get_mtu(dnode, 0) / ITEM_SIZE) * ITEM_SIZE;

	uint rem = dsz;

	uint msg_rem = 0;

	uint msg_rem = msg_dsz;



	list_for_each_entry(publ, &pls->list, local_list) {

		/* Prepare next buffer: */

		if (!skb) {

			msg_rem = min_t(uint, rem, msg_dsz);

			rem -= msg_rem;

			skb = named_prepare_buf(PUBLICATION, msg_rem, dnode);

			if (!skb) {

				pr_warn("Bulk publication failure\n");
@@ -227,8 +216,14 @@ static void named_distribute(struct sk_buff_head *list, u32 dnode, 
		if (!msg_rem) {

			__skb_queue_tail(list, skb);

			skb = NULL;

			msg_rem = msg_dsz;

		}

	}

	if (skb) {

		msg_set_size(buf_msg(skb), INT_H_SIZE + (msg_dsz - msg_rem));

		skb_trim(skb, INT_H_SIZE + (msg_dsz - msg_rem));

		__skb_queue_tail(list, skb);

	}

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE