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

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

tipc: make tipc node table aware of net namespace 



Global variables associated with node table are below:
- node table list (node_htable)
- node hash table list (tipc_node_list)
- node table lock (node_list_lock)
- node number counter (tipc_num_nodes)
- node link number counter (tipc_num_links)

To make node table support namespace, above global variables must be
moved to tipc_net structure in order to keep secret for different
namespaces. As a consequence, these variables are allocated and
initialized when namespace is created, and deallocated when namespace
is destroyed. After the change, functions associated with these
variables have to utilize a namespace pointer to access them. So
adding namespace pointer as a parameter of these functions is the
major change made in the commit.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Tested-by: default avatarTero Aho <Tero.Aho@coriant.com>
Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c93d3baa

net/tipc/addr.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
#define TIPC_ZONE_MASK		0xff000000u

#define TIPC_CLUSTER_MASK	0xfffff000u



extern u32 tipc_own_addr __read_mostly;



static inline u32 tipc_zone_mask(u32 addr)

{

	return addr & TIPC_ZONE_MASK;

net/tipc/bcast.c

+12 −12
Original line number Diff line number Diff line
@@ -232,13 +232,12 @@ static void bclink_retransmit_pkt(u32 after, u32 to) 
 *

 * Called with no locks taken

 */

void tipc_bclink_wakeup_users(void)

void tipc_bclink_wakeup_users(struct net *net)

{

	struct sk_buff *skb;



	while ((skb = skb_dequeue(&bclink->link.waiting_sks)))

		tipc_sk_rcv(skb);



		tipc_sk_rcv(net, skb);

}



/**
@@ -385,9 +384,9 @@ void tipc_bclink_update_link_state(struct net *net, struct tipc_node *n_ptr, 
 * Delay any upcoming NACK by this node if another node has already

 * requested the first message this node is going to ask for.

 */

static void bclink_peek_nack(struct tipc_msg *msg)

static void bclink_peek_nack(struct net *net, struct tipc_msg *msg)

{

	struct tipc_node *n_ptr = tipc_node_find(msg_destnode(msg));

	struct tipc_node *n_ptr = tipc_node_find(net, msg_destnode(msg));



	if (unlikely(!n_ptr))

		return;
@@ -404,11 +403,12 @@ static void bclink_peek_nack(struct tipc_msg *msg) 


/* tipc_bclink_xmit - broadcast buffer chain to all nodes in cluster

 *                    and to identified node local sockets

 * @net: the applicable net namespace

 * @list: chain of buffers containing message

 * Consumes the buffer chain, except when returning -ELINKCONG

 * Returns 0 if success, otherwise errno: -ELINKCONG,-EHOSTUNREACH,-EMSGSIZE

 */

int tipc_bclink_xmit(struct sk_buff_head *list)

int tipc_bclink_xmit(struct net *net, struct sk_buff_head *list)

{

	int rc = 0;

	int bc = 0;
@@ -443,7 +443,7 @@ int tipc_bclink_xmit(struct sk_buff_head *list) 


	/* Deliver message clone */

	if (likely(!rc))

		tipc_sk_mcast_rcv(skb);

		tipc_sk_mcast_rcv(net, skb);

	else

		kfree_skb(skb);
@@ -491,7 +491,7 @@ void tipc_bclink_rcv(struct net *net, struct sk_buff *buf) 
	if (msg_mc_netid(msg) != tn->net_id)

		goto exit;



	node = tipc_node_find(msg_prevnode(msg));

	node = tipc_node_find(net, msg_prevnode(msg));

	if (unlikely(!node))

		goto exit;
@@ -514,7 +514,7 @@ void tipc_bclink_rcv(struct net *net, struct sk_buff *buf) 
			tipc_bclink_unlock();

		} else {

			tipc_node_unlock(node);

			bclink_peek_nack(msg);

			bclink_peek_nack(net, msg);

		}

		goto exit;

	}
@@ -532,7 +532,7 @@ void tipc_bclink_rcv(struct net *net, struct sk_buff *buf) 
			tipc_bclink_unlock();

			tipc_node_unlock(node);

			if (likely(msg_mcast(msg)))

				tipc_sk_mcast_rcv(buf);

				tipc_sk_mcast_rcv(net, buf);

			else

				kfree_skb(buf);

		} else if (msg_user(msg) == MSG_BUNDLER) {
@@ -542,7 +542,7 @@ void tipc_bclink_rcv(struct net *net, struct sk_buff *buf) 
			bcl->stats.recv_bundled += msg_msgcnt(msg);

			tipc_bclink_unlock();

			tipc_node_unlock(node);

			tipc_link_bundle_rcv(buf);

			tipc_link_bundle_rcv(net, buf);

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

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

			if (unlikely(!buf && !node->bclink.reasm_buf))
@@ -563,7 +563,7 @@ void tipc_bclink_rcv(struct net *net, struct sk_buff *buf) 
			bclink_accept_pkt(node, seqno);

			tipc_bclink_unlock();

			tipc_node_unlock(node);

			tipc_named_rcv(buf);

			tipc_named_rcv(net, buf);

		} else {

			tipc_bclink_lock();

			bclink_accept_pkt(node, seqno);

net/tipc/bcast.h

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ int tipc_bclink_reset_stats(void); 
int  tipc_bclink_set_queue_limits(u32 limit);

void tipc_bcbearer_sort(struct tipc_node_map *nm_ptr, u32 node, bool action);

uint  tipc_bclink_get_mtu(void);

int tipc_bclink_xmit(struct sk_buff_head *list);

void tipc_bclink_wakeup_users(void);

int tipc_bclink_xmit(struct net *net, struct sk_buff_head *list);

void tipc_bclink_wakeup_users(struct net *net);

int tipc_nl_add_bc_link(struct tipc_nl_msg *msg);



#endif

net/tipc/bearer.c

+14 −11
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ static const struct nla_policy tipc_nl_media_policy[TIPC_NLA_MEDIA_MAX + 1] = { 


struct tipc_bearer __rcu *bearer_list[MAX_BEARERS + 1];



static void bearer_disable(struct tipc_bearer *b_ptr, bool shutting_down);

static void bearer_disable(struct net *net, struct tipc_bearer *b_ptr,

			   bool shutting_down);



/**

 * tipc_media_find - locates specified media object by name
@@ -364,7 +365,7 @@ int tipc_enable_bearer(struct net *net, const char *name, u32 disc_domain, 


	res = tipc_disc_create(net, b_ptr, &b_ptr->bcast_addr);

	if (res) {

		bearer_disable(b_ptr, false);

		bearer_disable(net, b_ptr, false);

		pr_warn("Bearer <%s> rejected, discovery object creation failed\n",

			name);

		return -EINVAL;
@@ -384,7 +385,7 @@ int tipc_enable_bearer(struct net *net, const char *name, u32 disc_domain, 
static int tipc_reset_bearer(struct net *net, struct tipc_bearer *b_ptr)

{

	pr_info("Resetting bearer <%s>\n", b_ptr->name);

	tipc_link_reset_list(b_ptr->identity);

	tipc_link_reset_list(net, b_ptr->identity);

	tipc_disc_reset(net, b_ptr);

	return 0;

}
@@ -394,14 +395,15 @@ static int tipc_reset_bearer(struct net *net, struct tipc_bearer *b_ptr) 
 *

 * Note: This routine assumes caller holds RTNL lock.

 */

static void bearer_disable(struct tipc_bearer *b_ptr, bool shutting_down)

static void bearer_disable(struct net *net, struct tipc_bearer *b_ptr,

			   bool shutting_down)

{

	u32 i;



	pr_info("Disabling bearer <%s>\n", b_ptr->name);

	b_ptr->media->disable_media(b_ptr);



	tipc_link_delete_list(b_ptr->identity, shutting_down);

	tipc_link_delete_list(net, b_ptr->identity, shutting_down);

	if (b_ptr->link_req)

		tipc_disc_delete(b_ptr->link_req);
@@ -414,7 +416,7 @@ static void bearer_disable(struct tipc_bearer *b_ptr, bool shutting_down) 
	kfree_rcu(b_ptr, rcu);

}



int tipc_disable_bearer(const char *name)

int tipc_disable_bearer(struct net *net, const char *name)

{

	struct tipc_bearer *b_ptr;

	int res;
@@ -424,7 +426,7 @@ int tipc_disable_bearer(const char *name) 
		pr_warn("Attempt to disable unknown bearer <%s>\n", name);

		res = -EINVAL;

	} else {

		bearer_disable(b_ptr, false);

		bearer_disable(net, b_ptr, false);

		res = 0;

	}

	return res;
@@ -593,7 +595,7 @@ static int tipc_l2_device_event(struct notifier_block *nb, unsigned long evt, 
		break;

	case NETDEV_UNREGISTER:

	case NETDEV_CHANGENAME:

		bearer_disable(b_ptr, false);

		bearer_disable(dev_net(dev), b_ptr, false);

		break;

	}

	return NOTIFY_OK;
@@ -626,7 +628,7 @@ void tipc_bearer_cleanup(void) 
	dev_remove_pack(&tipc_packet_type);

}



void tipc_bearer_stop(void)

void tipc_bearer_stop(struct net *net)

{

	struct tipc_bearer *b_ptr;

	u32 i;
@@ -634,7 +636,7 @@ void tipc_bearer_stop(void) 
	for (i = 0; i < MAX_BEARERS; i++) {

		b_ptr = rtnl_dereference(bearer_list[i]);

		if (b_ptr) {

			bearer_disable(b_ptr, true);

			bearer_disable(net, b_ptr, true);

			bearer_list[i] = NULL;

		}

	}
@@ -772,6 +774,7 @@ int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info) 
	char *name;

	struct tipc_bearer *bearer;

	struct nlattr *attrs[TIPC_NLA_BEARER_MAX + 1];

	struct net *net = genl_info_net(info);



	if (!info->attrs[TIPC_NLA_BEARER])

		return -EINVAL;
@@ -794,7 +797,7 @@ int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info) 
		return -EINVAL;

	}



	bearer_disable(bearer, false);

	bearer_disable(net, bearer, false);

	rtnl_unlock();



	return 0;

net/tipc/bearer.h

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ extern struct tipc_bearer __rcu *bearer_list[]; 
void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b_ptr);

int tipc_enable_bearer(struct net *net, const char *bearer_name,

		       u32 disc_domain, u32 priority);

int tipc_disable_bearer(const char *name);

int tipc_disable_bearer(struct net *net, const char *name);



/*

 * Routines made available to TIPC by supported media types
@@ -205,7 +205,7 @@ struct tipc_bearer *tipc_bearer_find(const char *name); 
struct tipc_media *tipc_media_find(const char *name);

int tipc_bearer_setup(void);

void tipc_bearer_cleanup(void);

void tipc_bearer_stop(void);

void tipc_bearer_stop(struct net *net);

void tipc_bearer_send(u32 bearer_id, struct sk_buff *buf,

		      struct tipc_media_addr *dest);