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

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

bpf: expose prog id for cls_bpf and act_bpf 



In order to be able to retrieve the attached programs from cls_bpf
and act_bpf, we need to expose the prog ids via netlink so that
an application can later on get an fd based on the id through the
BPF_PROG_GET_FD_BY_ID command, and dump related prog info via
BPF_OBJ_GET_INFO_BY_FD command for bpf(2).

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34cfb542

include/uapi/linux/pkt_cls.h

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ enum { 
	TCA_BPF_FLAGS,

	TCA_BPF_FLAGS_GEN,

	TCA_BPF_TAG,

	TCA_BPF_ID,

	__TCA_BPF_MAX,

};

include/uapi/linux/tc_act/tc_bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ enum { 
	TCA_ACT_BPF_NAME,

	TCA_ACT_BPF_PAD,

	TCA_ACT_BPF_TAG,

	TCA_ACT_BPF_ID,

	__TCA_ACT_BPF_MAX,

};

#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)

net/sched/act_bpf.c

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ static int tcf_bpf_dump_ebpf_info(const struct tcf_bpf *prog, 
	    nla_put_string(skb, TCA_ACT_BPF_NAME, prog->bpf_name))

		return -EMSGSIZE;



	if (nla_put_u32(skb, TCA_ACT_BPF_ID, prog->filter->aux->id))

		return -EMSGSIZE;



	nla = nla_reserve(skb, TCA_ACT_BPF_TAG, sizeof(prog->filter->tag));

	if (nla == NULL)

		return -EMSGSIZE;

net/sched/cls_bpf.c

+3 −0
Original line number Diff line number Diff line
@@ -566,6 +566,9 @@ static int cls_bpf_dump_ebpf_info(const struct cls_bpf_prog *prog, 
	    nla_put_string(skb, TCA_BPF_NAME, prog->bpf_name))

		return -EMSGSIZE;



	if (nla_put_u32(skb, TCA_BPF_ID, prog->filter->aux->id))

		return -EMSGSIZE;



	nla = nla_reserve(skb, TCA_BPF_TAG, sizeof(prog->filter->tag));

	if (nla == NULL)

		return -EMSGSIZE;