Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230605074024.1055863-1-puranjay12@gmail.com> <20230605074024.1055863-2-puranjay12@gmail.com>
In-Reply-To: <20230605074024.1055863-2-puranjay12@gmail.com>
From:   Song Liu <song@kernel.org>
Date:   Mon, 5 Jun 2023 09:30:10 -0700
Message-ID: <CAPhsuW5+ija4umxAhOMk5mVGGCGV=iPBNm-QbhkVz99WHzrmsQ@mail.gmail.com>
Subject: Re: [PATCH bpf-next 1/3] bpf: make bpf_prog_pack allocator portable
To:     Puranjay Mohan <puranjay12@gmail.com>
Cc:     ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
        martin.lau@linux.dev, catalin.marinas@arm.com,
        mark.rutland@arm.com, bpf@vger.kernel.org, kpsingh@kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Jun 5, 2023 at 12:40=E2=80=AFAM Puranjay Mohan <puranjay12@gmail.co=
m> wrote:
>
> The bpf_prog_pack allocator currently uses module_alloc() and
> module_memfree() to allocate and free memory. This is not portable
> because different architectures use different methods for allocating
> memory for BPF programs. Like ARM64 uses vmalloc()/vfree().
>
> Use bpf_jit_alloc_exec() and bpf_jit_free_exec() for memory management
> in bpf_prog_pack allocator. Other architectures can override these with
> their implementation and will be able to use bpf_prog_pack directly.
>
> Signed-off-by: Puranjay Mohan <puranjay12@gmail.com>

Acked-by: Song Liu <song@kernel.org>

> ---
>  kernel/bpf/core.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
> index 7421487422d4..2bc9092bf9be 100644
> --- a/kernel/bpf/core.c
> +++ b/kernel/bpf/core.c
> @@ -860,7 +860,7 @@ static struct bpf_prog_pack *alloc_new_pack(bpf_jit_f=
ill_hole_t bpf_fill_ill_ins
>                        GFP_KERNEL);
>         if (!pack)
>                 return NULL;
> -       pack->ptr =3D module_alloc(BPF_PROG_PACK_SIZE);
> +       pack->ptr =3D bpf_jit_alloc_exec(BPF_PROG_PACK_SIZE);
>         if (!pack->ptr) {
>                 kfree(pack);
>                 return NULL;
> @@ -884,7 +884,7 @@ void *bpf_prog_pack_alloc(u32 size, bpf_jit_fill_hole=
_t bpf_fill_ill_insns)
>         mutex_lock(&pack_mutex);
>         if (size > BPF_PROG_PACK_SIZE) {
>                 size =3D round_up(size, PAGE_SIZE);
> -               ptr =3D module_alloc(size);
> +               ptr =3D bpf_jit_alloc_exec(size);
>                 if (ptr) {
>                         bpf_fill_ill_insns(ptr, size);
>                         set_vm_flush_reset_perms(ptr);
> @@ -922,7 +922,7 @@ void bpf_prog_pack_free(struct bpf_binary_header *hdr=
)
>
>         mutex_lock(&pack_mutex);
>         if (hdr->size > BPF_PROG_PACK_SIZE) {
> -               module_memfree(hdr);
> +               bpf_jit_free_exec(hdr);
>                 goto out;
>         }
>
> @@ -946,7 +946,7 @@ void bpf_prog_pack_free(struct bpf_binary_header *hdr=
)
>         if (bitmap_find_next_zero_area(pack->bitmap, BPF_PROG_CHUNK_COUNT=
, 0,
>                                        BPF_PROG_CHUNK_COUNT, 0) =3D=3D 0)=
 {
>                 list_del(&pack->list);
> -               module_memfree(pack->ptr);
> +               bpf_jit_free_exec(pack->ptr);
>                 kfree(pack);
>         }
>  out:
> --
> 2.39.2
>