p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sched: cls_flower: Provide a filter to replace/destroy hardware filter functions 

Instead of providing many arguments to fl_hw_{replace/destroy}_filter
functions, just provide cls_fl_filter struct that includes all the relevant
args.

This patches doesn't add any new functionality.

Signed-off-by: Hadar Hen Zion <hadarh@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hadar Hen Zion 2016-12-01 14:06:35 +02:00 committed by David S. Miller
parent 796852197c
commit 3036dab670
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/sched/cls_flower.c
View File

@ -201,7 +201,7 @@ static void fl_destroy_filter(struct rcu_head *head)
kfree(f); kfree(f);
} }
static void fl_hw_destroy_filter(struct tcf_proto *tp, unsigned long cookie) static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f)
{ {
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};
@ -211,7 +211,7 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, unsigned long cookie)
return; return;
offload.command = TC_CLSFLOWER_DESTROY; offload.command = TC_CLSFLOWER_DESTROY;
offload.cookie = cookie; offload.cookie = (unsigned long)f;
tc.type = TC_SETUP_CLSFLOWER; tc.type = TC_SETUP_CLSFLOWER;
tc.cls_flower = &offload; tc.cls_flower = &offload;
@ -222,9 +222,7 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, unsigned long cookie)
static int 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 cls_fl_filter *f)
struct tcf_exts *actions,
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};
@ -232,14 +230,14 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
int err; int err;
if (!tc_can_offload(dev, tp)) if (!tc_can_offload(dev, tp))
return tc_skip_sw(flags) ? -EINVAL : 0; return tc_skip_sw(f->flags) ? -EINVAL : 0;
offload.command = TC_CLSFLOWER_REPLACE; offload.command = TC_CLSFLOWER_REPLACE;
offload.cookie = cookie; offload.cookie = (unsigned long)f;
offload.dissector = dissector; offload.dissector = dissector;
offload.mask = mask; offload.mask = mask;
offload.key = key; offload.key = &f->key;
offload.exts = actions; offload.exts = &f->exts;
tc.type = TC_SETUP_CLSFLOWER; tc.type = TC_SETUP_CLSFLOWER;
tc.cls_flower = &offload; tc.cls_flower = &offload;
@ -247,7 +245,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol, err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol,
&tc); &tc);
if (tc_skip_sw(flags)) if (tc_skip_sw(f->flags))
return err; return err;
return 0; return 0;
@ -276,7 +274,7 @@ static void __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f)
{ {
list_del_rcu(&f->list); list_del_rcu(&f->list);
if (!tc_skip_hw(f->flags)) if (!tc_skip_hw(f->flags))
fl_hw_destroy_filter(tp, (unsigned long)f); fl_hw_destroy_filter(tp, f);
tcf_unbind_filter(tp, &f->res); tcf_unbind_filter(tp, &f->res);
call_rcu(&f->rcu, fl_destroy_filter); call_rcu(&f->rcu, fl_destroy_filter);
} }
@ -748,10 +746,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
err = fl_hw_replace_filter(tp, err = fl_hw_replace_filter(tp,
&head->dissector, &head->dissector,
&mask.key, &mask.key,
&fnew->key, fnew);
&fnew->exts,
(unsigned long)fnew,
fnew->flags);
if (err) if (err)
goto errout; goto errout;
} }
@ -760,7 +755,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
rhashtable_remove_fast(&head->ht, &fold->ht_node, rhashtable_remove_fast(&head->ht, &fold->ht_node,
head->ht_params); head->ht_params);
if (!tc_skip_hw(fold->flags)) if (!tc_skip_hw(fold->flags))
fl_hw_destroy_filter(tp, (unsigned long)fold); fl_hw_destroy_filter(tp, fold);
} }
*arg = (unsigned long) fnew; *arg = (unsigned long) fnew;