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

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

net_sched: use tcf_queue_work() in matchall 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 e071dff2

net/sched/cls_matchall.c

+16 −3
Original line number Diff line number Diff line
@@ -21,8 +21,11 @@ struct cls_mall_head { 
	struct tcf_result res;

	u32 handle;

	u32 flags;

	union {

		struct work_struct work;

		struct rcu_head	rcu;

	};

};



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

			 struct tcf_result *res)
@@ -41,13 +44,23 @@ static int mall_init(struct tcf_proto *tp) 
	return 0;

}



static void mall_destroy_work(struct work_struct *work)

{

	struct cls_mall_head *head = container_of(work, struct cls_mall_head,

						  work);

	rtnl_lock();

	tcf_exts_destroy(&head->exts);

	kfree(head);

	rtnl_unlock();

}



static void mall_destroy_rcu(struct rcu_head *rcu)

{

	struct cls_mall_head *head = container_of(rcu, struct cls_mall_head,

						  rcu);



	tcf_exts_destroy(&head->exts);

	kfree(head);

	INIT_WORK(&head->work, mall_destroy_work);

	tcf_queue_work(&head->work);

}



static int mall_replace_hw_filter(struct tcf_proto *tp,