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

Commit 3f315590 authored by Erik Hugne's avatar Erik Hugne Committed by Greg Kroah-Hartman
Browse files

tipc: make dist queue pernet 



commit 541726abe7daca64390c2ec34e6a203145f1686d upstream.

Nametable updates received from the network that cannot be applied
immediately are placed on a defer queue. This queue is global to the
TIPC module, which might cause problems when using TIPC in containers.
To prevent nametable updates from escaping into the wrong namespace,
we make the queue pernet instead.

Signed-off-by: default avatarErik Hugne <erik.hugne@gmail.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 44b3b7e0

net/tipc/core.c

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static int __net_init tipc_init_net(struct net *net) 
	if (err)

		goto out_nametbl;



	INIT_LIST_HEAD(&tn->dist_queue);

	err = tipc_topsrv_start(net);

	if (err)

		goto out_subscr;

net/tipc/core.h

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ struct tipc_net { 
	spinlock_t nametbl_lock;

	struct name_table *nametbl;



	/* Name dist queue */

	struct list_head dist_queue;



	/* Topology subscription server */

	struct tipc_server *topsrv;

	atomic_t subscription_count;

net/tipc/name_distr.c

+7 −9
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ 


int sysctl_tipc_named_timeout __read_mostly = 2000;



/**

 * struct tipc_dist_queue - queue holding deferred name table updates

 */

static struct list_head tipc_dist_queue = LIST_HEAD_INIT(tipc_dist_queue);



struct distr_queue_item {

	struct distr_item i;

	u32 dtype;
@@ -340,9 +335,11 @@ static bool tipc_update_nametbl(struct net *net, struct distr_item *i, 
 * tipc_named_add_backlog - add a failed name table update to the backlog

 *

 */

static void tipc_named_add_backlog(struct distr_item *i, u32 type, u32 node)

static void tipc_named_add_backlog(struct net *net, struct distr_item *i,

				   u32 type, u32 node)

{

	struct distr_queue_item *e;

	struct tipc_net *tn = net_generic(net, tipc_net_id);

	unsigned long now = get_jiffies_64();



	e = kzalloc(sizeof(*e), GFP_ATOMIC);
@@ -352,7 +349,7 @@ static void tipc_named_add_backlog(struct distr_item *i, u32 type, u32 node) 
	e->node = node;

	e->expires = now + msecs_to_jiffies(sysctl_tipc_named_timeout);

	memcpy(e, i, sizeof(*i));

	list_add_tail(&e->next, &tipc_dist_queue);

	list_add_tail(&e->next, &tn->dist_queue);

}



/**
@@ -362,10 +359,11 @@ static void tipc_named_add_backlog(struct distr_item *i, u32 type, u32 node) 
void tipc_named_process_backlog(struct net *net)

{

	struct distr_queue_item *e, *tmp;

	struct tipc_net *tn = net_generic(net, tipc_net_id);

	char addr[16];

	unsigned long now = get_jiffies_64();



	list_for_each_entry_safe(e, tmp, &tipc_dist_queue, next) {

	list_for_each_entry_safe(e, tmp, &tn->dist_queue, next) {

		if (time_after(e->expires, now)) {

			if (!tipc_update_nametbl(net, &e->i, e->node, e->dtype))

				continue;
@@ -405,7 +403,7 @@ void tipc_named_rcv(struct net *net, struct sk_buff_head *inputq) 
		node = msg_orignode(msg);

		while (count--) {

			if (!tipc_update_nametbl(net, item, node, mtype))

				tipc_named_add_backlog(item, mtype, node);

				tipc_named_add_backlog(net, item, mtype, node);

			item++;

		}

		kfree_skb(skb);