netdev - Re: [PATCH bpf-next 10/15] libbpf: Rename RELO_EXTERN to RELO_EXTERN

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAEf4BzaB4sKTPZ42wbtAWaTrcuRN7UpM9tSm5m7d+d7OONgnqg@mail.gmail.com>
Date:   Thu, 18 Mar 2021 20:15:02 -0700
From:   Andrii Nakryiko <andrii.nakryiko@...il.com>
To:     Martin KaFai Lau <kafai@...com>
Cc:     bpf <bpf@...r.kernel.org>, Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Kernel Team <kernel-team@...com>,
        Networking <netdev@...r.kernel.org>
Subject: Re: [PATCH bpf-next 10/15] libbpf: Rename RELO_EXTERN to RELO_EXTERN_VAR

On Tue, Mar 16, 2021 at 12:02 AM Martin KaFai Lau <kafai@...com> wrote:
>
> 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@...com>
> ---

Acked-by: Andrii Nakryiko <andrii@...nel.org>

>  tools/lib/bpf/libbpf.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index 8355b786b3db..8f924aece736 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -189,7 +189,7 @@ enum reloc_type {
>         RELO_LD64,
>         RELO_CALL,
>         RELO_DATA,
> -       RELO_EXTERN,
> +       RELO_EXTERN_VAR,
>         RELO_SUBPROG_ADDR,
>  };
>
> @@ -3463,7 +3463,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",
>                          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->sym_off = i; /* sym_off stores extern index */
>                 return 0;
> @@ -6226,7 +6226,7 @@ bpf_object__relocate_data(struct bpf_object *obj, struct bpf_program *prog)
>                         insn[0].imm = obj->maps[relo->map_idx].fd;
>                         relo->processed = true;
>                         break;
> -               case RELO_EXTERN:
> +               case RELO_EXTERN_VAR:
>                         ext = &obj->externs[relo->sym_off];
>                         if (ext->type == EXT_KCFG) {
>                                 insn[0].src_reg = BPF_PSEUDO_MAP_VALUE;
> --
> 2.30.2
>