Commit 958a3f2d authored by Jiri Olsa's avatar Jiri Olsa Committed by Alexei Starovoitov
Browse files

bpf: Use tracing helpers for lsm programs 

Currenty lsm uses bpf_tracing_func_proto helpers which do
not include stack trace or perf event output. It's useful
to have those for bpftrace lsm support [1].

Using tracing_prog_func_proto helpers for lsm programs.

[1] https://github.com/iovisor/bpftrace/pull/1347



Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Cc: KP Singh <kpsingh@google.com>
Link: https://lore.kernel.org/bpf/20200531154255.896551-1-jolsa@kernel.org
parent 1b698fa5

include/linux/bpf.h

+3 −0
Original line number Diff line number Diff line
@@ -1633,6 +1633,9 @@ extern const struct bpf_func_proto bpf_ringbuf_query_proto; 
const struct bpf_func_proto *bpf_tracing_func_proto(

	enum bpf_func_id func_id, const struct bpf_prog *prog);



const struct bpf_func_proto *tracing_prog_func_proto(

  enum bpf_func_id func_id, const struct bpf_prog *prog);



/* Shared helpers among cBPF and eBPF. */

void bpf_user_rnd_init_once(void);

u64 bpf_user_rnd_u32(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5);

kernel/bpf/bpf_lsm.c

+1 −1
Original line number Diff line number Diff line
@@ -49,6 +49,6 @@ const struct bpf_prog_ops lsm_prog_ops = { 
};



const struct bpf_verifier_ops lsm_verifier_ops = {

	.get_func_proto = bpf_tracing_func_proto,

	.get_func_proto = tracing_prog_func_proto,

	.is_valid_access = btf_ctx_access,

};

kernel/trace/bpf_trace.c

+1 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ raw_tp_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
	}

}



static const struct bpf_func_proto *

const struct bpf_func_proto *

tracing_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)

{

	switch (func_id) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE