Skip to content

Commit

Permalink
flow_offload: rename offload functions with offload instead of flow
Browse files Browse the repository at this point in the history 
To improves readability, we rename offload functions with offload instead
of flow.

The term flow is related to exact matches, so we rename these functions
with offload.

We make this change to facilitate single action offload functions naming.

Signed-off-by: Baowen Zheng <[email protected]>
Signed-off-by: Simon Horman <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@zhengbaowen @davem330
zhengbaowen authored and davem330 committed Dec 19, 2021
1 parent 5a99590 commit 9c1c0e1
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions include/net/pkt_cls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,9 @@ tcf_match_indev(struct sk_buff *skb, int ifindex)
return ifindex == skb->skb_iif;
}

int tc_setup_flow_action(struct flow_action *flow_action,
const struct tcf_exts *exts);
void tc_cleanup_flow_action(struct flow_action *flow_action);
int tc_setup_offload_action(struct flow_action *flow_action,
const struct tcf_exts *exts);
void tc_cleanup_offload_action(struct flow_action *flow_action);

int tc_setup_cb_call(struct tcf_block *block, enum tc_setup_type type,
void *type_data, bool err_stop, bool rtnl_held);
Expand Down
12 changes: 6 additions & 6 deletions net/sched/cls_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3461,7 +3461,7 @@ static void tcf_act_put_cookie(struct flow_action_entry *entry)
flow_action_cookie_destroy(entry->cookie);
}

void tc_cleanup_flow_action(struct flow_action *flow_action)
void tc_cleanup_offload_action(struct flow_action *flow_action)
{
struct flow_action_entry *entry;
int i;
Expand All @@ -3472,7 +3472,7 @@ void tc_cleanup_flow_action(struct flow_action *flow_action)
entry->destructor(entry->destructor_priv);
}
}
EXPORT_SYMBOL(tc_cleanup_flow_action);
EXPORT_SYMBOL(tc_cleanup_offload_action);

static void tcf_mirred_get_dev(struct flow_action_entry *entry,
const struct tc_action *act)
Expand Down Expand Up @@ -3544,8 +3544,8 @@ static enum flow_action_hw_stats tc_act_hw_stats(u8 hw_stats)
return hw_stats;
}

int tc_setup_flow_action(struct flow_action *flow_action,
const struct tcf_exts *exts)
int tc_setup_offload_action(struct flow_action *flow_action,
const struct tcf_exts *exts)
{
struct tc_action *act;
int i, j, k, err = 0;
Expand Down Expand Up @@ -3718,14 +3718,14 @@ int tc_setup_flow_action(struct flow_action *flow_action,

err_out:
if (err)
tc_cleanup_flow_action(flow_action);
tc_cleanup_offload_action(flow_action);

return err;
err_out_locked:
spin_unlock_bh(&act->tcfa_lock);
goto err_out;
}
EXPORT_SYMBOL(tc_setup_flow_action);
EXPORT_SYMBOL(tc_setup_offload_action);

unsigned int tcf_exts_num_actions(struct tcf_exts *exts)
{
Expand Down
8 changes: 4 additions & 4 deletions net/sched/cls_flower.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
cls_flower.rule->match.key = &f->mkey;
cls_flower.classid = f->res.classid;

err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts);
err = tc_setup_offload_action(&cls_flower.rule->action, &f->exts);
if (err) {
kfree(cls_flower.rule);
if (skip_sw) {
Expand All @@ -473,7 +473,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,

err = tc_setup_cb_add(block, tp, TC_SETUP_CLSFLOWER, &cls_flower,
skip_sw, &f->flags, &f->in_hw_count, rtnl_held);
tc_cleanup_flow_action(&cls_flower.rule->action);
tc_cleanup_offload_action(&cls_flower.rule->action);
kfree(cls_flower.rule);

if (err) {
Expand Down Expand Up @@ -2266,7 +2266,7 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
cls_flower.rule->match.mask = &f->mask->key;
cls_flower.rule->match.key = &f->mkey;

err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts);
err = tc_setup_offload_action(&cls_flower.rule->action, &f->exts);
if (err) {
kfree(cls_flower.rule);
if (tc_skip_sw(f->flags)) {
Expand All @@ -2283,7 +2283,7 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
TC_SETUP_CLSFLOWER, &cls_flower,
cb_priv, &f->flags,
&f->in_hw_count);
tc_cleanup_flow_action(&cls_flower.rule->action);
tc_cleanup_offload_action(&cls_flower.rule->action);
kfree(cls_flower.rule);

if (err) {
Expand Down
8 changes: 4 additions & 4 deletions net/sched/cls_matchall.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
cls_mall.command = TC_CLSMATCHALL_REPLACE;
cls_mall.cookie = cookie;

err = tc_setup_flow_action(&cls_mall.rule->action, &head->exts);
err = tc_setup_offload_action(&cls_mall.rule->action, &head->exts);
if (err) {
kfree(cls_mall.rule);
mall_destroy_hw_filter(tp, head, cookie, NULL);
Expand All @@ -111,7 +111,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,

err = tc_setup_cb_add(block, tp, TC_SETUP_CLSMATCHALL, &cls_mall,
skip_sw, &head->flags, &head->in_hw_count, true);
tc_cleanup_flow_action(&cls_mall.rule->action);
tc_cleanup_offload_action(&cls_mall.rule->action);
kfree(cls_mall.rule);

if (err) {
Expand Down Expand Up @@ -301,7 +301,7 @@ static int mall_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
TC_CLSMATCHALL_REPLACE : TC_CLSMATCHALL_DESTROY;
cls_mall.cookie = (unsigned long)head;

err = tc_setup_flow_action(&cls_mall.rule->action, &head->exts);
err = tc_setup_offload_action(&cls_mall.rule->action, &head->exts);
if (err) {
kfree(cls_mall.rule);
if (add && tc_skip_sw(head->flags)) {
Expand All @@ -314,7 +314,7 @@ static int mall_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
err = tc_setup_cb_reoffload(block, tp, add, cb, TC_SETUP_CLSMATCHALL,
&cls_mall, cb_priv, &head->flags,
&head->in_hw_count);
tc_cleanup_flow_action(&cls_mall.rule->action);
tc_cleanup_offload_action(&cls_mall.rule->action);
kfree(cls_mall.rule);

if (err)
Expand Down

0 comments on commit 9c1c0e1

Please sign in to comment.