leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbpf: Rename RELO_EXTERN to RELO_EXTERN_VAR

Browse Source 
This patch renames RELO_EXTERN to RELO_EXTERN_VAR.
It is to avoid the confusion with a later patch adding
RELO_EXTERN_FUNC.

Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210325015221.1547722-1-kafai@fb.com
This commit is contained in:
Martin KaFai Lau 2021-03-24 18:52:21 -07:00 committed by Alexei Starovoitov
parent 774e132e83
commit 0c091e5c2d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/lib/bpf/libbpf.c
View File

@ -185,7 +185,7 @@ enum reloc_type {
RELO_LD64, RELO_LD64,
RELO_CALL, RELO_CALL,
RELO_DATA, RELO_DATA,
RELO_EXTERN, RELO_EXTERN_VAR,
RELO_SUBPROG_ADDR, RELO_SUBPROG_ADDR,
}; };
@ -3455,7 +3455,7 @@ static int bpf_program__record_reloc(struct bpf_program *prog,
} }
pr_debug("prog '%s': found extern #%d '%s' (sym %d) for insn #%u\n", pr_debug("prog '%s': found extern #%d '%s' (sym %d) for insn #%u\n",
prog->name, i, ext->name, ext->sym_idx, insn_idx); prog->name, i, ext->name, ext->sym_idx, insn_idx);
reloc_desc->type = RELO_EXTERN; reloc_desc->type = RELO_EXTERN_VAR;
reloc_desc->insn_idx = insn_idx; reloc_desc->insn_idx = insn_idx;
reloc_desc->sym_off = i; /* sym_off stores extern index */ reloc_desc->sym_off = i; /* sym_off stores extern index */
return 0; return 0;
@ -6218,7 +6218,7 @@ bpf_object__relocate_data(struct bpf_object *obj, struct bpf_program *prog)
insn[0].imm = obj->maps[relo->map_idx].fd; insn[0].imm = obj->maps[relo->map_idx].fd;
relo->processed = true; relo->processed = true;
break; break;
case RELO_EXTERN: case RELO_EXTERN_VAR:
ext = &obj->externs[relo->sym_off]; ext = &obj->externs[relo->sym_off];
if (ext->type == EXT_KCFG) { if (ext->type == EXT_KCFG) {
insn[0].src_reg = BPF_PSEUDO_MAP_VALUE; insn[0].src_reg = BPF_PSEUDO_MAP_VALUE;