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

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

net_sched: use tcf_queue_work() in rsvp 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 c2f3f31d

net/sched/cls_rsvp.h

+16 −3
Original line number Diff line number Diff line
@@ -97,8 +97,11 @@ struct rsvp_filter { 


	u32				handle;

	struct rsvp_session		*sess;

	union {

		struct work_struct		work;

		struct rcu_head			rcu;

	};

};



static inline unsigned int hash_dst(__be32 *dst, u8 protocol, u8 tunnelid)

{
@@ -282,12 +285,22 @@ static int rsvp_init(struct tcf_proto *tp) 
	return -ENOBUFS;

}



static void rsvp_delete_filter_rcu(struct rcu_head *head)

static void rsvp_delete_filter_work(struct work_struct *work)

{

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

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



	rtnl_lock();

	tcf_exts_destroy(&f->exts);

	kfree(f);

	rtnl_unlock();

}



static void rsvp_delete_filter_rcu(struct rcu_head *head)

{

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



	INIT_WORK(&f->work, rsvp_delete_filter_work);

	tcf_queue_work(&f->work);

}



static void rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f)