Commit 499dd29d authored by Jakub Sitnicki's avatar Jakub Sitnicki Committed by Alexei Starovoitov
Browse files

libbpf: Add support for SK_LOOKUP program type 



Make libbpf aware of the newly added program type, and assign it a
section name.

Signed-off-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200717103536.397595-13-jakub@cloudflare.com
parent a352b32a

tools/lib/bpf/libbpf.c

+3 −0
Original line number Diff line number Diff line
@@ -6799,6 +6799,7 @@ BPF_PROG_TYPE_FNS(perf_event, BPF_PROG_TYPE_PERF_EVENT); 
BPF_PROG_TYPE_FNS(tracing, BPF_PROG_TYPE_TRACING);

BPF_PROG_TYPE_FNS(struct_ops, BPF_PROG_TYPE_STRUCT_OPS);

BPF_PROG_TYPE_FNS(extension, BPF_PROG_TYPE_EXT);

BPF_PROG_TYPE_FNS(sk_lookup, BPF_PROG_TYPE_SK_LOOKUP);



enum bpf_attach_type

bpf_program__get_expected_attach_type(struct bpf_program *prog)
@@ -6981,6 +6982,8 @@ static const struct bpf_sec_def section_defs[] = { 
	BPF_EAPROG_SEC("cgroup/setsockopt",	BPF_PROG_TYPE_CGROUP_SOCKOPT,

						BPF_CGROUP_SETSOCKOPT),

	BPF_PROG_SEC("struct_ops",		BPF_PROG_TYPE_STRUCT_OPS),

	BPF_EAPROG_SEC("sk_lookup/",		BPF_PROG_TYPE_SK_LOOKUP,

						BPF_SK_LOOKUP),

};



#undef BPF_PROG_SEC_IMPL

tools/lib/bpf/libbpf.h

+2 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ LIBBPF_API int bpf_program__set_perf_event(struct bpf_program *prog); 
LIBBPF_API int bpf_program__set_tracing(struct bpf_program *prog);

LIBBPF_API int bpf_program__set_struct_ops(struct bpf_program *prog);

LIBBPF_API int bpf_program__set_extension(struct bpf_program *prog);

LIBBPF_API int bpf_program__set_sk_lookup(struct bpf_program *prog);



LIBBPF_API enum bpf_prog_type bpf_program__get_type(struct bpf_program *prog);

LIBBPF_API void bpf_program__set_type(struct bpf_program *prog,
@@ -377,6 +378,7 @@ LIBBPF_API bool bpf_program__is_perf_event(const struct bpf_program *prog); 
LIBBPF_API bool bpf_program__is_tracing(const struct bpf_program *prog);

LIBBPF_API bool bpf_program__is_struct_ops(const struct bpf_program *prog);

LIBBPF_API bool bpf_program__is_extension(const struct bpf_program *prog);

LIBBPF_API bool bpf_program__is_sk_lookup(const struct bpf_program *prog);



/*

 * No need for __attribute__((packed)), all members of 'bpf_map_def'

tools/lib/bpf/libbpf.map

+2 −0
Original line number Diff line number Diff line
@@ -287,6 +287,8 @@ LIBBPF_0.1.0 { 
		bpf_map__type;

		bpf_map__value_size;

		bpf_program__autoload;

		bpf_program__is_sk_lookup;

		bpf_program__set_autoload;

		bpf_program__set_sk_lookup;

		btf__set_fd;

} LIBBPF_0.0.9;

tools/lib/bpf/libbpf_probes.c

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ probe_load(enum bpf_prog_type prog_type, const struct bpf_insn *insns, 
	case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:

		xattr.expected_attach_type = BPF_CGROUP_INET4_CONNECT;

		break;

	case BPF_PROG_TYPE_SK_LOOKUP:

		xattr.expected_attach_type = BPF_SK_LOOKUP;

		break;

	case BPF_PROG_TYPE_KPROBE:

		xattr.kern_version = get_kernel_version();

		break;