Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf007d1c authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

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: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1ffc0cd

net/sched/cls_bpf.c

+8 −3
Original line number Diff line number Diff line
@@ -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)