* [PATCH net-next V2 1/6] net/sched: cls_matchall: Dump skip flags
2017-02-14 14:30 [PATCH net-next V2 0/6] net/sched: Reflect HW offload status Or Gerlitz
@ 2017-02-14 14:30 ` Or Gerlitz
2017-02-14 19:28 ` Jakub Kicinski
2017-02-14 14:30 ` [PATCH net-next V2 2/6] net/sched: Reflect HW offload status Or Gerlitz
` (4 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Or Gerlitz @ 2017-02-14 14:30 UTC (permalink / raw)
To: David S. Miller
Cc: Jakub Kicinski, John Fastabend, Jamal Hadi Salim, Roi Dayan,
Paul Blakey, netdev, Or Gerlitz
The skip flags are not dumped to user-space, do that.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Yotam Gigi <yotamg@mellanox.com>
---
net/sched/cls_matchall.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index f2141cb..ce2f7d4 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -244,6 +244,8 @@ static int mall_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
nla_put_u32(skb, TCA_MATCHALL_CLASSID, head->res.classid))
goto nla_put_failure;
+ nla_put_u32(skb, TCA_MATCHALL_FLAGS, head->flags);
+
if (tcf_exts_dump(skb, &head->exts))
goto nla_put_failure;
--
2.3.7
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH net-next V2 1/6] net/sched: cls_matchall: Dump skip flags
2017-02-14 14:30 ` [PATCH net-next V2 1/6] net/sched: cls_matchall: Dump skip flags Or Gerlitz
@ 2017-02-14 19:28 ` Jakub Kicinski
2017-02-15 8:20 ` Or Gerlitz
0 siblings, 1 reply; 11+ messages in thread
From: Jakub Kicinski @ 2017-02-14 19:28 UTC (permalink / raw)
To: Or Gerlitz
Cc: David S. Miller, John Fastabend, Jamal Hadi Salim, Roi Dayan,
Paul Blakey, netdev
On Tue, 14 Feb 2017 16:30:35 +0200, Or Gerlitz wrote:
> The skip flags are not dumped to user-space, do that.
>
> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
> Acked-by: Jiri Pirko <jiri@mellanox.com>
> Acked-by: Yotam Gigi <yotamg@mellanox.com>
> ---
> net/sched/cls_matchall.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
> index f2141cb..ce2f7d4 100644
> --- a/net/sched/cls_matchall.c
> +++ b/net/sched/cls_matchall.c
> @@ -244,6 +244,8 @@ static int mall_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
> nla_put_u32(skb, TCA_MATCHALL_CLASSID, head->res.classid))
> goto nla_put_failure;
>
> + nla_put_u32(skb, TCA_MATCHALL_FLAGS, head->flags);
> +
Shouldn't the return status from nla_put_u32() be checked?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH net-next V2 1/6] net/sched: cls_matchall: Dump skip flags
2017-02-14 19:28 ` Jakub Kicinski
@ 2017-02-15 8:20 ` Or Gerlitz
0 siblings, 0 replies; 11+ messages in thread
From: Or Gerlitz @ 2017-02-15 8:20 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Or Gerlitz, David S. Miller, John Fastabend, Jamal Hadi Salim,
Roi Dayan, Paul Blakey, Linux Netdev List
On Tue, Feb 14, 2017 at 9:28 PM, Jakub Kicinski <kubakici@wp.pl> wrote:
> On Tue, 14 Feb 2017 16:30:35 +0200, Or Gerlitz wrote:
>> The skip flags are not dumped to user-space, do that.
>>
>> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
>> Acked-by: Jiri Pirko <jiri@mellanox.com>
>> Acked-by: Yotam Gigi <yotamg@mellanox.com>
>> ---
>> net/sched/cls_matchall.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
>> index f2141cb..ce2f7d4 100644
>> --- a/net/sched/cls_matchall.c
>> +++ b/net/sched/cls_matchall.c
>> @@ -244,6 +244,8 @@ static int mall_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
>> nla_put_u32(skb, TCA_MATCHALL_CLASSID, head->res.classid))
>> goto nla_put_failure;
>>
>> + nla_put_u32(skb, TCA_MATCHALL_FLAGS, head->flags);
>> +
>
> Shouldn't the return status from nla_put_u32() be checked?
Yeah, amazing how the developer (me) and three internal reviewers
missed that :(, thanks!
Or.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH net-next V2 2/6] net/sched: Reflect HW offload status
2017-02-14 14:30 [PATCH net-next V2 0/6] net/sched: Reflect HW offload status Or Gerlitz
2017-02-14 14:30 ` [PATCH net-next V2 1/6] net/sched: cls_matchall: Dump skip flags Or Gerlitz
@ 2017-02-14 14:30 ` Or Gerlitz
2017-02-14 14:30 ` [PATCH net-next V2 3/6] net/sched: cls_flower: " Or Gerlitz
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Or Gerlitz @ 2017-02-14 14:30 UTC (permalink / raw)
To: David S. Miller
Cc: Jakub Kicinski, John Fastabend, Jamal Hadi Salim, Roi Dayan,
Paul Blakey, netdev, Or Gerlitz
Currently there is no way of querying whether a filter is
offloaded to HW or not when using "both" policy (where none
of skip_sw or skip_hw flags are set by user-space).
Add two new flags, "in hw" and "not in hw" such that user
space can determine if a filter is actually offloaded to
hw or not. The "in hw" UAPI semantics was chosen so it's
similar to the "skip hw" flag logic.
If none of these two flags are set, this signals running
over older kernel.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Amir Vadai <amir@vadai.me>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
include/net/pkt_cls.h | 5 +++++
include/uapi/linux/pkt_cls.h | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 71b266c..15cfe15 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -475,6 +475,11 @@ static inline bool tc_flags_valid(u32 flags)
return true;
}
+static inline bool tc_in_hw(u32 flags)
+{
+ return (flags & TCA_CLS_FLAGS_IN_HW) ? true : false;
+}
+
enum tc_fl_command {
TC_CLSFLOWER_REPLACE,
TC_CLSFLOWER_DESTROY,
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 345551e..7a69f2a 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -103,8 +103,10 @@ enum {
#define TCA_POLICE_MAX (__TCA_POLICE_MAX - 1)
/* tca flags definitions */
-#define TCA_CLS_FLAGS_SKIP_HW (1 << 0)
-#define TCA_CLS_FLAGS_SKIP_SW (1 << 1)
+#define TCA_CLS_FLAGS_SKIP_HW (1 << 0) /* don't offload filter to HW */
+#define TCA_CLS_FLAGS_SKIP_SW (1 << 1) /* don't use filter in SW */
+#define TCA_CLS_FLAGS_IN_HW (1 << 2) /* filter is offloaded to HW */
+#define TCA_CLS_FLAGS_NOT_IN_HW (1 << 3) /* filter isn't offloaded to HW */
/* U32 filters */
--
2.3.7
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH net-next V2 3/6] net/sched: cls_flower: Reflect HW offload status
2017-02-14 14:30 [PATCH net-next V2 0/6] net/sched: Reflect HW offload status Or Gerlitz
2017-02-14 14:30 ` [PATCH net-next V2 1/6] net/sched: cls_matchall: Dump skip flags Or Gerlitz
2017-02-14 14:30 ` [PATCH net-next V2 2/6] net/sched: Reflect HW offload status Or Gerlitz
@ 2017-02-14 14:30 ` Or Gerlitz
2017-02-14 14:30 ` [PATCH net-next V2 4/6] net/sched: cls_matchall: Reflect HW offloading status Or Gerlitz
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Or Gerlitz @ 2017-02-14 14:30 UTC (permalink / raw)
To: David S. Miller
Cc: Jakub Kicinski, John Fastabend, Jamal Hadi Salim, Roi Dayan,
Paul Blakey, netdev, Or Gerlitz
Flower support for the "in hw" offloading flags.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Amir Vadai <amir@vadai.me>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
net/sched/cls_flower.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 0826c8e..a08d36f 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -273,6 +273,8 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol,
tc);
+ if (!err)
+ f->flags |= TCA_CLS_FLAGS_IN_HW;
if (tc_skip_sw(f->flags))
return err;
@@ -912,6 +914,9 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
goto errout;
}
+ if (!(tc_in_hw(fnew->flags)))
+ fnew->flags |= TCA_CLS_FLAGS_NOT_IN_HW;
+
if (fold) {
if (!tc_skip_sw(fold->flags))
rhashtable_remove_fast(&head->ht, &fold->ht_node,
--
2.3.7
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH net-next V2 4/6] net/sched: cls_matchall: Reflect HW offloading status
2017-02-14 14:30 [PATCH net-next V2 0/6] net/sched: Reflect HW offload status Or Gerlitz
` (2 preceding siblings ...)
2017-02-14 14:30 ` [PATCH net-next V2 3/6] net/sched: cls_flower: " Or Gerlitz
@ 2017-02-14 14:30 ` Or Gerlitz
2017-02-14 14:37 ` Jiri Pirko
2017-02-14 14:30 ` [PATCH net-next V2 5/6] net/sched: cls_u32: Reflect HW offload status Or Gerlitz
2017-02-14 14:30 ` [PATCH net-next V2 6/6] net/sched: cls_bpf: " Or Gerlitz
5 siblings, 1 reply; 11+ messages in thread
From: Or Gerlitz @ 2017-02-14 14:30 UTC (permalink / raw)
To: David S. Miller
Cc: Jakub Kicinski, John Fastabend, Jamal Hadi Salim, Roi Dayan,
Paul Blakey, netdev, Or Gerlitz
Matchall support for the "in hw" offloading flags.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Amir Vadai <amir@vadai.me>
---
net/sched/cls_matchall.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index ce2f7d4..20fda37 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -56,6 +56,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
struct net_device *dev = tp->q->dev_queue->dev;
struct tc_to_netdev offload;
struct tc_cls_matchall_offload mall_offload = {0};
+ int err;
offload.type = TC_SETUP_MATCHALL;
offload.cls_mall = &mall_offload;
@@ -63,8 +64,12 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
offload.cls_mall->exts = &head->exts;
offload.cls_mall->cookie = cookie;
- return dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol,
- &offload);
+ err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol,
+ &offload);
+ if (!err)
+ head->flags |= TCA_CLS_FLAGS_IN_HW;
+
+ return err;
}
static void mall_destroy_hw_filter(struct tcf_proto *tp,
@@ -194,6 +199,9 @@ static int mall_change(struct net *net, struct sk_buff *in_skb,
}
}
+ if (!(tc_in_hw(new->flags)))
+ new->flags |= TCA_CLS_FLAGS_NOT_IN_HW;
+
*arg = (unsigned long) head;
rcu_assign_pointer(tp->root, new);
if (head)
--
2.3.7
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH net-next V2 4/6] net/sched: cls_matchall: Reflect HW offloading status
2017-02-14 14:30 ` [PATCH net-next V2 4/6] net/sched: cls_matchall: Reflect HW offloading status Or Gerlitz
@ 2017-02-14 14:37 ` Jiri Pirko
0 siblings, 0 replies; 11+ messages in thread
From: Jiri Pirko @ 2017-02-14 14:37 UTC (permalink / raw)
To: Or Gerlitz
Cc: David S. Miller, Jakub Kicinski, John Fastabend, Jamal Hadi Salim,
Roi Dayan, Paul Blakey, netdev
Tue, Feb 14, 2017 at 03:30:38PM CET, ogerlitz@mellanox.com wrote:
>Matchall support for the "in hw" offloading flags.
>
>Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
>Reviewed-by: Amir Vadai <amir@vadai.me>
Acked-by: Jiri Pirko <jiri@mellanox.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH net-next V2 5/6] net/sched: cls_u32: Reflect HW offload status
2017-02-14 14:30 [PATCH net-next V2 0/6] net/sched: Reflect HW offload status Or Gerlitz
` (3 preceding siblings ...)
2017-02-14 14:30 ` [PATCH net-next V2 4/6] net/sched: cls_matchall: Reflect HW offloading status Or Gerlitz
@ 2017-02-14 14:30 ` Or Gerlitz
2017-02-14 14:30 ` [PATCH net-next V2 6/6] net/sched: cls_bpf: " Or Gerlitz
5 siblings, 0 replies; 11+ messages in thread
From: Or Gerlitz @ 2017-02-14 14:30 UTC (permalink / raw)
To: David S. Miller
Cc: Jakub Kicinski, John Fastabend, Jamal Hadi Salim, Roi Dayan,
Paul Blakey, netdev, Or Gerlitz
U32 support for the "in hw" offloading flags.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Amir Vadai <amir@vadai.me>
---
net/sched/cls_u32.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index a6ec3e4b..8c6cc39 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -523,6 +523,10 @@ static int u32_replace_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n,
err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
tp->protocol, &offload);
+
+ if (!err)
+ n->flags |= TCA_CLS_FLAGS_IN_HW;
+
if (tc_skip_sw(flags))
return err;
@@ -895,6 +899,9 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
return err;
}
+ if (!(tc_in_hw(new->flags)))
+ new->flags |= TCA_CLS_FLAGS_NOT_IN_HW;
+
u32_replace_knode(tp, tp_c, new);
tcf_unbind_filter(tp, &n->res);
call_rcu(&n->rcu, u32_delete_key_rcu);
@@ -1014,6 +1021,9 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
if (err)
goto errhw;
+ if (!(tc_in_hw(n->flags)))
+ n->flags |= TCA_CLS_FLAGS_NOT_IN_HW;
+
ins = &ht->ht[TC_U32_HASH(handle)];
for (pins = rtnl_dereference(*ins); pins;
ins = &pins->next, pins = rtnl_dereference(*ins))
--
2.3.7
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH net-next V2 6/6] net/sched: cls_bpf: Reflect HW offload status
2017-02-14 14:30 [PATCH net-next V2 0/6] net/sched: Reflect HW offload status Or Gerlitz
` (4 preceding siblings ...)
2017-02-14 14:30 ` [PATCH net-next V2 5/6] net/sched: cls_u32: Reflect HW offload status Or Gerlitz
@ 2017-02-14 14:30 ` Or Gerlitz
2017-02-14 19:27 ` Jakub Kicinski
5 siblings, 1 reply; 11+ messages in thread
From: Or Gerlitz @ 2017-02-14 14:30 UTC (permalink / raw)
To: David S. Miller
Cc: Jakub Kicinski, John Fastabend, Jamal Hadi Salim, Roi Dayan,
Paul Blakey, netdev, Or Gerlitz
BPF classifier support for the "in hw" offloading flags.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Amir Vadai <amir@vadai.me>
---
net/sched/cls_bpf.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index d9c9701..61a5b33 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -148,6 +148,7 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog,
struct net_device *dev = tp->q->dev_queue->dev;
struct tc_cls_bpf_offload bpf_offload = {};
struct tc_to_netdev offload;
+ int err;
offload.type = TC_SETUP_CLSBPF;
offload.cls_bpf = &bpf_offload;
@@ -159,8 +160,13 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog,
bpf_offload.exts_integrated = prog->exts_integrated;
bpf_offload.gen_flags = prog->gen_flags;
- return dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
- tp->protocol, &offload);
+ err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle,
+ tp->protocol, &offload);
+
+ if (!err && (cmd == TC_CLSBPF_ADD || cmd == TC_CLSBPF_REPLACE))
+ prog->gen_flags |= TCA_CLS_FLAGS_IN_HW;
+
+ return err;
}
static int cls_bpf_offload(struct tcf_proto *tp, struct cls_bpf_prog *prog,
@@ -511,6 +517,9 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
return ret;
}
+ if (!(tc_in_hw(prog->gen_flags)))
+ prog->gen_flags |= TCA_CLS_FLAGS_NOT_IN_HW;
+
if (oldprog) {
list_replace_rcu(&oldprog->link, &prog->link);
tcf_unbind_filter(tp, &oldprog->res);
--
2.3.7
^ permalink raw reply related [flat|nested] 11+ messages in thread