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

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

net_sched: use tcf_queue_work() in bpf 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 c96a4838

net/sched/cls_bpf.c

+17 −2
Original line number Diff line number Diff line
@@ -49,8 +49,11 @@ struct cls_bpf_prog { 
	struct sock_filter *bpf_ops;

	const char *bpf_name;

	struct tcf_proto *tp;

	union {

		struct work_struct work;

		struct rcu_head rcu;

	};

};



static const struct nla_policy bpf_policy[TCA_BPF_MAX + 1] = {

	[TCA_BPF_CLASSID]	= { .type = NLA_U32 },
@@ -257,9 +260,21 @@ static void __cls_bpf_delete_prog(struct cls_bpf_prog *prog) 
	kfree(prog);

}



static void cls_bpf_delete_prog_work(struct work_struct *work)

{

	struct cls_bpf_prog *prog = container_of(work, struct cls_bpf_prog, work);



	rtnl_lock();

	__cls_bpf_delete_prog(prog);

	rtnl_unlock();

}



static void cls_bpf_delete_prog_rcu(struct rcu_head *rcu)

{

	__cls_bpf_delete_prog(container_of(rcu, struct cls_bpf_prog, rcu));

	struct cls_bpf_prog *prog = container_of(rcu, struct cls_bpf_prog, rcu);



	INIT_WORK(&prog->work, cls_bpf_delete_prog_work);

	tcf_queue_work(&prog->work);

}



static void __cls_bpf_delete(struct tcf_proto *tp, struct cls_bpf_prog *prog)