Skip to content

Commit

Permalink
net_sched: cls: refactor out struct tcf_ext_map
Browse files Browse the repository at this point in the history 
These information can be saved in tcf_exts, and this will
simplify the code.

Cc: Jamal Hadi Salim <[email protected]>
Cc: David S. Miller <[email protected]>
Signed-off-by: Cong Wang <[email protected]>
Signed-off-by: Jamal Hadi Salim <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@congwang @davem330
congwang authored and davem330 committed Dec 18, 2013
1 parent 33be627 commit 5da57f4
Show file tree
Hide file tree
Showing 11 changed files with 69 additions and 114 deletions.
23 changes: 10 additions & 13 deletions include/net/pkt_cls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,21 @@ struct tcf_exts {
__u32 type; /* for backward compat(TCA_OLD_COMPAT) */
struct list_head actions;
#endif
};

/* Map to export classifier specific extension TLV types to the
* generic extensions API. Unsupported extensions must be set to 0.
*/
struct tcf_ext_map {
/* Map to export classifier specific extension TLV types to the
* generic extensions API. Unsupported extensions must be set to 0.
*/
int action;
int police;
};

static inline void tcf_exts_init(struct tcf_exts *exts)
static inline void tcf_exts_init(struct tcf_exts *exts, int action, int police)
{
#ifdef CONFIG_NET_CLS_ACT
exts->type = 0;
INIT_LIST_HEAD(&exts->actions);
#endif
exts->action = action;
exts->police = police;
}

/**
Expand Down Expand Up @@ -136,15 +136,12 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts,

int tcf_exts_validate(struct net *net, struct tcf_proto *tp,
struct nlattr **tb, struct nlattr *rate_tlv,
struct tcf_exts *exts,
const struct tcf_ext_map *map);
struct tcf_exts *exts);
void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts);
void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
struct tcf_exts *src);
int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts,
const struct tcf_ext_map *map);
int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
const struct tcf_ext_map *map);
int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts);
int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts);

/**
* struct tcf_pkt_info - packet information
Expand Down
31 changes: 13 additions & 18 deletions net/sched/cls_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,37 +507,34 @@ void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts)
EXPORT_SYMBOL(tcf_exts_destroy);

int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,
struct nlattr *rate_tlv, struct tcf_exts *exts,
const struct tcf_ext_map *map)
struct nlattr *rate_tlv, struct tcf_exts *exts)
{
memset(exts, 0, sizeof(*exts));

#ifdef CONFIG_NET_CLS_ACT
{
struct tc_action *act;

INIT_LIST_HEAD(&exts->actions);
if (map->police && tb[map->police]) {
act = tcf_action_init_1(net, tb[map->police], rate_tlv,
if (exts->police && tb[exts->police]) {
act = tcf_action_init_1(net, tb[exts->police], rate_tlv,
"police", TCA_ACT_NOREPLACE,
TCA_ACT_BIND);
if (IS_ERR(act))
return PTR_ERR(act);

act->type = exts->type = TCA_OLD_COMPAT;
list_add(&act->list, &exts->actions);
} else if (map->action && tb[map->action]) {
} else if (exts->action && tb[exts->action]) {
int err;
err = tcf_action_init(net, tb[map->action], rate_tlv,
err = tcf_action_init(net, tb[exts->action], rate_tlv,
NULL, TCA_ACT_NOREPLACE,
TCA_ACT_BIND, &exts->actions);
if (err)
return err;
}
}
#else
if ((map->action && tb[map->action]) ||
(map->police && tb[map->police]))
if ((exts->action && tb[exts->action]) ||
(exts->police && tb[exts->police]))
return -EOPNOTSUPP;
#endif

Expand All @@ -564,27 +561,26 @@ EXPORT_SYMBOL(tcf_exts_change);
#define tcf_exts_first_act(ext) \
list_first_entry(&(exts)->actions, struct tc_action, list)

int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts,
const struct tcf_ext_map *map)
int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts)
{
#ifdef CONFIG_NET_CLS_ACT
if (map->action && !list_empty(&exts->actions)) {
if (exts->action && !list_empty(&exts->actions)) {
/*
* again for backward compatible mode - we want
* to work with both old and new modes of entering
* tc data even if iproute2 was newer - jhs
*/
struct nlattr *nest;
if (exts->type != TCA_OLD_COMPAT) {
nest = nla_nest_start(skb, map->action);
nest = nla_nest_start(skb, exts->action);
if (nest == NULL)
goto nla_put_failure;
if (tcf_action_dump(skb, &exts->actions, 0, 0) < 0)
goto nla_put_failure;
nla_nest_end(skb, nest);
} else if (map->police) {
} else if (exts->police) {
struct tc_action *act = tcf_exts_first_act(exts);
nest = nla_nest_start(skb, map->police);
nest = nla_nest_start(skb, exts->police);
if (nest == NULL)
goto nla_put_failure;
if (tcf_action_dump_old(skb, act, 0, 0) < 0)
Expand All @@ -600,8 +596,7 @@ nla_put_failure: __attribute__ ((unused))
EXPORT_SYMBOL(tcf_exts_dump);


int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
const struct tcf_ext_map *map)
int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts)
{
#ifdef CONFIG_NET_CLS_ACT
struct tc_action *a = tcf_exts_first_act(exts);
Expand Down
14 changes: 5 additions & 9 deletions net/sched/cls_basic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ struct basic_filter {
struct list_head link;
};

static const struct tcf_ext_map basic_ext_map = {
.action = TCA_BASIC_ACT,
.police = TCA_BASIC_POLICE
};

static int basic_classify(struct sk_buff *skb, const struct tcf_proto *tp,
struct tcf_result *res)
{
Expand Down Expand Up @@ -141,7 +136,8 @@ static int basic_set_parms(struct net *net, struct tcf_proto *tp,
struct tcf_exts e;
struct tcf_ematch_tree t;

err = tcf_exts_validate(net, tp, tb, est, &e, &basic_ext_map);
tcf_exts_init(&e, TCA_BASIC_ACT, TCA_BASIC_POLICE);
err = tcf_exts_validate(net, tp, tb, est, &e);
if (err < 0)
return err;

Expand Down Expand Up @@ -191,7 +187,7 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,
if (f == NULL)
goto errout;

tcf_exts_init(&f->exts);
tcf_exts_init(&f->exts, TCA_BASIC_ACT, TCA_BASIC_POLICE);
err = -EINVAL;
if (handle)
f->handle = handle;
Expand Down Expand Up @@ -264,13 +260,13 @@ static int basic_dump(struct tcf_proto *tp, unsigned long fh,
nla_put_u32(skb, TCA_BASIC_CLASSID, f->res.classid))
goto nla_put_failure;

if (tcf_exts_dump(skb, &f->exts, &basic_ext_map) < 0 ||
if (tcf_exts_dump(skb, &f->exts) < 0 ||
tcf_em_tree_dump(skb, &f->ematches, TCA_BASIC_EMATCHES) < 0)
goto nla_put_failure;

nla_nest_end(skb, nest);

if (tcf_exts_dump_stats(skb, &f->exts, &basic_ext_map) < 0)
if (tcf_exts_dump_stats(skb, &f->exts) < 0)
goto nla_put_failure;

return skb->len;
Expand Down
14 changes: 5 additions & 9 deletions net/sched/cls_bpf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ static const struct nla_policy bpf_policy[TCA_BPF_MAX + 1] = {
.len = sizeof(struct sock_filter) * BPF_MAXINSNS },
};

static const struct tcf_ext_map bpf_ext_map = {
.action = TCA_BPF_ACT,
.police = TCA_BPF_POLICE,
};

static int cls_bpf_classify(struct sk_buff *skb, const struct tcf_proto *tp,
struct tcf_result *res)
{
Expand Down Expand Up @@ -174,7 +169,8 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp,
if (!tb[TCA_BPF_OPS_LEN] || !tb[TCA_BPF_OPS] || !tb[TCA_BPF_CLASSID])
return -EINVAL;

ret = tcf_exts_validate(net, tp, tb, est, &exts, &bpf_ext_map);
tcf_exts_init(&exts, TCA_BPF_ACT, TCA_BPF_POLICE);
ret = tcf_exts_validate(net, tp, tb, est, &exts);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -271,7 +267,7 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
if (prog == NULL)
return -ENOBUFS;

tcf_exts_init(&prog->exts);
tcf_exts_init(&prog->exts, TCA_BPF_ACT, TCA_BPF_POLICE);
if (handle == 0)
prog->handle = cls_bpf_grab_new_handle(tp, head);
else
Expand Down Expand Up @@ -326,12 +322,12 @@ static int cls_bpf_dump(struct tcf_proto *tp, unsigned long fh,

memcpy(nla_data(nla), prog->bpf_ops, nla_len(nla));

if (tcf_exts_dump(skb, &prog->exts, &bpf_ext_map) < 0)
if (tcf_exts_dump(skb, &prog->exts) < 0)
goto nla_put_failure;

nla_nest_end(skb, nest);

if (tcf_exts_dump_stats(skb, &prog->exts, &bpf_ext_map) < 0)
if (tcf_exts_dump_stats(skb, &prog->exts) < 0)
goto nla_put_failure;

return skb->len;
Expand Down
15 changes: 5 additions & 10 deletions net/sched/cls_cgroup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,6 @@ static int cls_cgroup_init(struct tcf_proto *tp)
return 0;
}

static const struct tcf_ext_map cgroup_ext_map = {
.action = TCA_CGROUP_ACT,
.police = TCA_CGROUP_POLICE,
};

static const struct nla_policy cgroup_policy[TCA_CGROUP_MAX + 1] = {
[TCA_CGROUP_EMATCHES] = { .type = NLA_NESTED },
};
Expand All @@ -203,7 +198,7 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,
if (head == NULL)
return -ENOBUFS;

tcf_exts_init(&head->exts);
tcf_exts_init(&head->exts, TCA_CGROUP_ACT, TCA_CGROUP_POLICE);
head->handle = handle;

tcf_tree_lock(tp);
Expand All @@ -219,8 +214,8 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,
if (err < 0)
return err;

err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e,
&cgroup_ext_map);
tcf_exts_init(&e, TCA_CGROUP_ACT, TCA_CGROUP_POLICE);
err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e);
if (err < 0)
return err;

Expand Down Expand Up @@ -278,13 +273,13 @@ static int cls_cgroup_dump(struct tcf_proto *tp, unsigned long fh,
if (nest == NULL)
goto nla_put_failure;

if (tcf_exts_dump(skb, &head->exts, &cgroup_ext_map) < 0 ||
if (tcf_exts_dump(skb, &head->exts) < 0 ||
tcf_em_tree_dump(skb, &head->ematches, TCA_CGROUP_EMATCHES) < 0)
goto nla_put_failure;

nla_nest_end(skb, nest);

if (tcf_exts_dump_stats(skb, &head->exts, &cgroup_ext_map) < 0)
if (tcf_exts_dump_stats(skb, &head->exts) < 0)
goto nla_put_failure;

return skb->len;
Expand Down
14 changes: 5 additions & 9 deletions net/sched/cls_flow.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ struct flow_filter {
u32 hashrnd;
};

static const struct tcf_ext_map flow_ext_map = {
.action = TCA_FLOW_ACT,
.police = TCA_FLOW_POLICE,
};

static inline u32 addr_fold(void *addr)
{
unsigned long a = (unsigned long)addr;
Expand Down Expand Up @@ -397,7 +392,8 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
return -EOPNOTSUPP;
}

err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e, &flow_ext_map);
tcf_exts_init(&e, TCA_FLOW_ACT, TCA_FLOW_POLICE);
err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e);
if (err < 0)
return err;

Expand Down Expand Up @@ -455,7 +451,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,

f->handle = handle;
f->mask = ~0U;
tcf_exts_init(&f->exts);
tcf_exts_init(&f->exts, TCA_FLOW_ACT, TCA_FLOW_POLICE);

get_random_bytes(&f->hashrnd, 4);
f->perturb_timer.function = flow_perturbation;
Expand Down Expand Up @@ -609,7 +605,7 @@ static int flow_dump(struct tcf_proto *tp, unsigned long fh,
nla_put_u32(skb, TCA_FLOW_PERTURB, f->perturb_period / HZ))
goto nla_put_failure;

if (tcf_exts_dump(skb, &f->exts, &flow_ext_map) < 0)
if (tcf_exts_dump(skb, &f->exts) < 0)
goto nla_put_failure;
#ifdef CONFIG_NET_EMATCH
if (f->ematches.hdr.nmatches &&
Expand All @@ -618,7 +614,7 @@ static int flow_dump(struct tcf_proto *tp, unsigned long fh,
#endif
nla_nest_end(skb, nest);

if (tcf_exts_dump_stats(skb, &f->exts, &flow_ext_map) < 0)
if (tcf_exts_dump_stats(skb, &f->exts) < 0)
goto nla_put_failure;

return skb->len;
Expand Down
14 changes: 5 additions & 9 deletions net/sched/cls_fw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ struct fw_filter {
struct tcf_exts exts;
};

static const struct tcf_ext_map fw_ext_map = {
.action = TCA_FW_ACT,
.police = TCA_FW_POLICE
};

static inline int fw_hash(u32 handle)
{
if (HTSIZE == 4096)
Expand Down Expand Up @@ -200,7 +195,8 @@ fw_change_attrs(struct net *net, struct tcf_proto *tp, struct fw_filter *f,
u32 mask;
int err;

err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e, &fw_ext_map);
tcf_exts_init(&e, TCA_FW_ACT, TCA_FW_POLICE);
err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e);
if (err < 0)
return err;

Expand Down Expand Up @@ -280,7 +276,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,
if (f == NULL)
return -ENOBUFS;

tcf_exts_init(&f->exts);
tcf_exts_init(&f->exts, TCA_FW_ACT, TCA_FW_POLICE);
f->id = handle;

err = fw_change_attrs(net, tp, f, tb, tca, base);
Expand Down Expand Up @@ -360,12 +356,12 @@ static int fw_dump(struct tcf_proto *tp, unsigned long fh,
nla_put_u32(skb, TCA_FW_MASK, head->mask))
goto nla_put_failure;

if (tcf_exts_dump(skb, &f->exts, &fw_ext_map) < 0)
if (tcf_exts_dump(skb, &f->exts) < 0)
goto nla_put_failure;

nla_nest_end(skb, nest);

if (tcf_exts_dump_stats(skb, &f->exts, &fw_ext_map) < 0)
if (tcf_exts_dump_stats(skb, &f->exts) < 0)
goto nla_put_failure;

return skb->len;
Expand Down
Loading

0 comments on commit 5da57f4

Please sign in to comment.