Commit b8f871fa authored by Yonghong Song's avatar Yonghong Song Committed by Alexei Starovoitov
Browse files

libbpf: Move function is_ldimm64() earlier in libbpf.c 



Move function is_ldimm64() close to the beginning of libbpf.c,
so it can be reused by later code and the next patch as well.
There is no functionality change.

Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210226204929.3885295-1-yhs@fb.com
parent 06dcdcd4

tools/lib/bpf/libbpf.c

+6 −6
Original line number Diff line number Diff line
@@ -574,6 +574,11 @@ static bool insn_is_subprog_call(const struct bpf_insn *insn) 
	       insn->off == 0;

}



static bool is_ldimm64(struct bpf_insn *insn)

{

	return insn->code == (BPF_LD | BPF_IMM | BPF_DW);

}



static int

bpf_object__init_prog(struct bpf_object *obj, struct bpf_program *prog,

		      const char *name, size_t sec_idx, const char *sec_name,
@@ -3395,7 +3400,7 @@ static int bpf_program__record_reloc(struct bpf_program *prog, 
		return 0;

	}



	if (insn->code != (BPF_LD | BPF_IMM | BPF_DW)) {

	if (!is_ldimm64(insn)) {

		pr_warn("prog '%s': invalid relo against '%s' for insns[%d].code 0x%x\n",

			prog->name, sym_name, insn_idx, insn->code);

		return -LIBBPF_ERRNO__RELOC;
@@ -5566,11 +5571,6 @@ static void bpf_core_poison_insn(struct bpf_program *prog, int relo_idx, 
	insn->imm = 195896080; /* => 0xbad2310 => "bad relo" */

}



static bool is_ldimm64(struct bpf_insn *insn)

{

	return insn->code == (BPF_LD | BPF_IMM | BPF_DW);

}



static int insn_bpf_size_to_bytes(struct bpf_insn *insn)

{

	switch (BPF_SIZE(insn->code)) {