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

Commit ca5d1a7f authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'bpf_line_info' 



Martin Lau says:

====================
This patch series introduces the bpf_line_info.  Please see individual patch
for details.

It will be useful for introspection purpose, like:

[root@arch-fb-vm1 bpf]# ~/devshare/fb-kernel/linux/tools/bpf/bpftool/bpftool prog dump jited pinned /sys/fs/bpf/test_btf_haskv
[...]
int test_long_fname_2(struct dummy_tracepoint_args * arg):
bpf_prog_44a040bf25481309_test_long_fname_2:
; static int test_long_fname_2(struct dummy_tracepoint_args *arg)
   0:   push   %rbp
   1:   mov    %rsp,%rbp
   4:   sub    $0x30,%rsp
   b:   sub    $0x28,%rbp
   f:   mov    %rbx,0x0(%rbp)
  13:   mov    %r13,0x8(%rbp)
  17:   mov    %r14,0x10(%rbp)
  1b:   mov    %r15,0x18(%rbp)
  1f:   xor    %eax,%eax
  21:   mov    %rax,0x20(%rbp)
  25:   xor    %esi,%esi
; int key = 0;
  27:   mov    %esi,-0x4(%rbp)
; if (!arg->sock)
  2a:   mov    0x8(%rdi),%rdi
; if (!arg->sock)
  2e:   cmp    $0x0,%rdi
  32:   je     0x0000000000000070
  34:   mov    %rbp,%rsi
; counts = bpf_map_lookup_elem(&btf_map, &key);
  37:   add    $0xfffffffffffffffc,%rsi
  3b:   movabs $0xffff8881139d7480,%rdi
  45:   add    $0x110,%rdi
  4c:   mov    0x0(%rsi),%eax
  4f:   cmp    $0x4,%rax
  53:   jae    0x000000000000005e
  55:   shl    $0x3,%rax
  59:   add    %rdi,%rax
  5c:   jmp    0x0000000000000060
  5e:   xor    %eax,%eax
; if (!counts)
  60:   cmp    $0x0,%rax
  64:   je     0x0000000000000070
; counts->v6++;
  66:   mov    0x4(%rax),%edi
  69:   add    $0x1,%rdi
  6d:   mov    %edi,0x4(%rax)
  70:   mov    0x0(%rbp),%rbx
  74:   mov    0x8(%rbp),%r13
  78:   mov    0x10(%rbp),%r14
  7c:   mov    0x18(%rbp),%r15
  80:   add    $0x28,%rbp
  84:   leaveq
  85:   retq
[...]
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 6baefa1a b053b439

arch/x86/net/bpf_jit_comp.c

+2 −0
Original line number Diff line number Diff line
@@ -1181,6 +1181,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
	}



	if (!image || !prog->is_func || extra_pass) {

		if (image)

			bpf_prog_fill_jited_linfo(prog, addrs);

out_addrs:

		kfree(addrs);

		kfree(jit_data);

include/linux/bpf.h

+21 −0
Original line number Diff line number Diff line
@@ -319,7 +319,28 @@ struct bpf_prog_aux { 
	struct bpf_prog_offload *offload;

	struct btf *btf;

	struct bpf_func_info *func_info;

	/* bpf_line_info loaded from userspace.  linfo->insn_off

	 * has the xlated insn offset.

	 * Both the main and sub prog share the same linfo.

	 * The subprog can access its first linfo by

	 * using the linfo_idx.

	 */

	struct bpf_line_info *linfo;

	/* jited_linfo is the jited addr of the linfo.  It has a

	 * one to one mapping to linfo:

	 * jited_linfo[i] is the jited addr for the linfo[i]->insn_off.

	 * Both the main and sub prog share the same jited_linfo.

	 * The subprog can access its first jited_linfo by

	 * using the linfo_idx.

	 */

	void **jited_linfo;

	u32 func_info_cnt;

	u32 nr_linfo;

	/* subprog can use linfo_idx to access its first linfo and

	 * jited_linfo.

	 * main prog always has linfo_idx == 0

	 */

	u32 linfo_idx;

	union {

		struct work_struct work;

		struct rcu_head	rcu;

include/linux/bpf_verifier.h

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ static inline bool bpf_verifier_log_needed(const struct bpf_verifier_log *log) 


struct bpf_subprog_info {

	u32 start; /* insn idx of function entry point */

	u32 linfo_idx; /* The idx to the main_prog->aux->linfo */

	u16 stack_depth; /* max. stack depth used by this function */

};

include/linux/btf.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ void btf_type_seq_show(const struct btf *btf, u32 type_id, void *obj, 
		       struct seq_file *m);

int btf_get_fd_by_id(u32 id);

u32 btf_id(const struct btf *btf);

bool btf_name_offset_valid(const struct btf *btf, u32 offset);



#ifdef CONFIG_BPF_SYSCALL

const struct btf_type *btf_type_by_id(const struct btf *btf, u32 type_id);

include/linux/filter.h

+7 −0
Original line number Diff line number Diff line
@@ -718,6 +718,13 @@ void bpf_prog_free(struct bpf_prog *fp); 


bool bpf_opcode_in_insntable(u8 code);



void bpf_prog_free_linfo(struct bpf_prog *prog);

void bpf_prog_fill_jited_linfo(struct bpf_prog *prog,

			       const u32 *insn_to_jit_off);

int bpf_prog_alloc_jited_linfo(struct bpf_prog *prog);

void bpf_prog_free_jited_linfo(struct bpf_prog *prog);

void bpf_prog_free_unused_jited_linfo(struct bpf_prog *prog);



struct bpf_prog *bpf_prog_alloc(unsigned int size, gfp_t gfp_extra_flags);

struct bpf_prog *bpf_prog_realloc(struct bpf_prog *fp_old, unsigned int size,

				  gfp_t gfp_extra_flags);