Skip to content

Commit

Permalink
flow_offload: add process to delete offloaded actions from net device
Browse files Browse the repository at this point in the history 
Add a basic process to delete offloaded actions from net device.

Should not remove the offloaded action entries if the action
fails to delete in tcf_del_notify.

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>
  • Loading branch information
@zhengbaowen @intel-lab-lkp
zhengbaowen authored and intel-lab-lkp committed Jul 22, 2021
1 parent 9228a8e commit a8e2d0a
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 21 deletions.
1 change: 1 addition & 0 deletions include/net/pkt_cls.h
View file
Expand Up @@ -573,6 +573,7 @@ int tc_setup_cb_reoffload(struct tcf_block *block, struct tcf_proto *tp,
void *cb_priv, u32 *flags, unsigned int *in_hw_count);
unsigned int tcf_exts_num_actions(struct tcf_exts *exts);
unsigned int tcf_act_num_actions(struct tc_action *actions[]);
unsigned int tcf_act_num_actions_single(struct tc_action *act);

#ifdef CONFIG_NET_CLS_ACT
int tcf_qevent_init(struct tcf_qevent *qe, struct Qdisc *sch,
Expand Down
112 changes: 95 additions & 17 deletions net/sched/act_api.c
View file
Expand Up @@ -1060,36 +1060,109 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
return ERR_PTR(err);
}

/* offload the tc command after inserted */
int tcf_action_offload_cmd(struct tc_action *actions[],
struct netlink_ext_ack *extack)
int tcf_action_offload_cmd_pre(struct tc_action *actions[],
enum flow_act_command cmd,
struct netlink_ext_ack *extack,
struct flow_offload_action **fl_act)
{
struct flow_offload_action *fl_act;
struct flow_offload_action *fl_act_p;
int err = 0;

fl_act = flow_action_alloc(tcf_act_num_actions(actions));
if (!fl_act)
fl_act_p = flow_action_alloc(tcf_act_num_actions(actions));
if (!fl_act_p)
return -ENOMEM;

fl_act->extack = extack;
err = tc_setup_action(&fl_act->action, actions);
fl_act_p->extack = extack;
fl_act_p->command = cmd;
err = tc_setup_action(&fl_act_p->action, actions);
if (err) {
NL_SET_ERR_MSG_MOD(extack,
"Failed to setup tc actions for offload\n");
goto err_out;
}
fl_act->command = FLOW_ACT_REPLACE;
*fl_act = fl_act_p;
return 0;
err_out:
kfree(fl_act_p);
return err;
}
EXPORT_SYMBOL(tcf_action_offload_cmd_pre);

int tcf_action_offload_cmd_post(struct flow_offload_action *fl_act,
struct netlink_ext_ack *extack)
{
if (IS_ERR(fl_act))
return PTR_ERR(fl_act);

flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL);

tc_cleanup_flow_action(&fl_act->action);

err_out:
kfree(fl_act);
return err;
return 0;
}

/* offload the tc command after inserted */
int tcf_action_offload_cmd(struct tc_action *actions[],
struct netlink_ext_ack *extack)
{
struct flow_offload_action *fl_act;
int err = 0;

err = tcf_action_offload_cmd_pre(actions,
FLOW_ACT_REPLACE,
extack,
&fl_act);
if (err)
return err;

return tcf_action_offload_cmd_post(fl_act, extack);
}
EXPORT_SYMBOL(tcf_action_offload_cmd);

/* offload the tc command after deleted */
int tcf_action_offload_del_post(struct flow_offload_action *fl_act,
struct tc_action *actions[],
struct netlink_ext_ack *extack,
int fallback_num)
{
int fallback_entries = 0;
struct tc_action *act;
int total_entries = 0;
int i;

if (!fl_act)
return -EINVAL;

if (fallback_num) {
/* for each the actions to fallback the action entries remain in the actions */
for (i = 0; i < TCA_ACT_MAX_PRIO; i++) {
act = actions[i];
if (!act)
continue;

fallback_entries += tcf_act_num_actions_single(act);
}
fallback_entries += fallback_num;
}
total_entries = fl_act->action.num_entries;
if (total_entries > fallback_entries) {
/* just offload the actions that is not fallback and start with the actions */
fl_act->action.num_entries -= fallback_entries;
flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT, fl_act, NULL, NULL);

/* recovery num_entries for cleanup */
fl_act->action.num_entries = total_entries;
} else {
NL_SET_ERR_MSG(extack, "no entries to offload when deleting the tc actions");
}

tc_cleanup_flow_action(&fl_act->action);

kfree(fl_act);
return 0;
}
EXPORT_SYMBOL(tcf_action_offload_del_post);

/* Returns numbers of initialized actions or negative error. */

int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
Expand Down Expand Up @@ -1393,7 +1466,7 @@ static int tca_action_flush(struct net *net, struct nlattr *nla,
return err;
}

static int tcf_action_delete(struct net *net, struct tc_action *actions[])
static int tcf_action_delete(struct net *net, struct tc_action *actions[], int *fallbacknum)
{
int i;

Expand All @@ -1407,6 +1480,7 @@ static int tcf_action_delete(struct net *net, struct tc_action *actions[])
u32 act_index = a->tcfa_index;

actions[i] = NULL;
*fallbacknum = tcf_act_num_actions_single(a);
if (tcf_action_put(a)) {
/* last reference, action was deleted concurrently */
module_put(ops->owner);
Expand All @@ -1419,12 +1493,13 @@ static int tcf_action_delete(struct net *net, struct tc_action *actions[])
return ret;
}
}
*fallbacknum = 0;
return 0;
}

static int
tcf_del_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[],
u32 portid, size_t attr_size, struct netlink_ext_ack *extack)
u32 portid, size_t attr_size, struct netlink_ext_ack *extack, int *fallbacknum)
{
int ret;
struct sk_buff *skb;
Expand All @@ -1442,7 +1517,7 @@ tcf_del_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[],
}

/* now do the delete */
ret = tcf_action_delete(net, actions);
ret = tcf_action_delete(net, actions, fallbacknum);
if (ret < 0) {
NL_SET_ERR_MSG(extack, "Failed to delete TC action");
kfree_skb(skb);
Expand All @@ -1458,11 +1533,12 @@ static int
tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
u32 portid, int event, struct netlink_ext_ack *extack)
{
int i, ret;
struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];
struct tc_action *act;
size_t attr_size = 0;
struct tc_action *actions[TCA_ACT_MAX_PRIO] = {};
struct flow_offload_action *fl_act;
int i, ret, fallback_num;

ret = nla_parse_nested_deprecated(tb, TCA_ACT_MAX_PRIO, nla, NULL,
extack);
Expand Down Expand Up @@ -1492,7 +1568,9 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
if (event == RTM_GETACTION)
ret = tcf_get_notify(net, portid, n, actions, event, extack);
else { /* delete */
ret = tcf_del_notify(net, n, actions, portid, attr_size, extack);
tcf_action_offload_cmd_pre(actions, FLOW_ACT_DESTROY, extack, &fl_act);
ret = tcf_del_notify(net, n, actions, portid, attr_size, extack, &fallback_num);
tcf_action_offload_del_post(fl_act, actions, extack, fallback_num);
if (ret)
goto err;
return 0;
Expand Down
14 changes: 10 additions & 4 deletions net/sched/cls_api.c
View file
Expand Up @@ -3755,17 +3755,23 @@ unsigned int tcf_exts_num_actions(struct tcf_exts *exts)
}
EXPORT_SYMBOL(tcf_exts_num_actions);

unsigned int tcf_act_num_actions_single(struct tc_action *act)
{
if (is_tcf_pedit(act))
return tcf_pedit_nkeys(act);
else
return 1;
}
EXPORT_SYMBOL(tcf_act_num_actions_single);

unsigned int tcf_act_num_actions(struct tc_action *actions[])
{
unsigned int num_acts = 0;
struct tc_action *act;
int i;

tcf_act_for_each_action(i, act, actions) {
if (is_tcf_pedit(act))
num_acts += tcf_pedit_nkeys(act);
else
num_acts++;
num_acts += tcf_act_num_actions_single(act);
}
return num_acts;
}
Expand Down

0 comments on commit a8e2d0a

Please sign in to comment.