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

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

net_sched: use tcf_queue_work() in flow 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 b1b5b04f

net/sched/cls_flow.c

+16 −3
Original line number Diff line number Diff line
@@ -57,8 +57,11 @@ struct flow_filter { 
	u32			divisor;

	u32			baseclass;

	u32			hashrnd;

	union {

		struct work_struct	work;

		struct rcu_head		rcu;

	};

};



static inline u32 addr_fold(void *addr)

{
@@ -369,14 +372,24 @@ static const struct nla_policy flow_policy[TCA_FLOW_MAX + 1] = { 
	[TCA_FLOW_PERTURB]	= { .type = NLA_U32 },

};



static void flow_destroy_filter(struct rcu_head *head)

static void flow_destroy_filter_work(struct work_struct *work)

{

	struct flow_filter *f = container_of(head, struct flow_filter, rcu);

	struct flow_filter *f = container_of(work, struct flow_filter, work);



	rtnl_lock();

	del_timer_sync(&f->perturb_timer);

	tcf_exts_destroy(&f->exts);

	tcf_em_tree_destroy(&f->ematches);

	kfree(f);

	rtnl_unlock();

}



static void flow_destroy_filter(struct rcu_head *head)

{

	struct flow_filter *f = container_of(head, struct flow_filter, rcu);



	INIT_WORK(&f->work, flow_destroy_filter_work);

	tcf_queue_work(&f->work);

}



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