| Message ID | 20211001113237.14449-5-simon.horman@corigine.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | allow user to offload tc action to net device | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 5 maintainers not CCed: jiri@resnulli.us kuba@kernel.org elic@nvidia.com davem@davemloft.net cmi@nvidia.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | fail | Errors and warnings before: 58 this patch: 60 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | warning | WARNING: line length of 81 exceeds 80 columns WARNING: line length of 82 exceeds 80 columns |
| netdev/build_allmodconfig_warn | fail | Errors and warnings before: 71 this patch: 73 |
| netdev/header_inline | success | Link |
On Fri 01 Oct 2021 at 14:32, Simon Horman <simon.horman@corigine.com> wrote: > From: Baowen Zheng <baowen.zheng@corigine.com> > > Add reoffload process to update hw_count when driver > is inserted or removed. > > When reoffloading actions, we still offload the actions > that are added independent of filters. > > Change the lock usage to fix sleeping in invalid context. What does this refer to? Looking at the code it is not clear to me which lock usage is changed. Or is it just a change log from v1? > > Signed-off-by: Baowen Zheng <baowen.zheng@corigine.com> > Signed-off-by: Louis Peens <louis.peens@corigine.com> > Signed-off-by: Simon Horman <simon.horman@corigine.com> > --- > include/net/act_api.h | 14 +++ > net/core/flow_offload.c | 5 + > net/sched/act_api.c | 215 ++++++++++++++++++++++++++++++++++++---- > 3 files changed, 214 insertions(+), 20 deletions(-) > > diff --git a/include/net/act_api.h b/include/net/act_api.h > index 1209444ac369..df64489d1013 100644 > --- a/include/net/act_api.h > +++ b/include/net/act_api.h > @@ -7,6 +7,7 @@ > */ > > #include <linux/refcount.h> > +#include <net/flow_offload.h> > #include <net/sch_generic.h> > #include <net/pkt_sched.h> > #include <net/net_namespace.h> > @@ -44,6 +45,9 @@ struct tc_action { > u8 hw_stats; > u8 used_hw_stats; > bool used_hw_stats_valid; > + bool add_separate; /* indicate if the action is created > + * independent of any flow > + */ This looks like a duplication of flags since this value is derived from BIND flag. I understand that you need this because currently all flags that are not visible to the userspace are cleared after action is created, but maybe it would be better to refactor the code to preserve all flags and to only apply TCA_ACT_FLAGS_USER_MASK when dumping to user space. > u32 in_hw_count; > }; > #define tcf_index common.tcfa_index > @@ -242,6 +246,8 @@ void tcf_action_update_stats(struct tc_action *a, u64 bytes, u64 packets, > int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int); > int tcf_action_offload_del(struct tc_action *action); > int tcf_action_update_hw_stats(struct tc_action *action); > +int tcf_action_reoffload_cb(flow_indr_block_bind_cb_t *cb, > + void *cb_priv, bool add); > int tcf_action_check_ctrlact(int action, struct tcf_proto *tp, > struct tcf_chain **handle, > struct netlink_ext_ack *newchain); > @@ -253,6 +259,14 @@ DECLARE_STATIC_KEY_FALSE(tcf_frag_xmit_count); > #endif > > int tcf_dev_queue_xmit(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb)); > + > +#else /* !CONFIG_NET_CLS_ACT */ > + > +static inline int tcf_action_reoffload_cb(flow_indr_block_bind_cb_t *cb, > + void *cb_priv, bool add) { > + return 0; > +} > + > #endif /* CONFIG_NET_CLS_ACT */ > > static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes, > diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c > index 6676431733ef..d591204af6e0 100644 > --- a/net/core/flow_offload.c > +++ b/net/core/flow_offload.c > @@ -1,6 +1,7 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > #include <linux/kernel.h> > #include <linux/slab.h> > +#include <net/act_api.h> > #include <net/flow_offload.h> > #include <linux/rtnetlink.h> > #include <linux/mutex.h> > @@ -418,6 +419,8 @@ int flow_indr_dev_register(flow_indr_block_bind_cb_t *cb, void *cb_priv) > existing_qdiscs_register(cb, cb_priv); > mutex_unlock(&flow_indr_block_lock); > > + tcf_action_reoffload_cb(cb, cb_priv, true); > + > return 0; > } > EXPORT_SYMBOL(flow_indr_dev_register); > @@ -472,6 +475,8 @@ void flow_indr_dev_unregister(flow_indr_block_bind_cb_t *cb, void *cb_priv, > > flow_block_indr_notify(&cleanup_list); > kfree(indr_dev); > + > + tcf_action_reoffload_cb(cb, cb_priv, false); > } > EXPORT_SYMBOL(flow_indr_dev_unregister); > > diff --git a/net/sched/act_api.c b/net/sched/act_api.c > index c98048832c80..7bb84d5001b6 100644 > --- a/net/sched/act_api.c > +++ b/net/sched/act_api.c > @@ -512,6 +512,7 @@ int tcf_idr_create(struct tc_action_net *tn, u32 index, struct nlattr *est, > p->tcfa_tm.lastuse = jiffies; > p->tcfa_tm.firstuse = 0; > p->tcfa_flags = flags & TCA_ACT_FLAGS_USER_MASK; > + p->add_separate = !bind; > if (est) { > err = gen_new_estimator(&p->tcfa_bstats, p->cpu_bstats, > &p->tcfa_rate_est, > @@ -636,6 +637,59 @@ EXPORT_SYMBOL(tcf_idrinfo_destroy); > > static LIST_HEAD(act_base); > static DEFINE_RWLOCK(act_mod_lock); > +/* since act ops id is stored in pernet subsystem list, > + * then there is no way to walk through only all the action > + * subsystem, so we keep tc action pernet ops id for > + * reoffload to walk through. > + */ > +static LIST_HEAD(act_pernet_id_list); > +static DEFINE_MUTEX(act_id_mutex); > +struct tc_act_pernet_id { > + struct list_head list; > + unsigned int id; > +}; > + > +static int tcf_pernet_add_id_list(unsigned int id) > +{ > + struct tc_act_pernet_id *id_ptr; > + int ret = 0; > + > + mutex_lock(&act_id_mutex); > + list_for_each_entry(id_ptr, &act_pernet_id_list, list) { > + if (id_ptr->id == id) { > + ret = -EEXIST; > + goto err_out; > + } > + } > + > + id_ptr = kzalloc(sizeof(*id_ptr), GFP_KERNEL); > + if (!id_ptr) { > + ret = -ENOMEM; > + goto err_out; > + } > + id_ptr->id = id; > + > + list_add_tail(&id_ptr->list, &act_pernet_id_list); > + > +err_out: > + mutex_unlock(&act_id_mutex); > + return ret; > +} > + > +static void tcf_pernet_del_id_list(unsigned int id) > +{ > + struct tc_act_pernet_id *id_ptr; > + > + mutex_lock(&act_id_mutex); > + list_for_each_entry(id_ptr, &act_pernet_id_list, list) { > + if (id_ptr->id == id) { > + list_del(&id_ptr->list); > + kfree(id_ptr); > + break; > + } > + } > + mutex_unlock(&act_id_mutex); > +} > > int tcf_register_action(struct tc_action_ops *act, > struct pernet_operations *ops) > @@ -654,18 +708,30 @@ int tcf_register_action(struct tc_action_ops *act, > if (ret) > return ret; > > + if (ops->id) { > + ret = tcf_pernet_add_id_list(*ops->id); > + if (ret) > + goto id_err; > + } > + > write_lock(&act_mod_lock); > list_for_each_entry(a, &act_base, head) { > if (act->id == a->id || (strcmp(act->kind, a->kind) == 0)) { > - write_unlock(&act_mod_lock); > - unregister_pernet_subsys(ops); > - return -EEXIST; > + ret = -EEXIST; > + goto err_out; > } > } > list_add_tail(&act->head, &act_base); > write_unlock(&act_mod_lock); > > return 0; > + > +err_out: > + write_unlock(&act_mod_lock); > + tcf_pernet_del_id_list(*ops->id); > +id_err: > + unregister_pernet_subsys(ops); > + return ret; > } > EXPORT_SYMBOL(tcf_register_action); > > @@ -684,8 +750,11 @@ int tcf_unregister_action(struct tc_action_ops *act, > } > } > write_unlock(&act_mod_lock); > - if (!err) > + if (!err) { > unregister_pernet_subsys(ops); > + if (ops->id) > + tcf_pernet_del_id_list(*ops->id); > + } > return err; > } > EXPORT_SYMBOL(tcf_unregister_action); > @@ -1210,29 +1279,57 @@ static void flow_action_update_hw(struct tc_action *act, > } > } > > -static int tcf_action_offload_cmd(struct flow_offload_action *fl_act, > - u32 *hw_count, > - struct netlink_ext_ack *extack) > +static int tcf_action_offload_cmd_ex(struct flow_offload_action *fl_act, > + u32 *hw_count) > { > int err; > > - if (IS_ERR(fl_act)) > - return PTR_ERR(fl_act); > + err = flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, > + fl_act, NULL, NULL); > + if (err < 0) > + return err; > + > + if (hw_count) > + *hw_count = err; > > - err = flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL); > + return 0; > +} > + > +static int tcf_action_offload_cmd_cb_ex(struct flow_offload_action *fl_act, > + u32 *hw_count, > + flow_indr_block_bind_cb_t *cb, > + void *cb_priv) > +{ > + int err; > > + err = cb(NULL, NULL, cb_priv, TC_SETUP_ACT, NULL, fl_act, NULL); > if (err < 0) > return err; > > if (hw_count) > - *hw_count = err; > + *hw_count = 1; > > return 0; > } > > +static int tcf_action_offload_cmd(struct flow_offload_action *fl_act, > + u32 *hw_count, > + flow_indr_block_bind_cb_t *cb, > + void *cb_priv) > +{ > + if (IS_ERR(fl_act)) > + return PTR_ERR(fl_act); > + > + return cb ? tcf_action_offload_cmd_cb_ex(fl_act, hw_count, > + cb, cb_priv) : > + tcf_action_offload_cmd_ex(fl_act, hw_count); > +} > + > /* offload the tc command after inserted */ > -static int tcf_action_offload_add(struct tc_action *action, > - struct netlink_ext_ack *extack) > +static int tcf_action_offload_add_ex(struct tc_action *action, > + struct netlink_ext_ack *extack, > + flow_indr_block_bind_cb_t *cb, > + void *cb_priv) > { > bool skip_sw = tc_act_skip_sw(action->tcfa_flags); > struct tc_action *actions[TCA_ACT_MAX_PRIO] = { > @@ -1260,9 +1357,10 @@ static int tcf_action_offload_add(struct tc_action *action, > goto fl_err; > } > > - err = tcf_action_offload_cmd(fl_action, &in_hw_count, extack); > + err = tcf_action_offload_cmd(fl_action, &in_hw_count, cb, cb_priv); > if (!err) > - flow_action_update_hw(action, in_hw_count, FLOW_ACT_HW_ADD); > + flow_action_update_hw(action, in_hw_count, > + cb ? FLOW_ACT_HW_UPDATE : FLOW_ACT_HW_ADD); > > if (skip_sw && !tc_act_in_hw(action->tcfa_flags)) > err = -EINVAL; > @@ -1275,6 +1373,12 @@ static int tcf_action_offload_add(struct tc_action *action, > return err; > } > > +static int tcf_action_offload_add(struct tc_action *action, > + struct netlink_ext_ack *extack) > +{ > + return tcf_action_offload_add_ex(action, extack, NULL, NULL); > +} > + > int tcf_action_update_hw_stats(struct tc_action *action) > { > struct flow_offload_action fl_act = {}; > @@ -1287,7 +1391,7 @@ int tcf_action_update_hw_stats(struct tc_action *action) > if (err) > goto err_out; > > - err = tcf_action_offload_cmd(&fl_act, NULL, NULL); > + err = tcf_action_offload_cmd(&fl_act, NULL, NULL, NULL); > > if (!err && fl_act.stats.lastused) { > preempt_disable(); > @@ -1309,7 +1413,8 @@ int tcf_action_update_hw_stats(struct tc_action *action) > } > EXPORT_SYMBOL(tcf_action_update_hw_stats); > > -int tcf_action_offload_del(struct tc_action *action) > +int tcf_action_offload_del_ex(struct tc_action *action, > + flow_indr_block_bind_cb_t *cb, void *cb_priv) > { > struct flow_offload_action fl_act; > u32 in_hw_count = 0; > @@ -1325,13 +1430,83 @@ int tcf_action_offload_del(struct tc_action *action) > if (err) > return err; > > - err = tcf_action_offload_cmd(&fl_act, &in_hw_count, NULL); > - if (err) > + err = tcf_action_offload_cmd(&fl_act, &in_hw_count, cb, cb_priv); > + if (err < 0) > return err; > > - if (action->in_hw_count != in_hw_count) > + /* do not need to update hw state when deleting action */ > + if (cb && in_hw_count) > + flow_action_update_hw(action, in_hw_count, FLOW_ACT_HW_DEL); > + > + if (!cb && action->in_hw_count != in_hw_count) > + return -EINVAL; > + > + return 0; > +} > + > +int tcf_action_offload_del(struct tc_action *action) > +{ > + return tcf_action_offload_del_ex(action, NULL, NULL); > +} > + > +int tcf_action_reoffload_cb(flow_indr_block_bind_cb_t *cb, > + void *cb_priv, bool add) > +{ > + struct tc_act_pernet_id *id_ptr; > + struct tcf_idrinfo *idrinfo; > + struct tc_action_net *tn; > + struct tc_action *p; > + unsigned int act_id; > + unsigned long tmp; > + unsigned long id; > + struct idr *idr; > + struct net *net; > + int ret; > + > + if (!cb) > return -EINVAL; > > + down_read(&net_rwsem); > + mutex_lock(&act_id_mutex); > + > + for_each_net(net) { > + list_for_each_entry(id_ptr, &act_pernet_id_list, list) { > + act_id = id_ptr->id; > + tn = net_generic(net, act_id); > + if (!tn) > + continue; > + idrinfo = tn->idrinfo; > + if (!idrinfo) > + continue; > + > + mutex_lock(&idrinfo->lock); > + idr = &idrinfo->action_idr; > + idr_for_each_entry_ul(idr, p, tmp, id) { > + if (IS_ERR(p) || !p->add_separate) > + continue; > + if (add) { > + tcf_action_offload_add_ex(p, NULL, cb, > + cb_priv); > + continue; > + } > + > + /* cb unregister to update hw count */ > + ret = tcf_action_offload_del_ex(p, cb, cb_priv); > + if (ret < 0) > + continue; > + if (tc_act_skip_sw(p->tcfa_flags) && > + !tc_act_in_hw(p->tcfa_flags)) { > + ret = tcf_idr_release_unsafe(p); > + if (ret == ACT_P_DELETED) > + module_put(p->ops->owner); > + } > + } > + mutex_unlock(&idrinfo->lock); > + } > + } > + mutex_unlock(&act_id_mutex); > + up_read(&net_rwsem); > + > return 0; > }
Hi Vlad, On Fri, Oct 01, 2021 at 08:30:38PM +0300, Vlad Buslov wrote: > > On Fri 01 Oct 2021 at 14:32, Simon Horman <simon.horman@corigine.com> wrote: > > From: Baowen Zheng <baowen.zheng@corigine.com> > > > > Add reoffload process to update hw_count when driver > > is inserted or removed. > > > > When reoffloading actions, we still offload the actions > > that are added independent of filters. As per comment on 2/4. Thanks for your review and sorry for the delay in responding. I believe that at this point we have addressed most of the points your raised and plan to post a v3 shortly. At this point I'd like to relay some responses from Baowen who has been working on addressing your review. > > Change the lock usage to fix sleeping in invalid context. > > What does this refer to? Looking at the code it is not clear to me which > lock usage is changed. Or is it just a change log from v1? Sorry, this is an artifact of our development process that shouldn't have been left here. Please ignore. ... > > @@ -44,6 +45,9 @@ struct tc_action { > > u8 hw_stats; > > u8 used_hw_stats; > > bool used_hw_stats_valid; > > + bool add_separate; /* indicate if the action is created > > + * independent of any flow > > + */ > > This looks like a duplication of flags since this value is derived from > BIND flag. I understand that you need this because currently all flags > that are not visible to the userspace are cleared after action is > created, but maybe it would be better to refactor the code to preserve > all flags and to only apply TCA_ACT_FLAGS_USER_MASK when dumping to user > space. Thanks, we've cleaned things up as you suggest for v3. ...
diff --git a/include/net/act_api.h b/include/net/act_api.h index 1209444ac369..df64489d1013 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h @@ -7,6 +7,7 @@ */ #include <linux/refcount.h> +#include <net/flow_offload.h> #include <net/sch_generic.h> #include <net/pkt_sched.h> #include <net/net_namespace.h> @@ -44,6 +45,9 @@ struct tc_action { u8 hw_stats; u8 used_hw_stats; bool used_hw_stats_valid; + bool add_separate; /* indicate if the action is created + * independent of any flow + */ u32 in_hw_count; }; #define tcf_index common.tcfa_index @@ -242,6 +246,8 @@ void tcf_action_update_stats(struct tc_action *a, u64 bytes, u64 packets, int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int); int tcf_action_offload_del(struct tc_action *action); int tcf_action_update_hw_stats(struct tc_action *action); +int tcf_action_reoffload_cb(flow_indr_block_bind_cb_t *cb, + void *cb_priv, bool add); int tcf_action_check_ctrlact(int action, struct tcf_proto *tp, struct tcf_chain **handle, struct netlink_ext_ack *newchain); @@ -253,6 +259,14 @@ DECLARE_STATIC_KEY_FALSE(tcf_frag_xmit_count); #endif int tcf_dev_queue_xmit(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb)); + +#else /* !CONFIG_NET_CLS_ACT */ + +static inline int tcf_action_reoffload_cb(flow_indr_block_bind_cb_t *cb, + void *cb_priv, bool add) { + return 0; +} + #endif /* CONFIG_NET_CLS_ACT */ static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes, diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c index 6676431733ef..d591204af6e0 100644 --- a/net/core/flow_offload.c +++ b/net/core/flow_offload.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include <linux/kernel.h> #include <linux/slab.h> +#include <net/act_api.h> #include <net/flow_offload.h> #include <linux/rtnetlink.h> #include <linux/mutex.h> @@ -418,6 +419,8 @@ int flow_indr_dev_register(flow_indr_block_bind_cb_t *cb, void *cb_priv) existing_qdiscs_register(cb, cb_priv); mutex_unlock(&flow_indr_block_lock); + tcf_action_reoffload_cb(cb, cb_priv, true); + return 0; } EXPORT_SYMBOL(flow_indr_dev_register); @@ -472,6 +475,8 @@ void flow_indr_dev_unregister(flow_indr_block_bind_cb_t *cb, void *cb_priv, flow_block_indr_notify(&cleanup_list); kfree(indr_dev); + + tcf_action_reoffload_cb(cb, cb_priv, false); } EXPORT_SYMBOL(flow_indr_dev_unregister); diff --git a/net/sched/act_api.c b/net/sched/act_api.c index c98048832c80..7bb84d5001b6 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -512,6 +512,7 @@ int tcf_idr_create(struct tc_action_net *tn, u32 index, struct nlattr *est, p->tcfa_tm.lastuse = jiffies; p->tcfa_tm.firstuse = 0; p->tcfa_flags = flags & TCA_ACT_FLAGS_USER_MASK; + p->add_separate = !bind; if (est) { err = gen_new_estimator(&p->tcfa_bstats, p->cpu_bstats, &p->tcfa_rate_est, @@ -636,6 +637,59 @@ EXPORT_SYMBOL(tcf_idrinfo_destroy); static LIST_HEAD(act_base); static DEFINE_RWLOCK(act_mod_lock); +/* since act ops id is stored in pernet subsystem list, + * then there is no way to walk through only all the action + * subsystem, so we keep tc action pernet ops id for + * reoffload to walk through. + */ +static LIST_HEAD(act_pernet_id_list); +static DEFINE_MUTEX(act_id_mutex); +struct tc_act_pernet_id { + struct list_head list; + unsigned int id; +}; + +static int tcf_pernet_add_id_list(unsigned int id) +{ + struct tc_act_pernet_id *id_ptr; + int ret = 0; + + mutex_lock(&act_id_mutex); + list_for_each_entry(id_ptr, &act_pernet_id_list, list) { + if (id_ptr->id == id) { + ret = -EEXIST; + goto err_out; + } + } + + id_ptr = kzalloc(sizeof(*id_ptr), GFP_KERNEL); + if (!id_ptr) { + ret = -ENOMEM; + goto err_out; + } + id_ptr->id = id; + + list_add_tail(&id_ptr->list, &act_pernet_id_list); + +err_out: + mutex_unlock(&act_id_mutex); + return ret; +} + +static void tcf_pernet_del_id_list(unsigned int id) +{ + struct tc_act_pernet_id *id_ptr; + + mutex_lock(&act_id_mutex); + list_for_each_entry(id_ptr, &act_pernet_id_list, list) { + if (id_ptr->id == id) { + list_del(&id_ptr->list); + kfree(id_ptr); + break; + } + } + mutex_unlock(&act_id_mutex); +} int tcf_register_action(struct tc_action_ops *act, struct pernet_operations *ops) @@ -654,18 +708,30 @@ int tcf_register_action(struct tc_action_ops *act, if (ret) return ret; + if (ops->id) { + ret = tcf_pernet_add_id_list(*ops->id); + if (ret) + goto id_err; + } + write_lock(&act_mod_lock); list_for_each_entry(a, &act_base, head) { if (act->id == a->id || (strcmp(act->kind, a->kind) == 0)) { - write_unlock(&act_mod_lock); - unregister_pernet_subsys(ops); - return -EEXIST; + ret = -EEXIST; + goto err_out; } } list_add_tail(&act->head, &act_base); write_unlock(&act_mod_lock); return 0; + +err_out: + write_unlock(&act_mod_lock); + tcf_pernet_del_id_list(*ops->id); +id_err: + unregister_pernet_subsys(ops); + return ret; } EXPORT_SYMBOL(tcf_register_action); @@ -684,8 +750,11 @@ int tcf_unregister_action(struct tc_action_ops *act, } } write_unlock(&act_mod_lock); - if (!err) + if (!err) { unregister_pernet_subsys(ops); + if (ops->id) + tcf_pernet_del_id_list(*ops->id); + } return err; } EXPORT_SYMBOL(tcf_unregister_action); @@ -1210,29 +1279,57 @@ static void flow_action_update_hw(struct tc_action *act, } } -static int tcf_action_offload_cmd(struct flow_offload_action *fl_act, - u32 *hw_count, - struct netlink_ext_ack *extack) +static int tcf_action_offload_cmd_ex(struct flow_offload_action *fl_act, + u32 *hw_count) { int err; - if (IS_ERR(fl_act)) - return PTR_ERR(fl_act); + err = flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, + fl_act, NULL, NULL); + if (err < 0) + return err; + + if (hw_count) + *hw_count = err; - err = flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL); + return 0; +} + +static int tcf_action_offload_cmd_cb_ex(struct flow_offload_action *fl_act, + u32 *hw_count, + flow_indr_block_bind_cb_t *cb, + void *cb_priv) +{ + int err; + err = cb(NULL, NULL, cb_priv, TC_SETUP_ACT, NULL, fl_act, NULL); if (err < 0) return err; if (hw_count) - *hw_count = err; + *hw_count = 1; return 0; } +static int tcf_action_offload_cmd(struct flow_offload_action *fl_act, + u32 *hw_count, + flow_indr_block_bind_cb_t *cb, + void *cb_priv) +{ + if (IS_ERR(fl_act)) + return PTR_ERR(fl_act); + + return cb ? tcf_action_offload_cmd_cb_ex(fl_act, hw_count, + cb, cb_priv) : + tcf_action_offload_cmd_ex(fl_act, hw_count); +} + /* offload the tc command after inserted */ -static int tcf_action_offload_add(struct tc_action *action, - struct netlink_ext_ack *extack) +static int tcf_action_offload_add_ex(struct tc_action *action, + struct netlink_ext_ack *extack, + flow_indr_block_bind_cb_t *cb, + void *cb_priv) { bool skip_sw = tc_act_skip_sw(action->tcfa_flags); struct tc_action *actions[TCA_ACT_MAX_PRIO] = { @@ -1260,9 +1357,10 @@ static int tcf_action_offload_add(struct tc_action *action, goto fl_err; } - err = tcf_action_offload_cmd(fl_action, &in_hw_count, extack); + err = tcf_action_offload_cmd(fl_action, &in_hw_count, cb, cb_priv); if (!err) - flow_action_update_hw(action, in_hw_count, FLOW_ACT_HW_ADD); + flow_action_update_hw(action, in_hw_count, + cb ? FLOW_ACT_HW_UPDATE : FLOW_ACT_HW_ADD); if (skip_sw && !tc_act_in_hw(action->tcfa_flags)) err = -EINVAL; @@ -1275,6 +1373,12 @@ static int tcf_action_offload_add(struct tc_action *action, return err; } +static int tcf_action_offload_add(struct tc_action *action, + struct netlink_ext_ack *extack) +{ + return tcf_action_offload_add_ex(action, extack, NULL, NULL); +} + int tcf_action_update_hw_stats(struct tc_action *action) { struct flow_offload_action fl_act = {}; @@ -1287,7 +1391,7 @@ int tcf_action_update_hw_stats(struct tc_action *action) if (err) goto err_out; - err = tcf_action_offload_cmd(&fl_act, NULL, NULL); + err = tcf_action_offload_cmd(&fl_act, NULL, NULL, NULL); if (!err && fl_act.stats.lastused) { preempt_disable(); @@ -1309,7 +1413,8 @@ int tcf_action_update_hw_stats(struct tc_action *action) } EXPORT_SYMBOL(tcf_action_update_hw_stats); -int tcf_action_offload_del(struct tc_action *action) +int tcf_action_offload_del_ex(struct tc_action *action, + flow_indr_block_bind_cb_t *cb, void *cb_priv) { struct flow_offload_action fl_act; u32 in_hw_count = 0; @@ -1325,13 +1430,83 @@ int tcf_action_offload_del(struct tc_action *action) if (err) return err; - err = tcf_action_offload_cmd(&fl_act, &in_hw_count, NULL); - if (err) + err = tcf_action_offload_cmd(&fl_act, &in_hw_count, cb, cb_priv); + if (err < 0) return err; - if (action->in_hw_count != in_hw_count) + /* do not need to update hw state when deleting action */ + if (cb && in_hw_count) + flow_action_update_hw(action, in_hw_count, FLOW_ACT_HW_DEL); + + if (!cb && action->in_hw_count != in_hw_count) + return -EINVAL; + + return 0; +} + +int tcf_action_offload_del(struct tc_action *action) +{ + return tcf_action_offload_del_ex(action, NULL, NULL); +} + +int tcf_action_reoffload_cb(flow_indr_block_bind_cb_t *cb, + void *cb_priv, bool add) +{ + struct tc_act_pernet_id *id_ptr; + struct tcf_idrinfo *idrinfo; + struct tc_action_net *tn; + struct tc_action *p; + unsigned int act_id; + unsigned long tmp; + unsigned long id; + struct idr *idr; + struct net *net; + int ret; + + if (!cb) return -EINVAL; + down_read(&net_rwsem); + mutex_lock(&act_id_mutex); + + for_each_net(net) { + list_for_each_entry(id_ptr, &act_pernet_id_list, list) { + act_id = id_ptr->id; + tn = net_generic(net, act_id); + if (!tn) + continue; + idrinfo = tn->idrinfo; + if (!idrinfo) + continue; + + mutex_lock(&idrinfo->lock); + idr = &idrinfo->action_idr; + idr_for_each_entry_ul(idr, p, tmp, id) { + if (IS_ERR(p) || !p->add_separate) + continue; + if (add) { + tcf_action_offload_add_ex(p, NULL, cb, + cb_priv); + continue; + } + + /* cb unregister to update hw count */ + ret = tcf_action_offload_del_ex(p, cb, cb_priv); + if (ret < 0) + continue; + if (tc_act_skip_sw(p->tcfa_flags) && + !tc_act_in_hw(p->tcfa_flags)) { + ret = tcf_idr_release_unsafe(p); + if (ret == ACT_P_DELETED) + module_put(p->ops->owner); + } + } + mutex_unlock(&idrinfo->lock); + } + } + mutex_unlock(&act_id_mutex); + up_read(&net_rwsem); + return 0; }