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

Commit c7e460ce authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

Revert "net_sched: hold netns refcnt for each action" 



This reverts commit ceffcc5e.
If we hold that refcnt, the netns can never be destroyed until
all actions are destroyed by user, this breaks our netns design
which we expect all actions are destroyed when we destroy the
whole netns.

Cc: Lucas Bates <lucasb@mojatatu.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f562462

include/net/act_api.h

+1 −3
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
struct tcf_idrinfo {

	spinlock_t	lock;

	struct idr	action_idr;

	struct net	*net;

};



struct tc_action_ops;
@@ -106,7 +105,7 @@ struct tc_action_net { 


static inline

int tc_action_net_init(struct tc_action_net *tn,

		       const struct tc_action_ops *ops, struct net *net)

		       const struct tc_action_ops *ops)

{

	int err = 0;
@@ -114,7 +113,6 @@ int tc_action_net_init(struct tc_action_net *tn, 
	if (!tn->idrinfo)

		return -ENOMEM;

	tn->ops = ops;

	tn->idrinfo->net = net;

	spin_lock_init(&tn->idrinfo->lock);

	idr_init(&tn->idrinfo->action_idr);

	return err;

net/sched/act_api.c

+0 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static void tcf_idr_remove(struct tcf_idrinfo *idrinfo, struct tc_action *p) 
	spin_lock_bh(&idrinfo->lock);

	idr_remove_ext(&idrinfo->action_idr, p->tcfa_index);

	spin_unlock_bh(&idrinfo->lock);

	put_net(idrinfo->net);

	gen_kill_estimator(&p->tcfa_rate_est);

	free_tcf(p);

}
@@ -337,7 +336,6 @@ int tcf_idr_create(struct tc_action_net *tn, u32 index, struct nlattr *est, 
	p->idrinfo = idrinfo;

	p->ops = ops;

	INIT_LIST_HEAD(&p->list);

	get_net(idrinfo->net);

	*a = p;

	return 0;

}

net/sched/act_bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static __net_init int bpf_init_net(struct net *net) 
{

	struct tc_action_net *tn = net_generic(net, bpf_net_id);



	return tc_action_net_init(tn, &act_bpf_ops, net);

	return tc_action_net_init(tn, &act_bpf_ops);

}



static void __net_exit bpf_exit_net(struct net *net)

net/sched/act_connmark.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static __net_init int connmark_init_net(struct net *net) 
{

	struct tc_action_net *tn = net_generic(net, connmark_net_id);



	return tc_action_net_init(tn, &act_connmark_ops, net);

	return tc_action_net_init(tn, &act_connmark_ops);

}



static void __net_exit connmark_exit_net(struct net *net)

net/sched/act_csum.c

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ static __net_init int csum_init_net(struct net *net) 
{

	struct tc_action_net *tn = net_generic(net, csum_net_id);



	return tc_action_net_init(tn, &act_csum_ops, net);

	return tc_action_net_init(tn, &act_csum_ops);

}



static void __net_exit csum_exit_net(struct net *net)