Commit cab3c8ec authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

netns: always provide the id to rtnl_net_fill() 



The goal of this commit is to prepare the rework of the locking of nsnid
protection.
After this patch, rtnl_net_notifyid() will not call anymore __peernet2id(),
ie no idr_* operation into this function.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 109582af

net/core/net_namespace.c

+11 −20
Original line number Original line Diff line number Diff line
@@ -147,8 +147,7 @@ static void ops_free_list(const struct pernet_operations *ops, 
	}

	}

}

}





static void rtnl_net_notifyid(struct net *net, struct net *peer, int cmd,

static void rtnl_net_notifyid(struct net *net, int cmd, int id);

			      int id);

static int alloc_netid(struct net *net, struct net *peer, int reqid)

static int alloc_netid(struct net *net, struct net *peer, int reqid)

{

{

	int min = 0, max = 0, id;

	int min = 0, max = 0, id;
@@ -162,7 +161,7 @@ static int alloc_netid(struct net *net, struct net *peer, int reqid) 




	id = idr_alloc(&net->netns_ids, peer, min, max, GFP_KERNEL);

	id = idr_alloc(&net->netns_ids, peer, min, max, GFP_KERNEL);

	if (id >= 0)

	if (id >= 0)

		rtnl_net_notifyid(net, peer, RTM_NEWNSID, id);

		rtnl_net_notifyid(net, RTM_NEWNSID, id);





	return id;

	return id;

}

}
@@ -365,7 +364,7 @@ static void cleanup_net(struct work_struct *work) 
			int id = __peernet2id(tmp, net, false);

			int id = __peernet2id(tmp, net, false);





			if (id >= 0) {

			if (id >= 0) {

				rtnl_net_notifyid(tmp, net, RTM_DELNSID, id);

				rtnl_net_notifyid(tmp, RTM_DELNSID, id);

				idr_remove(&tmp->netns_ids, id);

				idr_remove(&tmp->netns_ids, id);

			}

			}

		}

		}
@@ -538,14 +537,10 @@ static int rtnl_net_get_size(void) 
}

}





static int rtnl_net_fill(struct sk_buff *skb, u32 portid, u32 seq, int flags,

static int rtnl_net_fill(struct sk_buff *skb, u32 portid, u32 seq, int flags,

			 int cmd, struct net *net, struct net *peer,

			 int cmd, struct net *net, int nsid)

			 int nsid)

{

{

	struct nlmsghdr *nlh;

	struct nlmsghdr *nlh;

	struct rtgenmsg *rth;

	struct rtgenmsg *rth;

	int id;



	ASSERT_RTNL();





	nlh = nlmsg_put(skb, portid, seq, cmd, sizeof(*rth), flags);

	nlh = nlmsg_put(skb, portid, seq, cmd, sizeof(*rth), flags);

	if (!nlh)

	if (!nlh)
@@ -554,11 +549,7 @@ static int rtnl_net_fill(struct sk_buff *skb, u32 portid, u32 seq, int flags, 
	rth = nlmsg_data(nlh);

	rth = nlmsg_data(nlh);

	rth->rtgen_family = AF_UNSPEC;

	rth->rtgen_family = AF_UNSPEC;





	if (nsid >= 0)

	if (nla_put_s32(skb, NETNSA_NSID, nsid))

		id = nsid;

	else

		id = __peernet2id(net, peer, false);

	if (nla_put_s32(skb, NETNSA_NSID, id))

		goto nla_put_failure;

		goto nla_put_failure;





	nlmsg_end(skb, nlh);

	nlmsg_end(skb, nlh);
@@ -575,7 +566,7 @@ static int rtnl_net_getid(struct sk_buff *skb, struct nlmsghdr *nlh) 
	struct nlattr *tb[NETNSA_MAX + 1];

	struct nlattr *tb[NETNSA_MAX + 1];

	struct sk_buff *msg;

	struct sk_buff *msg;

	struct net *peer;

	struct net *peer;

	int err;

	int err, id;





	err = nlmsg_parse(nlh, sizeof(struct rtgenmsg), tb, NETNSA_MAX,

	err = nlmsg_parse(nlh, sizeof(struct rtgenmsg), tb, NETNSA_MAX,

			  rtnl_net_policy);

			  rtnl_net_policy);
@@ -597,8 +588,9 @@ static int rtnl_net_getid(struct sk_buff *skb, struct nlmsghdr *nlh) 
		goto out;

		goto out;

	}

	}





	id = __peernet2id(net, peer, false);

	err = rtnl_net_fill(msg, NETLINK_CB(skb).portid, nlh->nlmsg_seq, 0,

	err = rtnl_net_fill(msg, NETLINK_CB(skb).portid, nlh->nlmsg_seq, 0,

			    RTM_GETNSID, net, peer, -1);

			    RTM_GETNSID, net, id);

	if (err < 0)

	if (err < 0)

		goto err_out;

		goto err_out;
@@ -630,7 +622,7 @@ static int rtnl_net_dumpid_one(int id, void *peer, void *data) 




	ret = rtnl_net_fill(net_cb->skb, NETLINK_CB(net_cb->cb->skb).portid,

	ret = rtnl_net_fill(net_cb->skb, NETLINK_CB(net_cb->cb->skb).portid,

			    net_cb->cb->nlh->nlmsg_seq, NLM_F_MULTI,

			    net_cb->cb->nlh->nlmsg_seq, NLM_F_MULTI,

			    RTM_NEWNSID, net_cb->net, peer, id);

			    RTM_NEWNSID, net_cb->net, id);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;
@@ -658,8 +650,7 @@ static int rtnl_net_dumpid(struct sk_buff *skb, struct netlink_callback *cb) 
	return skb->len;

	return skb->len;

}

}





static void rtnl_net_notifyid(struct net *net, struct net *peer, int cmd,

static void rtnl_net_notifyid(struct net *net, int cmd, int id)

			      int id)

{

{

	struct sk_buff *msg;

	struct sk_buff *msg;

	int err = -ENOMEM;

	int err = -ENOMEM;
@@ -668,7 +659,7 @@ static void rtnl_net_notifyid(struct net *net, struct net *peer, int cmd, 
	if (!msg)

	if (!msg)

		goto out;

		goto out;





	err = rtnl_net_fill(msg, 0, 0, 0, cmd, net, peer, id);

	err = rtnl_net_fill(msg, 0, 0, 0, cmd, net, id);

	if (err < 0)

	if (err < 0)

		goto err_out;

		goto err_out;