bpf: remove unused parameter in bpf_jit_binary_pack_finalize

Fixes a compiler warning. the bpf_jit_binary_pack_finalize function
was taking an extra bpf_prog parameter that went unused.
This removves it and updates the callers accordingly.

Signed-off-by: Rafael Passos <rafael@rcpassos.me>
Link: https://lore.kernel.org/r/20240615022641.210320-2-rafael@rcpassos.me
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index 720336d288568fa6463480c6322cc8cad16f9409..6edaeafd149912f11d1eb29dfd657e3d610cd14b 100644 (file)
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -1829,8 +1829,7 @@ skip_init_ctx:
                        prog->jited_len = 0;
                        goto out_free_hdr;
                }
-               if (WARN_ON(bpf_jit_binary_pack_finalize(prog, ro_header,
-                                                        header))) {
+               if (WARN_ON(bpf_jit_binary_pack_finalize(ro_header, header))) {
                        /* ro_header has been freed */
                        ro_header = NULL;
                        prog = orig_prog;

diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index 984655419da52fd0fb9b1faebc16e101d0554059..2a36cc2e7e9e217790be2ae14b6b7fa6821139f8 100644 (file)
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -225,7 +225,7 @@ skip_init_ctx:
        fp->jited_len = proglen + FUNCTION_DESCR_SIZE;
 
        if (!fp->is_func || extra_pass) {
-               if (bpf_jit_binary_pack_finalize(fp, fhdr, hdr)) {
+               if (bpf_jit_binary_pack_finalize(fhdr, hdr)) {
                        fp = org_fp;
                        goto out_addrs;
                }
@@ -348,7 +348,7 @@ void bpf_jit_free(struct bpf_prog *fp)
                 * before freeing it.
                 */
                if (jit_data) {
-                       bpf_jit_binary_pack_finalize(fp, jit_data->fhdr, jit_data->hdr);
+                       bpf_jit_binary_pack_finalize(jit_data->fhdr, jit_data->hdr);
                        kvfree(jit_data->addrs);
                        kfree(jit_data);
                }

diff --git a/arch/riscv/net/bpf_jit_core.c b/arch/riscv/net/bpf_jit_core.c
index 0a96abdaca65f917a8f2b7db81691351328f8739..6de753c667f42af8dd20a57ae7eba3b1e413fc37 100644 (file)
--- a/arch/riscv/net/bpf_jit_core.c
+++ b/arch/riscv/net/bpf_jit_core.c
@@ -178,8 +178,7 @@ skip_init_ctx:
        prog->jited_len = prog_size - cfi_get_offset();
 
        if (!prog->is_func || extra_pass) {
-               if (WARN_ON(bpf_jit_binary_pack_finalize(prog, jit_data->ro_header,
-                                                        jit_data->header))) {
+               if (WARN_ON(bpf_jit_binary_pack_finalize(jit_data->ro_header, jit_data->header))) {
                        /* ro_header has been freed */
                        jit_data->ro_header = NULL;
                        prog = orig_prog;
@@ -258,7 +257,7 @@ void bpf_jit_free(struct bpf_prog *prog)
                 * before freeing it.
                 */
                if (jit_data) {
-                       bpf_jit_binary_pack_finalize(prog, jit_data->ro_header, jit_data->header);
+                       bpf_jit_binary_pack_finalize(jit_data->ro_header, jit_data->header);
                        kfree(jit_data);
                }
                hdr = bpf_jit_binary_pack_hdr(prog);

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 7c130001fbfe79eb15af8ff201b4aa5f91fcb009..d25d81c8ecc0097a614ace655f15bf3ff10ab9bd 100644 (file)
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -3356,7 +3356,7 @@ out_image:
                         *
                         * Both cases are serious bugs and justify WARN_ON.
                         */
-                       if (WARN_ON(bpf_jit_binary_pack_finalize(prog, header, rw_header))) {
+                       if (WARN_ON(bpf_jit_binary_pack_finalize(header, rw_header))) {
                                /* header has been freed */
                                header = NULL;
                                goto out_image;
@@ -3435,7 +3435,7 @@ void bpf_jit_free(struct bpf_prog *prog)
                 * before freeing it.
                 */
                if (jit_data) {
-                       bpf_jit_binary_pack_finalize(prog, jit_data->header,
+                       bpf_jit_binary_pack_finalize(jit_data->header,
                                                     jit_data->rw_header);
                        kvfree(jit_data->addrs);
                        kfree(jit_data);

diff --git a/include/linux/filter.h b/include/linux/filter.h
index b02aea291b7e8ea22468d6a6ecb3e0c188dff026..dd41a93f06b2eb3f1e5f041dfa95553f171a0c64 100644 (file)
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -1129,8 +1129,7 @@ bpf_jit_binary_pack_alloc(unsigned int proglen, u8 **ro_image,
                          struct bpf_binary_header **rw_hdr,
                          u8 **rw_image,
                          bpf_jit_fill_hole_t bpf_fill_ill_insns);
-int bpf_jit_binary_pack_finalize(struct bpf_prog *prog,
-                                struct bpf_binary_header *ro_header,
+int bpf_jit_binary_pack_finalize(struct bpf_binary_header *ro_header,
                                 struct bpf_binary_header *rw_header);
 void bpf_jit_binary_pack_free(struct bpf_binary_header *ro_header,
                              struct bpf_binary_header *rw_header);

diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 1a6c3faa6e4a19dfea0da74aa31e4b57c8ea0e06..f6951c33790dabbc1ac037111f090fdf8877c4ca 100644 (file)
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -1174,8 +1174,7 @@ bpf_jit_binary_pack_alloc(unsigned int proglen, u8 **image_ptr,
 }
 
 /* Copy JITed text from rw_header to its final location, the ro_header. */
-int bpf_jit_binary_pack_finalize(struct bpf_prog *prog,
-                                struct bpf_binary_header *ro_header,
+int bpf_jit_binary_pack_finalize(struct bpf_binary_header *ro_header,
                                 struct bpf_binary_header *rw_header)
 {
        void *ptr;