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

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

net_sched: use tcf_queue_work() in cgroup filter 



Defer the tcf_exts_destroy() in RCU callback to
tc filter workqueue and get RTNL lock.

Reported-by: default avatarChris Mi <chrism@mellanox.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jiri Pirko <jiri@resnulli.us>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e910af67

net/sched/cls_cgroup.c

+18 −4
Original line number Diff line number Diff line
@@ -23,8 +23,11 @@ struct cls_cgroup_head { 
	struct tcf_exts		exts;

	struct tcf_ematch_tree	ematches;

	struct tcf_proto	*tp;

	union {

		struct work_struct	work;

		struct rcu_head		rcu;

	};

};



static int cls_cgroup_classify(struct sk_buff *skb, const struct tcf_proto *tp,

			       struct tcf_result *res)
@@ -57,15 +60,26 @@ static const struct nla_policy cgroup_policy[TCA_CGROUP_MAX + 1] = { 
	[TCA_CGROUP_EMATCHES]	= { .type = NLA_NESTED },

};



static void cls_cgroup_destroy_work(struct work_struct *work)

{

	struct cls_cgroup_head *head = container_of(work,

						    struct cls_cgroup_head,

						    work);

	rtnl_lock();

	tcf_exts_destroy(&head->exts);

	tcf_em_tree_destroy(&head->ematches);

	kfree(head);

	rtnl_unlock();

}



static void cls_cgroup_destroy_rcu(struct rcu_head *root)

{

	struct cls_cgroup_head *head = container_of(root,

						    struct cls_cgroup_head,

						    rcu);



	tcf_exts_destroy(&head->exts);

	tcf_em_tree_destroy(&head->ematches);

	kfree(head);

	INIT_WORK(&head->work, cls_cgroup_destroy_work);

	tcf_queue_work(&head->work);

}



static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,