cls_bpf: also dump TCA_BPF_FLAGS

In commit 43388da42a49 ("cls_bpf: introduce integrated actions") we
have added TCA_BPF_FLAGS. We can also retrieve this information from
the prog, dump it back to user space as well. It's useful in tc when
displaying/dumping filter info.

Also, remove tp from cls_bpf_prog_from_efd(), came in as a conflict
from a rebase and it's unused here (later work may add it along with
a real user).

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index 0590816ab7b03bf0571e81933b613fb4b96288d0..7d9241545188837aa066126338d2bf4895cb52da 100644 (file)
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -265,8 +265,7 @@ static int cls_bpf_prog_from_ops(struct nlattr **tb, struct cls_bpf_prog *prog)
        return 0;
 }
 
-static int cls_bpf_prog_from_efd(struct nlattr **tb, struct cls_bpf_prog *prog,
-                                const struct tcf_proto *tp)
+static int cls_bpf_prog_from_efd(struct nlattr **tb, struct cls_bpf_prog *prog)
 {
        struct bpf_prog *fp;
        char *name = NULL;
@@ -339,7 +338,7 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp,
        prog->exts_integrated = have_exts;
 
        ret = is_bpf ? cls_bpf_prog_from_ops(tb, prog) :
-                      cls_bpf_prog_from_efd(tb, prog, tp);
+                      cls_bpf_prog_from_efd(tb, prog);
        if (ret < 0) {
                tcf_exts_destroy(&exts);
                return ret;
@@ -468,6 +467,7 @@ static int cls_bpf_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 {
        struct cls_bpf_prog *prog = (struct cls_bpf_prog *) fh;
        struct nlattr *nest;
+       u32 bpf_flags = 0;
        int ret;
 
        if (prog == NULL)
@@ -492,6 +492,11 @@ static int cls_bpf_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
        if (tcf_exts_dump(skb, &prog->exts) < 0)
                goto nla_put_failure;
 
+       if (prog->exts_integrated)
+               bpf_flags |= TCA_BPF_FLAG_ACT_DIRECT;
+       if (bpf_flags && nla_put_u32(skb, TCA_BPF_FLAGS, bpf_flags))
+               goto nla_put_failure;
+
        nla_nest_end(skb, nest);
 
        if (tcf_exts_dump_stats(skb, &prog->exts) < 0)