Skip to content

Commit

Permalink
Merge branch 'net-sched-act-add-extack-support'
Browse files Browse the repository at this point in the history 
Alexander Aring says:

====================
net: sched: act: add extack support

this patch series adds extack support for the TC action subsystem.
As example I for the extack support in a TC action I choosed mirred
action.

- Alex

Cc: David Ahern <[email protected]>

changes since v3:
- adapt recommended changes from Davide Caratti, please check if
  I catch everything. Thanks.

changes since v2:

- remove newline in extack of generic walker handling
  Thanks to Davide Caratti
- add [email protected] in cc
====================

Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@davem330
davem330 committed Feb 16, 2018
2 parents 66dede2 + 10defbd commit f6581c7
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 21 deletions.
10 changes: 6 additions & 4 deletions include/net/act_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,13 @@ struct tc_action_ops {
struct tcf_result *);
int (*dump)(struct sk_buff *, struct tc_action *, int, int);
void (*cleanup)(struct tc_action *);
int (*lookup)(struct net *, struct tc_action **, u32);
int (*lookup)(struct net *net, struct tc_action **a, u32 index);
int (*init)(struct net *net, struct nlattr *nla,
struct nlattr *est, struct tc_action **act, int ovr,
int bind);
int (*walk)(struct net *, struct sk_buff *,
struct netlink_callback *, int, const struct tc_action_ops *);
struct netlink_callback *, int,
const struct tc_action_ops *);
void (*stats_update)(struct tc_action *, u64, u32, u64);
struct net_device *(*get_dev)(const struct tc_action *a);
};
Expand Down Expand Up @@ -162,10 +163,11 @@ int tcf_action_exec(struct sk_buff *skb, struct tc_action **actions,
int nr_actions, struct tcf_result *res);
int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
struct nlattr *est, char *name, int ovr, int bind,
struct list_head *actions);
struct list_head *actions, struct netlink_ext_ack *extack);
struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
struct nlattr *nla, struct nlattr *est,
char *name, int ovr, int bind);
char *name, int ovr, int bind,
struct netlink_ext_ack *extack);
int tcf_action_dump(struct sk_buff *skb, struct list_head *, int, int);
int tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int, int);
int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int, int);
Expand Down
29 changes: 17 additions & 12 deletions net/sched/act_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,8 @@ static struct tc_cookie *nla_memdup_cookie(struct nlattr **tb)

struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
struct nlattr *nla, struct nlattr *est,
char *name, int ovr, int bind)
char *name, int ovr, int bind,
struct netlink_ext_ack *extack)
{
struct tc_action *a;
struct tc_action_ops *a_o;
Expand All @@ -621,7 +622,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
goto err_out;
err = -EINVAL;
kind = tb[TCA_ACT_KIND];
if (kind == NULL)
if (!kind)
goto err_out;
if (nla_strlcpy(act_name, kind, IFNAMSIZ) >= IFNAMSIZ)
goto err_out;
Expand Down Expand Up @@ -726,7 +727,7 @@ static void cleanup_a(struct list_head *actions, int ovr)

int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
struct nlattr *est, char *name, int ovr, int bind,
struct list_head *actions)
struct list_head *actions, struct netlink_ext_ack *extack)
{
struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];
struct tc_action *act;
Expand All @@ -738,7 +739,8 @@ int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
return err;

for (i = 1; i <= TCA_ACT_MAX_PRIO && tb[i]; i++) {
act = tcf_action_init_1(net, tp, tb[i], est, name, ovr, bind);
act = tcf_action_init_1(net, tp, tb[i], est, name, ovr, bind,
extack);
if (IS_ERR(act)) {
err = PTR_ERR(act);
goto err;
Expand Down Expand Up @@ -822,7 +824,7 @@ static int tca_get_fill(struct sk_buff *skb, struct list_head *actions,
t->tca__pad2 = 0;

nest = nla_nest_start(skb, TCA_ACT_TAB);
if (nest == NULL)
if (!nest)
goto out_nlmsg_trim;

if (tcf_action_dump(skb, actions, bind, ref) < 0)
Expand Down Expand Up @@ -934,7 +936,7 @@ static int tca_action_flush(struct net *net, struct nlattr *nla,
t->tca__pad2 = 0;

nest = nla_nest_start(skb, TCA_ACT_TAB);
if (nest == NULL)
if (!nest)
goto out_module_put;

err = ops->walk(net, skb, &dcb, RTM_DELACTION, ops);
Expand Down Expand Up @@ -1007,10 +1009,10 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
return ret;

if (event == RTM_DELACTION && n->nlmsg_flags & NLM_F_ROOT) {
if (tb[1] != NULL)
if (tb[1])
return tca_action_flush(net, tb[1], n, portid);
else
return -EINVAL;

return -EINVAL;
}

for (i = 1; i <= TCA_ACT_MAX_PRIO && tb[i]; i++) {
Expand Down Expand Up @@ -1062,12 +1064,14 @@ tcf_add_notify(struct net *net, struct nlmsghdr *n, struct list_head *actions,
}

static int tcf_action_add(struct net *net, struct nlattr *nla,
struct nlmsghdr *n, u32 portid, int ovr)
struct nlmsghdr *n, u32 portid, int ovr,
struct netlink_ext_ack *extack)
{
int ret = 0;
LIST_HEAD(actions);

ret = tcf_action_init(net, NULL, nla, NULL, NULL, ovr, 0, &actions);
ret = tcf_action_init(net, NULL, nla, NULL, NULL, ovr, 0, &actions,
extack);
if (ret)
return ret;

Expand Down Expand Up @@ -1115,7 +1119,8 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n,
if (n->nlmsg_flags & NLM_F_REPLACE)
ovr = 1;
replay:
ret = tcf_action_add(net, tca[TCA_ACT_TAB], n, portid, ovr);
ret = tcf_action_add(net, tca[TCA_ACT_TAB], n, portid, ovr,
extack);
if (ret == -EAGAIN)
goto replay;
break;
Expand Down
6 changes: 3 additions & 3 deletions net/sched/act_mirred.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
bool exists = false;
int ret;

if (nla == NULL)
if (!nla)
return -EINVAL;
ret = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, mirred_policy, NULL);
if (ret < 0)
return ret;
if (tb[TCA_MIRRED_PARMS] == NULL)
if (!tb[TCA_MIRRED_PARMS])
return -EINVAL;
parm = nla_data(tb[TCA_MIRRED_PARMS]);

Expand Down Expand Up @@ -117,7 +117,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
}

if (!exists) {
if (dev == NULL)
if (!dev)
return -EINVAL;
ret = tcf_idr_create(tn, parm->index, est, a,
&act_mirred_ops, bind, true);
Expand Down
4 changes: 2 additions & 2 deletions net/sched/cls_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,
if (exts->police && tb[exts->police]) {
act = tcf_action_init_1(net, tp, tb[exts->police],
rate_tlv, "police", ovr,
TCA_ACT_BIND);
TCA_ACT_BIND, extack);
if (IS_ERR(act))
return PTR_ERR(act);

Expand All @@ -1447,7 +1447,7 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,

err = tcf_action_init(net, tp, tb[exts->action],
rate_tlv, NULL, ovr, TCA_ACT_BIND,
&actions);
&actions, extack);
if (err)
return err;
list_for_each_entry(act, &actions, list)
Expand Down

0 comments on commit f6581c7

Please sign in to comment.