leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/sched: flower: Return error when hw can't offload and skip_sw is set

Browse Source 
When skip_sw is set and hardware fails to apply filter, return error to
user. This will make error propagation logic similar to the one
currently used in u32 classifier.
Also, changed code to use tc_skip_sw() utility function.

Signed-off-by: Amir Vadai <amirva@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amir Vadai 2016-06-13 12:06:39 +03:00 committed by David S. Miller
parent ce9355acd5
commit e8eb36cd8c
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
net/sched/cls_flower.c
View File

@ -140,7 +140,7 @@ static int fl_classify(struct sk_buff *skb, const struct tcf_proto *tp,
f = rhashtable_lookup_fast(&head->ht, f = rhashtable_lookup_fast(&head->ht,
fl_key_get_start(&skb_mkey, &head->mask), fl_key_get_start(&skb_mkey, &head->mask),
head->ht_params); head->ht_params);
if (f && !(f->flags & TCA_CLS_FLAGS_SKIP_SW)) { if (f && !tc_skip_sw(f->flags)) {
*res = f->res; *res = f->res;
return tcf_exts_exec(skb, &f->exts, res); return tcf_exts_exec(skb, &f->exts, res);
} }
@ -187,19 +187,20 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, unsigned long cookie)
dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol, &tc); dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol, &tc);
} }
static void fl_hw_replace_filter(struct tcf_proto *tp, static int fl_hw_replace_filter(struct tcf_proto *tp,
struct flow_dissector *dissector, struct flow_dissector *dissector,
struct fl_flow_key *mask, struct fl_flow_key *mask,
struct fl_flow_key *key, struct fl_flow_key *key,
struct tcf_exts *actions, struct tcf_exts *actions,
unsigned long cookie, u32 flags) unsigned long cookie, u32 flags)
{ {
struct net_device *dev = tp->q->dev_queue->dev; struct net_device *dev = tp->q->dev_queue->dev;
struct tc_cls_flower_offload offload = {0}; struct tc_cls_flower_offload offload = {0};
struct tc_to_netdev tc; struct tc_to_netdev tc;
int err;
if (!tc_should_offload(dev, tp, flags)) if (!tc_should_offload(dev, tp, flags))
return; return tc_skip_sw(flags) ? -EINVAL : 0;
offload.command = TC_CLSFLOWER_REPLACE; offload.command = TC_CLSFLOWER_REPLACE;
offload.cookie = cookie; offload.cookie = cookie;
@ -211,7 +212,12 @@ static void fl_hw_replace_filter(struct tcf_proto *tp,
tc.type = TC_SETUP_CLSFLOWER; tc.type = TC_SETUP_CLSFLOWER;
tc.cls_flower = &offload; tc.cls_flower = &offload;
dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol, &tc); err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol, &tc);
if (tc_skip_sw(flags))
return err;
return 0;
} }
static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f) static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
@ -572,20 +578,22 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
if (err) if (err)
goto errout; goto errout;
if (!(fnew->flags & TCA_CLS_FLAGS_SKIP_SW)) { if (!tc_skip_sw(fnew->flags)) {
err = rhashtable_insert_fast(&head->ht, &fnew->ht_node, err = rhashtable_insert_fast(&head->ht, &fnew->ht_node,
head->ht_params); head->ht_params);
if (err) if (err)
goto errout; goto errout;
} }
fl_hw_replace_filter(tp, err = fl_hw_replace_filter(tp,
&head->dissector, &head->dissector,
&mask.key, &mask.key,
&fnew->key, &fnew->key,
&fnew->exts, &fnew->exts,
(unsigned long)fnew, (unsigned long)fnew,
fnew->flags); fnew->flags);
if (err)
goto errout;
if (fold) { if (fold) {
rhashtable_remove_fast(&head->ht, &fold->ht_node, rhashtable_remove_fast(&head->ht, &fold->ht_node,