Commit aaa908ff authored by Cong Wang's avatar Cong Wang Committed by David S. Miller

net_sched: switch to rcu_work

Commit 05f0fe6b ("RCU, workqueue: Implement rcu_work") introduces
new API's for dispatching work in a RCU callback. Now we can just
switch to the new API's for tc filters. This could get rid of a lot
of code.

Cc: Tejun Heo <tj@kernel.org>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1bb58d2d
...@@ -33,7 +33,7 @@ struct tcf_block_ext_info { ...@@ -33,7 +33,7 @@ struct tcf_block_ext_info {
}; };
struct tcf_block_cb; struct tcf_block_cb;
bool tcf_queue_work(struct work_struct *work); bool tcf_queue_work(struct rcu_work *rwork, work_func_t func);
#ifdef CONFIG_NET_CLS #ifdef CONFIG_NET_CLS
struct tcf_chain *tcf_chain_get(struct tcf_block *block, u32 chain_index, struct tcf_chain *tcf_chain_get(struct tcf_block *block, u32 chain_index,
......
...@@ -103,9 +103,10 @@ int unregister_tcf_proto_ops(struct tcf_proto_ops *ops) ...@@ -103,9 +103,10 @@ int unregister_tcf_proto_ops(struct tcf_proto_ops *ops)
} }
EXPORT_SYMBOL(unregister_tcf_proto_ops); EXPORT_SYMBOL(unregister_tcf_proto_ops);
bool tcf_queue_work(struct work_struct *work) bool tcf_queue_work(struct rcu_work *rwork, work_func_t func)
{ {
return queue_work(tc_filter_wq, work); INIT_RCU_WORK(rwork, func);
return queue_rcu_work(tc_filter_wq, rwork);
} }
EXPORT_SYMBOL(tcf_queue_work); EXPORT_SYMBOL(tcf_queue_work);
......
...@@ -35,10 +35,7 @@ struct basic_filter { ...@@ -35,10 +35,7 @@ struct basic_filter {
struct tcf_result res; struct tcf_result res;
struct tcf_proto *tp; struct tcf_proto *tp;
struct list_head link; struct list_head link;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
}; };
static int basic_classify(struct sk_buff *skb, const struct tcf_proto *tp, static int basic_classify(struct sk_buff *skb, const struct tcf_proto *tp,
...@@ -97,21 +94,14 @@ static void __basic_delete_filter(struct basic_filter *f) ...@@ -97,21 +94,14 @@ static void __basic_delete_filter(struct basic_filter *f)
static void basic_delete_filter_work(struct work_struct *work) static void basic_delete_filter_work(struct work_struct *work)
{ {
struct basic_filter *f = container_of(work, struct basic_filter, work); struct basic_filter *f = container_of(to_rcu_work(work),
struct basic_filter,
rwork);
rtnl_lock(); rtnl_lock();
__basic_delete_filter(f); __basic_delete_filter(f);
rtnl_unlock(); rtnl_unlock();
} }
static void basic_delete_filter(struct rcu_head *head)
{
struct basic_filter *f = container_of(head, struct basic_filter, rcu);
INIT_WORK(&f->work, basic_delete_filter_work);
tcf_queue_work(&f->work);
}
static void basic_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) static void basic_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
{ {
struct basic_head *head = rtnl_dereference(tp->root); struct basic_head *head = rtnl_dereference(tp->root);
...@@ -122,7 +112,7 @@ static void basic_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) ...@@ -122,7 +112,7 @@ static void basic_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
idr_remove(&head->handle_idr, f->handle); idr_remove(&head->handle_idr, f->handle);
if (tcf_exts_get_net(&f->exts)) if (tcf_exts_get_net(&f->exts))
call_rcu(&f->rcu, basic_delete_filter); tcf_queue_work(&f->rwork, basic_delete_filter_work);
else else
__basic_delete_filter(f); __basic_delete_filter(f);
} }
...@@ -140,7 +130,7 @@ static int basic_delete(struct tcf_proto *tp, void *arg, bool *last, ...@@ -140,7 +130,7 @@ static int basic_delete(struct tcf_proto *tp, void *arg, bool *last,
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
idr_remove(&head->handle_idr, f->handle); idr_remove(&head->handle_idr, f->handle);
tcf_exts_get_net(&f->exts); tcf_exts_get_net(&f->exts);
call_rcu(&f->rcu, basic_delete_filter); tcf_queue_work(&f->rwork, basic_delete_filter_work);
*last = list_empty(&head->flist); *last = list_empty(&head->flist);
return 0; return 0;
} }
...@@ -234,7 +224,7 @@ static int basic_change(struct net *net, struct sk_buff *in_skb, ...@@ -234,7 +224,7 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,
list_replace_rcu(&fold->link, &fnew->link); list_replace_rcu(&fold->link, &fnew->link);
tcf_unbind_filter(tp, &fold->res); tcf_unbind_filter(tp, &fold->res);
tcf_exts_get_net(&fold->exts); tcf_exts_get_net(&fold->exts);
call_rcu(&fold->rcu, basic_delete_filter); tcf_queue_work(&fold->rwork, basic_delete_filter_work);
} else { } else {
list_add_rcu(&fnew->link, &head->flist); list_add_rcu(&fnew->link, &head->flist);
} }
......
...@@ -49,10 +49,7 @@ struct cls_bpf_prog { ...@@ -49,10 +49,7 @@ struct cls_bpf_prog {
struct sock_filter *bpf_ops; struct sock_filter *bpf_ops;
const char *bpf_name; const char *bpf_name;
struct tcf_proto *tp; struct tcf_proto *tp;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
}; };
static const struct nla_policy bpf_policy[TCA_BPF_MAX + 1] = { static const struct nla_policy bpf_policy[TCA_BPF_MAX + 1] = {
...@@ -275,21 +272,14 @@ static void __cls_bpf_delete_prog(struct cls_bpf_prog *prog) ...@@ -275,21 +272,14 @@ static void __cls_bpf_delete_prog(struct cls_bpf_prog *prog)
static void cls_bpf_delete_prog_work(struct work_struct *work) static void cls_bpf_delete_prog_work(struct work_struct *work)
{ {
struct cls_bpf_prog *prog = container_of(work, struct cls_bpf_prog, work); struct cls_bpf_prog *prog = container_of(to_rcu_work(work),
struct cls_bpf_prog,
rwork);
rtnl_lock(); rtnl_lock();
__cls_bpf_delete_prog(prog); __cls_bpf_delete_prog(prog);
rtnl_unlock(); rtnl_unlock();
} }
static void cls_bpf_delete_prog_rcu(struct rcu_head *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, static void __cls_bpf_delete(struct tcf_proto *tp, struct cls_bpf_prog *prog,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
...@@ -300,7 +290,7 @@ static void __cls_bpf_delete(struct tcf_proto *tp, struct cls_bpf_prog *prog, ...@@ -300,7 +290,7 @@ static void __cls_bpf_delete(struct tcf_proto *tp, struct cls_bpf_prog *prog,
list_del_rcu(&prog->link); list_del_rcu(&prog->link);
tcf_unbind_filter(tp, &prog->res); tcf_unbind_filter(tp, &prog->res);
if (tcf_exts_get_net(&prog->exts)) if (tcf_exts_get_net(&prog->exts))
call_rcu(&prog->rcu, cls_bpf_delete_prog_rcu); tcf_queue_work(&prog->rwork, cls_bpf_delete_prog_work);
else else
__cls_bpf_delete_prog(prog); __cls_bpf_delete_prog(prog);
} }
...@@ -526,7 +516,7 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb, ...@@ -526,7 +516,7 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
list_replace_rcu(&oldprog->link, &prog->link); list_replace_rcu(&oldprog->link, &prog->link);
tcf_unbind_filter(tp, &oldprog->res); tcf_unbind_filter(tp, &oldprog->res);
tcf_exts_get_net(&oldprog->exts); tcf_exts_get_net(&oldprog->exts);
call_rcu(&oldprog->rcu, cls_bpf_delete_prog_rcu); tcf_queue_work(&oldprog->rwork, cls_bpf_delete_prog_work);
} else { } else {
list_add_rcu(&prog->link, &head->plist); list_add_rcu(&prog->link, &head->plist);
} }
......
...@@ -23,10 +23,7 @@ struct cls_cgroup_head { ...@@ -23,10 +23,7 @@ struct cls_cgroup_head {
struct tcf_exts exts; struct tcf_exts exts;
struct tcf_ematch_tree ematches; struct tcf_ematch_tree ematches;
struct tcf_proto *tp; struct tcf_proto *tp;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
}; };
static int cls_cgroup_classify(struct sk_buff *skb, const struct tcf_proto *tp, static int cls_cgroup_classify(struct sk_buff *skb, const struct tcf_proto *tp,
...@@ -70,24 +67,14 @@ static void __cls_cgroup_destroy(struct cls_cgroup_head *head) ...@@ -70,24 +67,14 @@ static void __cls_cgroup_destroy(struct cls_cgroup_head *head)
static void cls_cgroup_destroy_work(struct work_struct *work) static void cls_cgroup_destroy_work(struct work_struct *work)
{ {
struct cls_cgroup_head *head = container_of(work, struct cls_cgroup_head *head = container_of(to_rcu_work(work),
struct cls_cgroup_head, struct cls_cgroup_head,
work); rwork);
rtnl_lock(); rtnl_lock();
__cls_cgroup_destroy(head); __cls_cgroup_destroy(head);
rtnl_unlock(); rtnl_unlock();
} }
static void cls_cgroup_destroy_rcu(struct rcu_head *root)
{
struct cls_cgroup_head *head = container_of(root,
struct cls_cgroup_head,
rcu);
INIT_WORK(&head->work, cls_cgroup_destroy_work);
tcf_queue_work(&head->work);
}
static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb, static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,
struct tcf_proto *tp, unsigned long base, struct tcf_proto *tp, unsigned long base,
u32 handle, struct nlattr **tca, u32 handle, struct nlattr **tca,
...@@ -134,7 +121,7 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb, ...@@ -134,7 +121,7 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,
rcu_assign_pointer(tp->root, new); rcu_assign_pointer(tp->root, new);
if (head) { if (head) {
tcf_exts_get_net(&head->exts); tcf_exts_get_net(&head->exts);
call_rcu(&head->rcu, cls_cgroup_destroy_rcu); tcf_queue_work(&head->rwork, cls_cgroup_destroy_work);
} }
return 0; return 0;
errout: errout:
...@@ -151,7 +138,7 @@ static void cls_cgroup_destroy(struct tcf_proto *tp, ...@@ -151,7 +138,7 @@ static void cls_cgroup_destroy(struct tcf_proto *tp,
/* Head can still be NULL due to cls_cgroup_init(). */ /* Head can still be NULL due to cls_cgroup_init(). */
if (head) { if (head) {
if (tcf_exts_get_net(&head->exts)) if (tcf_exts_get_net(&head->exts))
call_rcu(&head->rcu, cls_cgroup_destroy_rcu); tcf_queue_work(&head->rwork, cls_cgroup_destroy_work);
else else
__cls_cgroup_destroy(head); __cls_cgroup_destroy(head);
} }
......
...@@ -57,10 +57,7 @@ struct flow_filter { ...@@ -57,10 +57,7 @@ struct flow_filter {
u32 divisor; u32 divisor;
u32 baseclass; u32 baseclass;
u32 hashrnd; u32 hashrnd;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
}; };
static inline u32 addr_fold(void *addr) static inline u32 addr_fold(void *addr)
...@@ -383,21 +380,14 @@ static void __flow_destroy_filter(struct flow_filter *f) ...@@ -383,21 +380,14 @@ static void __flow_destroy_filter(struct flow_filter *f)
static void flow_destroy_filter_work(struct work_struct *work) static void flow_destroy_filter_work(struct work_struct *work)
{ {
struct flow_filter *f = container_of(work, struct flow_filter, work); struct flow_filter *f = container_of(to_rcu_work(work),
struct flow_filter,
rwork);
rtnl_lock(); rtnl_lock();
__flow_destroy_filter(f); __flow_destroy_filter(f);
rtnl_unlock(); 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, static int flow_change(struct net *net, struct sk_buff *in_skb,
struct tcf_proto *tp, unsigned long base, struct tcf_proto *tp, unsigned long base,
u32 handle, struct nlattr **tca, u32 handle, struct nlattr **tca,
...@@ -563,7 +553,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb, ...@@ -563,7 +553,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
if (fold) { if (fold) {
tcf_exts_get_net(&fold->exts); tcf_exts_get_net(&fold->exts);
call_rcu(&fold->rcu, flow_destroy_filter); tcf_queue_work(&fold->rwork, flow_destroy_filter_work);
} }
return 0; return 0;
...@@ -583,7 +573,7 @@ static int flow_delete(struct tcf_proto *tp, void *arg, bool *last, ...@@ -583,7 +573,7 @@ static int flow_delete(struct tcf_proto *tp, void *arg, bool *last,
list_del_rcu(&f->list); list_del_rcu(&f->list);
tcf_exts_get_net(&f->exts); tcf_exts_get_net(&f->exts);
call_rcu(&f->rcu, flow_destroy_filter); tcf_queue_work(&f->rwork, flow_destroy_filter_work);
*last = list_empty(&head->filters); *last = list_empty(&head->filters);
return 0; return 0;
} }
...@@ -608,7 +598,7 @@ static void flow_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) ...@@ -608,7 +598,7 @@ static void flow_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
list_for_each_entry_safe(f, next, &head->filters, list) { list_for_each_entry_safe(f, next, &head->filters, list) {
list_del_rcu(&f->list); list_del_rcu(&f->list);
if (tcf_exts_get_net(&f->exts)) if (tcf_exts_get_net(&f->exts))
call_rcu(&f->rcu, flow_destroy_filter); tcf_queue_work(&f->rwork, flow_destroy_filter_work);
else else
__flow_destroy_filter(f); __flow_destroy_filter(f);
} }
......
...@@ -73,10 +73,7 @@ struct fl_flow_mask { ...@@ -73,10 +73,7 @@ struct fl_flow_mask {
struct cls_fl_head { struct cls_fl_head {
struct rhashtable ht; struct rhashtable ht;
struct list_head masks; struct list_head masks;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
struct idr handle_idr; struct idr handle_idr;
}; };
...@@ -90,10 +87,7 @@ struct cls_fl_filter { ...@@ -90,10 +87,7 @@ struct cls_fl_filter {
struct list_head list; struct list_head list;
u32 handle; u32 handle;
u32 flags; u32 flags;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
struct net_device *hw_dev; struct net_device *hw_dev;
}; };
...@@ -235,21 +229,14 @@ static void __fl_destroy_filter(struct cls_fl_filter *f) ...@@ -235,21 +229,14 @@ static void __fl_destroy_filter(struct cls_fl_filter *f)
static void fl_destroy_filter_work(struct work_struct *work) static void fl_destroy_filter_work(struct work_struct *work)
{ {
struct cls_fl_filter *f = container_of(work, struct cls_fl_filter, work); struct cls_fl_filter *f = container_of(to_rcu_work(work),
struct cls_fl_filter, rwork);
rtnl_lock(); rtnl_lock();
__fl_destroy_filter(f); __fl_destroy_filter(f);
rtnl_unlock(); 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, static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
...@@ -327,7 +314,7 @@ static bool __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f, ...@@ -327,7 +314,7 @@ static bool __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f,
fl_hw_destroy_filter(tp, f, extack); fl_hw_destroy_filter(tp, f, extack);
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
if (async) if (async)
call_rcu(&f->rcu, fl_destroy_filter); tcf_queue_work(&f->rwork, fl_destroy_filter_work);
else else
__fl_destroy_filter(f); __fl_destroy_filter(f);
...@@ -336,20 +323,13 @@ static bool __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f, ...@@ -336,20 +323,13 @@ static bool __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f,
static void fl_destroy_sleepable(struct work_struct *work) static void fl_destroy_sleepable(struct work_struct *work)
{ {
struct cls_fl_head *head = container_of(work, struct cls_fl_head, struct cls_fl_head *head = container_of(to_rcu_work(work),
work); struct cls_fl_head,
rwork);
kfree(head); kfree(head);
module_put(THIS_MODULE); module_put(THIS_MODULE);
} }
static void fl_destroy_rcu(struct rcu_head *rcu)
{
struct cls_fl_head *head = container_of(rcu, struct cls_fl_head, rcu);
INIT_WORK(&head->work, fl_destroy_sleepable);
schedule_work(&head->work);
}
static void fl_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) static void fl_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
{ {
struct cls_fl_head *head = rtnl_dereference(tp->root); struct cls_fl_head *head = rtnl_dereference(tp->root);
...@@ -365,7 +345,7 @@ static void fl_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) ...@@ -365,7 +345,7 @@ static void fl_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
idr_destroy(&head->handle_idr); idr_destroy(&head->handle_idr);
__module_get(THIS_MODULE); __module_get(THIS_MODULE);
call_rcu(&head->rcu, fl_destroy_rcu); tcf_queue_work(&head->rwork, fl_destroy_sleepable);
} }
static void *fl_get(struct tcf_proto *tp, u32 handle) static void *fl_get(struct tcf_proto *tp, u32 handle)
...@@ -1036,7 +1016,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, ...@@ -1036,7 +1016,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
list_replace_rcu(&fold->list, &fnew->list); list_replace_rcu(&fold->list, &fnew->list);
tcf_unbind_filter(tp, &fold->res); tcf_unbind_filter(tp, &fold->res);
tcf_exts_get_net(&fold->exts); tcf_exts_get_net(&fold->exts);
call_rcu(&fold->rcu, fl_destroy_filter); tcf_queue_work(&fold->rwork, fl_destroy_filter_work);
} else { } else {
list_add_tail_rcu(&fnew->list, &fnew->mask->filters); list_add_tail_rcu(&fnew->list, &fnew->mask->filters);
} }
......
...@@ -47,10 +47,7 @@ struct fw_filter { ...@@ -47,10 +47,7 @@ struct fw_filter {
#endif /* CONFIG_NET_CLS_IND */ #endif /* CONFIG_NET_CLS_IND */
struct tcf_exts exts; struct tcf_exts exts;
struct tcf_proto *tp; struct tcf_proto *tp;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
}; };
static u32 fw_hash(u32 handle) static u32 fw_hash(u32 handle)
...@@ -134,21 +131,14 @@ static void __fw_delete_filter(struct fw_filter *f) ...@@ -134,21 +131,14 @@ static void __fw_delete_filter(struct fw_filter *f)
static void fw_delete_filter_work(struct work_struct *work) static void fw_delete_filter_work(struct work_struct *work)
{ {
struct fw_filter *f = container_of(work, struct fw_filter, work); struct fw_filter *f = container_of(to_rcu_work(work),
struct fw_filter,
rwork);
rtnl_lock(); rtnl_lock();
__fw_delete_filter(f); __fw_delete_filter(f);
rtnl_unlock(); rtnl_unlock();
} }
static void fw_delete_filter(struct rcu_head *head)
{
struct fw_filter *f = container_of(head, struct fw_filter, rcu);
INIT_WORK(&f->work, fw_delete_filter_work);
tcf_queue_work(&f->work);
}
static void fw_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) static void fw_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
{ {
struct fw_head *head = rtnl_dereference(tp->root); struct fw_head *head = rtnl_dereference(tp->root);
...@@ -164,7 +154,7 @@ static void fw_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) ...@@ -164,7 +154,7 @@ static void fw_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
rtnl_dereference(f->next)); rtnl_dereference(f->next));
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
if (tcf_exts_get_net(&f->exts)) if (tcf_exts_get_net(&f->exts))
call_rcu(&f->rcu, fw_delete_filter); tcf_queue_work(&f->rwork, fw_delete_filter_work);
else else
__fw_delete_filter(f); __fw_delete_filter(f);
} }
...@@ -193,7 +183,7 @@ static int fw_delete(struct tcf_proto *tp, void *arg, bool *last, ...@@ -193,7 +183,7 @@ static int fw_delete(struct tcf_proto *tp, void *arg, bool *last,
RCU_INIT_POINTER(*fp, rtnl_dereference(f->next)); RCU_INIT_POINTER(*fp, rtnl_dereference(f->next));
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
tcf_exts_get_net(&f->exts); tcf_exts_get_net(&f->exts);
call_rcu(&f->rcu, fw_delete_filter); tcf_queue_work(&f->rwork, fw_delete_filter_work);
ret = 0; ret = 0;
break; break;
} }
...@@ -316,7 +306,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb, ...@@ -316,7 +306,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,
rcu_assign_pointer(*fp, fnew); rcu_assign_pointer(*fp, fnew);
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
tcf_exts_get_net(&f->exts); tcf_exts_get_net(&f->exts);
call_rcu(&f->rcu, fw_delete_filter); tcf_queue_work(&f->rwork, fw_delete_filter_work);
*arg = fnew; *arg = fnew;
return err; return err;
......
...@@ -21,10 +21,7 @@ struct cls_mall_head { ...@@ -21,10 +21,7 @@ struct cls_mall_head {
struct tcf_result res; struct tcf_result res;
u32 handle; u32 handle;
u32 flags; u32 flags;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
}; };
static int mall_classify(struct sk_buff *skb, const struct tcf_proto *tp, static int mall_classify(struct sk_buff *skb, const struct tcf_proto *tp,
...@@ -53,22 +50,14 @@ static void __mall_destroy(struct cls_mall_head *head) ...@@ -53,22 +50,14 @@ static void __mall_destroy(struct cls_mall_head *head)
static void mall_destroy_work(struct work_struct *work) static void mall_destroy_work(struct work_struct *work)
{ {
struct cls_mall_head *head = container_of(work, struct cls_mall_head, struct cls_mall_head *head = container_of(to_rcu_work(work),
work); struct cls_mall_head,
rwork);
rtnl_lock(); rtnl_lock();
__mall_destroy(head); __mall_destroy(head);
rtnl_unlock(); rtnl_unlock();
} }
static void mall_destroy_rcu(struct rcu_head *rcu)
{
struct cls_mall_head *head = container_of(rcu, struct cls_mall_head,
rcu);
INIT_WORK(&head->work, mall_destroy_work);
tcf_queue_work(&head->work);
}
static void mall_destroy_hw_filter(struct tcf_proto *tp, static void mall_destroy_hw_filter(struct tcf_proto *tp,
struct cls_mall_head *head, struct cls_mall_head *head,
unsigned long cookie, unsigned long cookie,
...@@ -126,7 +115,7 @@ static void mall_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) ...@@ -126,7 +115,7 @@ static void mall_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
mall_destroy_hw_filter(tp, head, (unsigned long) head, extack); mall_destroy_hw_filter(tp, head, (unsigned long) head, extack);
if (tcf_exts_get_net(&head->exts)) if (tcf_exts_get_net(&head->exts))
call_rcu(&head->rcu, mall_destroy_rcu); tcf_queue_work(&head->rwork, mall_destroy_work);
else else
__mall_destroy(head); __mall_destroy(head);
} }
......
...@@ -57,10 +57,7 @@ struct route4_filter { ...@@ -57,10 +57,7 @@ struct route4_filter {
u32 handle; u32 handle;
struct route4_bucket *bkt; struct route4_bucket *bkt;
struct tcf_proto *tp; struct tcf_proto *tp;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
}; };
#define ROUTE4_FAILURE ((struct route4_filter *)(-1L)) #define ROUTE4_FAILURE ((struct route4_filter *)(-1L))
...@@ -266,19 +263,17 @@ static void __route4_delete_filter(struct route4_filter *f) ...@@ -266,19 +263,17 @@ static void __route4_delete_filter(struct route4_filter *f)
static void route4_delete_filter_work(struct work_struct *work) static void route4_delete_filter_work(struct work_struct *work)
{ {
struct route4_filter *f = container_of(work, struct route4_filter, work); struct route4_filter *f = container_of(to_rcu_work(work),
struct route4_filter,
rwork);
rtnl_lock(); rtnl_lock();
__route4_delete_filter(f); __route4_delete_filter(f);
rtnl_unlock(); rtnl_unlock();
} }
static void route4_delete_filter(struct rcu_head *head) static void route4_queue_work(struct route4_filter *f)
{ {
struct route4_filter *f = container_of(head, struct route4_filter, rcu); tcf_queue_work(&f->rwork, route4_delete_filter_work);
INIT_WORK(&f->work, route4_delete_filter_work);
tcf_queue_work(&f->work);
} }
static void route4_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) static void route4_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
...@@ -304,7 +299,7 @@ static void route4_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) ...@@ -304,7 +299,7 @@ static void route4_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
RCU_INIT_POINTER(b->ht[h2], next); RCU_INIT_POINTER(b->ht[h2], next);
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
if (tcf_exts_get_net(&f->exts)) if (tcf_exts_get_net(&f->exts))
call_rcu(&f->rcu, route4_delete_filter); route4_queue_work(f);
else else
__route4_delete_filter(f); __route4_delete_filter(f);
} }
...@@ -349,7 +344,7 @@ static int route4_delete(struct tcf_proto *tp, void *arg, bool *last, ...@@ -349,7 +344,7 @@ static int route4_delete(struct tcf_proto *tp, void *arg, bool *last,
/* Delete it */ /* Delete it */
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
tcf_exts_get_net(&f->exts); tcf_exts_get_net(&f->exts);
call_rcu(&f->rcu, route4_delete_filter); tcf_queue_work(&f->rwork, route4_delete_filter_work);
/* Strip RTNL protected tree */ /* Strip RTNL protected tree */
for (i = 0; i <= 32; i++) { for (i = 0; i <= 32; i++) {
...@@ -554,7 +549,7 @@ static int route4_change(struct net *net, struct sk_buff *in_skb, ...@@ -554,7 +549,7 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,
if (fold) { if (fold) {
tcf_unbind_filter(tp, &fold->res); tcf_unbind_filter(tp, &fold->res);
tcf_exts_get_net(&fold->exts); tcf_exts_get_net(&fold->exts);
call_rcu(&fold->rcu, route4_delete_filter); tcf_queue_work(&fold->rwork, route4_delete_filter_work);
} }
return 0; return 0;
......
...@@ -97,10 +97,7 @@ struct rsvp_filter { ...@@ -97,10 +97,7 @@ struct rsvp_filter {
u32 handle; u32 handle;
struct rsvp_session *sess; struct rsvp_session *sess;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
}; };
static inline unsigned int hash_dst(__be32 *dst, u8 protocol, u8 tunnelid) static inline unsigned int hash_dst(__be32 *dst, u8 protocol, u8 tunnelid)
...@@ -294,21 +291,14 @@ static void __rsvp_delete_filter(struct rsvp_filter *f) ...@@ -294,21 +291,14 @@ static void __rsvp_delete_filter(struct rsvp_filter *f)
static void rsvp_delete_filter_work(struct work_struct *work) static void rsvp_delete_filter_work(struct work_struct *work)
{ {
struct rsvp_filter *f = container_of(work, struct rsvp_filter, work); struct rsvp_filter *f = container_of(to_rcu_work(work),
struct rsvp_filter,
rwork);
rtnl_lock(); rtnl_lock();
__rsvp_delete_filter(f); __rsvp_delete_filter(f);
rtnl_unlock(); 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) static void rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f)
{ {
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
...@@ -317,7 +307,7 @@ static void rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f) ...@@ -317,7 +307,7 @@ static void rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f)
* in cleanup() callback * in cleanup() callback
*/ */
if (tcf_exts_get_net(&f->exts)) if (tcf_exts_get_net(&f->exts))
call_rcu(&f->rcu, rsvp_delete_filter_rcu); tcf_queue_work(&f->rwork, rsvp_delete_filter_work);
else else
__rsvp_delete_filter(f); __rsvp_delete_filter(f);
} }
......
...@@ -28,20 +28,14 @@ ...@@ -28,20 +28,14 @@
struct tcindex_filter_result { struct tcindex_filter_result {
struct tcf_exts exts; struct tcf_exts exts;
struct tcf_result res; struct tcf_result res;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
}; };
struct tcindex_filter { struct tcindex_filter {
u16 key; u16 key;
struct tcindex_filter_result result; struct tcindex_filter_result result;
struct tcindex_filter __rcu *next; struct tcindex_filter __rcu *next;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
}; };
...@@ -152,21 +146,14 @@ static void tcindex_destroy_rexts_work(struct work_struct *work) ...@@ -152,21 +146,14 @@ static void tcindex_destroy_rexts_work(struct work_struct *work)
{ {
struct tcindex_filter_result *r; struct tcindex_filter_result *r;
r = container_of(work, struct tcindex_filter_result, work); r = container_of(to_rcu_work(work),
struct tcindex_filter_result,
rwork);
rtnl_lock(); rtnl_lock();
__tcindex_destroy_rexts(r); __tcindex_destroy_rexts(r);
rtnl_unlock(); rtnl_unlock();
} }
static void tcindex_destroy_rexts(struct rcu_head *head)
{
struct tcindex_filter_result *r;
r = container_of(head, struct tcindex_filter_result, rcu);
INIT_WORK(&r->work, tcindex_destroy_rexts_work);
tcf_queue_work(&r->work);
}
static void __tcindex_destroy_fexts(struct tcindex_filter *f) static void __tcindex_destroy_fexts(struct tcindex_filter *f)
{ {
tcf_exts_destroy(&f->result.exts); tcf_exts_destroy(&f->result.exts);
...@@ -176,23 +163,15 @@ static void __tcindex_destroy_fexts(struct tcindex_filter *f) ...@@ -176,23 +163,15 @@ static void __tcindex_destroy_fexts(struct tcindex_filter *f)
static void tcindex_destroy_fexts_work(struct work_struct *work) static void tcindex_destroy_fexts_work(struct work_struct *work)
{ {
struct tcindex_filter *f = container_of(work, struct tcindex_filter, struct tcindex_filter *f = container_of(to_rcu_work(work),
work); struct tcindex_filter,
rwork);
rtnl_lock(); rtnl_lock();
__tcindex_destroy_fexts(f); __tcindex_destroy_fexts(f);
rtnl_unlock(); rtnl_unlock();
} }
static void tcindex_destroy_fexts(struct rcu_head *head)
{
struct tcindex_filter *f = container_of(head, struct tcindex_filter,
rcu);
INIT_WORK(&f->work, tcindex_destroy_fexts_work);
tcf_queue_work(&f->work);
}
static int tcindex_delete(struct tcf_proto *tp, void *arg, bool *last, static int tcindex_delete(struct tcf_proto *tp, void *arg, bool *last,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
...@@ -228,12 +207,12 @@ static int tcindex_delete(struct tcf_proto *tp, void *arg, bool *last, ...@@ -228,12 +207,12 @@ static int tcindex_delete(struct tcf_proto *tp, void *arg, bool *last,
*/ */
if (f) { if (f) {
if (tcf_exts_get_net(&f->result.exts)) if (tcf_exts_get_net(&f->result.exts))
call_rcu(&f->rcu, tcindex_destroy_fexts); tcf_queue_work(&f->rwork, tcindex_destroy_fexts_work);
else else
__tcindex_destroy_fexts(f); __tcindex_destroy_fexts(f);
} else { } else {
if (tcf_exts_get_net(&r->exts)) if (tcf_exts_get_net(&r->exts))
call_rcu(&r->rcu, tcindex_destroy_rexts); tcf_queue_work(&r->rwork, tcindex_destroy_rexts_work);
else else
__tcindex_destroy_rexts(r); __tcindex_destroy_rexts(r);
} }
......
...@@ -68,10 +68,7 @@ struct tc_u_knode { ...@@ -68,10 +68,7 @@ struct tc_u_knode {
u32 __percpu *pcpu_success; u32 __percpu *pcpu_success;
#endif #endif
struct tcf_proto *tp; struct tcf_proto *tp;
union { struct rcu_work rwork;
struct work_struct work;
struct rcu_head rcu;
};
/* The 'sel' field MUST be the last field in structure to allow for /* The 'sel' field MUST be the last field in structure to allow for
* tc_u32_keys allocated at end of structure. * tc_u32_keys allocated at end of structure.
*/ */
...@@ -436,21 +433,14 @@ static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n, ...@@ -436,21 +433,14 @@ static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n,
*/ */
static void u32_delete_key_work(struct work_struct *work) static void u32_delete_key_work(struct work_struct *work)
{ {
struct tc_u_knode *key = container_of(work, struct tc_u_knode, work); struct tc_u_knode *key = container_of(to_rcu_work(work),
struct tc_u_knode,
rwork);
rtnl_lock(); rtnl_lock();
u32_destroy_key(key->tp, key, false); u32_destroy_key(key->tp, key, false);
rtnl_unlock(); rtnl_unlock();
} }
static void u32_delete_key_rcu(struct rcu_head *rcu)
{
struct tc_u_knode *key = container_of(rcu, struct tc_u_knode, rcu);
INIT_WORK(&key->work, u32_delete_key_work);
tcf_queue_work(&key->work);
}
/* u32_delete_key_freepf_rcu is the rcu callback variant /* u32_delete_key_freepf_rcu is the rcu callback variant
* that free's the entire structure including the statistics * that free's the entire structure including the statistics
* percpu variables. Only use this if the key is not a copy * percpu variables. Only use this if the key is not a copy
...@@ -460,21 +450,14 @@ static void u32_delete_key_rcu(struct rcu_head *rcu) ...@@ -460,21 +450,14 @@ static void u32_delete_key_rcu(struct rcu_head *rcu)
*/ */
static void u32_delete_key_freepf_work(struct work_struct *work) static void u32_delete_key_freepf_work(struct work_struct *work)
{ {
struct tc_u_knode *key = container_of(work, struct tc_u_knode, work); struct tc_u_knode *key = container_of(to_rcu_work(work),
struct tc_u_knode,
rwork);
rtnl_lock(); rtnl_lock();
u32_destroy_key(key->tp, key, true); u32_destroy_key(key->tp, key, true);
rtnl_unlock(); rtnl_unlock();
} }
static void u32_delete_key_freepf_rcu(struct rcu_head *rcu)
{
struct tc_u_knode *key = container_of(rcu, struct tc_u_knode, rcu);
INIT_WORK(&key->work, u32_delete_key_freepf_work);
tcf_queue_work(&key->work);
}
static int u32_delete_key(struct tcf_proto *tp, struct tc_u_knode *key) static int u32_delete_key(struct tcf_proto *tp, struct tc_u_knode *key)
{ {
struct tc_u_knode __rcu **kp; struct tc_u_knode __rcu **kp;
...@@ -491,7 +474,7 @@ static int u32_delete_key(struct tcf_proto *tp, struct tc_u_knode *key) ...@@ -491,7 +474,7 @@ static int u32_delete_key(struct tcf_proto *tp, struct tc_u_knode *key)
tcf_unbind_filter(tp, &key->res); tcf_unbind_filter(tp, &key->res);
idr_remove(&ht->handle_idr, key->handle); idr_remove(&ht->handle_idr, key->handle);
tcf_exts_get_net(&key->exts); tcf_exts_get_net(&key->exts);
call_rcu(&key->rcu, u32_delete_key_freepf_rcu); tcf_queue_work(&key->rwork, u32_delete_key_freepf_work);
return 0; return 0;
} }
} }
...@@ -611,7 +594,7 @@ static void u32_clear_hnode(struct tcf_proto *tp, struct tc_u_hnode *ht, ...@@ -611,7 +594,7 @@ static void u32_clear_hnode(struct tcf_proto *tp, struct tc_u_hnode *ht,
u32_remove_hw_knode(tp, n, extack); u32_remove_hw_knode(tp, n, extack);
idr_remove(&ht->handle_idr, n->handle); idr_remove(&ht->handle_idr, n->handle);
if (tcf_exts_get_net(&n->exts)) if (tcf_exts_get_net(&n->exts))
call_rcu(&n->rcu, u32_delete_key_freepf_rcu); tcf_queue_work(&n->rwork, u32_delete_key_freepf_work);
else else
u32_destroy_key(n->tp, n, true); u32_destroy_key(n->tp, n, true);
} }
...@@ -995,7 +978,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, ...@@ -995,7 +978,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
u32_replace_knode(tp, tp_c, new); u32_replace_knode(tp, tp_c, new);
tcf_unbind_filter(tp, &n->res); tcf_unbind_filter(tp, &n->res);
tcf_exts_get_net(&n->exts); tcf_exts_get_net(&n->exts);
call_rcu(&n->rcu, u32_delete_key_rcu); tcf_queue_work(&n->rwork, u32_delete_key_work);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment