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

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

net_sched: use tcf_queue_work() in flower 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 94cdb475

net/sched/cls_flower.c

+16 −3
Original line number Diff line number Diff line
@@ -87,7 +87,10 @@ struct cls_fl_filter { 
	struct list_head list;

	u32 handle;

	u32 flags;

	union {

		struct work_struct work;

		struct rcu_head	rcu;

	};

	struct net_device *hw_dev;

};
@@ -215,12 +218,22 @@ static int fl_init(struct tcf_proto *tp) 
	return 0;

}



static void fl_destroy_filter(struct rcu_head *head)

static void fl_destroy_filter_work(struct work_struct *work)

{

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

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



	rtnl_lock();

	tcf_exts_destroy(&f->exts);

	kfree(f);

	rtnl_unlock();

}



static void fl_destroy_filter(struct rcu_head *head)

{

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



	INIT_WORK(&f->work, fl_destroy_filter_work);

	tcf_queue_work(&f->work);

}



static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f)