Commit a91263d5 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

ebpf: migrate bpf_prog's flags to bitfield 



As we need to add further flags to the bpf_prog structure, lets migrate
both bools to a bitfield representation. The size of the base structure
(excluding insns) remains unchanged at 40 bytes.

Add also tags for the kmemchecker, so that it doesn't throw false
positives. Even in case gcc would generate suboptimal code, it's not
being accessed in performance critical paths.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd8762be

arch/arm/net/bpf_jit_32.c

+1 −1
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ void bpf_jit_compile(struct bpf_prog *fp) 


	set_memory_ro((unsigned long)header, header->pages);

	fp->bpf_func = (void *)ctx.target;

	fp->jited = true;

	fp->jited = 1;

out:

	kfree(ctx.offsets);

	return;

arch/arm64/net/bpf_jit_comp.c

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ void bpf_int_jit_compile(struct bpf_prog *prog) 


	set_memory_ro((unsigned long)header, header->pages);

	prog->bpf_func = (void *)ctx.image;

	prog->jited = true;

	prog->jited = 1;

out:

	kfree(ctx.offset);

}

arch/mips/net/bpf_jit.c

+1 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ void bpf_jit_compile(struct bpf_prog *fp) 
		bpf_jit_dump(fp->len, alloc_size, 2, ctx.target);



	fp->bpf_func = (void *)ctx.target;

	fp->jited = true;

	fp->jited = 1;



out:

	kfree(ctx.offsets);

arch/powerpc/net/bpf_jit_comp.c

+1 −1
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ void bpf_jit_compile(struct bpf_prog *fp) 
		((u64 *)image)[1] = local_paca->kernel_toc;

#endif

		fp->bpf_func = (void *)image;

		fp->jited = true;

		fp->jited = 1;

	}

out:

	kfree(addrs);

arch/s390/net/bpf_jit_comp.c

+1 −1
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ void bpf_int_jit_compile(struct bpf_prog *fp) 
	if (jit.prg_buf) {

		set_memory_ro((unsigned long)header, header->pages);

		fp->bpf_func = (void *) jit.prg_buf;

		fp->jited = true;

		fp->jited = 1;

	}

free_addrs:

	kfree(jit.addrs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE