Commit cca62426 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'fix bpf_prog_pack build errors' 



Song Liu says:

====================

Fix build errors reported by kernel test robot.
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 4172843e c1b13a94

arch/powerpc/net/bpf_jit_comp.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) 
	fp->jited = 1;

	fp->jited_len = proglen + FUNCTION_DESCR_SIZE;



	bpf_flush_icache(bpf_hdr, (u8 *)bpf_hdr + (bpf_hdr->pages * PAGE_SIZE));

	bpf_flush_icache(bpf_hdr, (u8 *)bpf_hdr + bpf_hdr->size);

	if (!fp->is_func || extra_pass) {

		bpf_jit_binary_lock_ro(bpf_hdr);

		bpf_prog_fill_jited_linfo(fp, addrs);

arch/sparc/net/bpf_jit_comp_64.c

+1 −1
Original line number Diff line number Diff line
@@ -1599,7 +1599,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
	if (bpf_jit_enable > 1)

		bpf_jit_dump(prog->len, image_size, pass, ctx.image);



	bpf_flush_icache(header, (u8 *)header + (header->pages * PAGE_SIZE));

	bpf_flush_icache(header, (u8 *)header + header->size);



	if (!prog->is_func || extra_pass) {

		bpf_jit_binary_lock_ro(header);

kernel/bpf/core.c

+5 −1
Original line number Diff line number Diff line
@@ -814,7 +814,11 @@ int bpf_jit_add_poke_descriptor(struct bpf_prog *prog, 
 * allocator. The prog_pack allocator uses HPAGE_PMD_SIZE page (2MB on x86)

 * to host BPF programs.

 */

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#define BPF_PROG_PACK_SIZE	HPAGE_PMD_SIZE

#else

#define BPF_PROG_PACK_SIZE	PAGE_SIZE

#endif

#define BPF_PROG_CHUNK_SHIFT	6

#define BPF_PROG_CHUNK_SIZE	(1 << BPF_PROG_CHUNK_SHIFT)

#define BPF_PROG_CHUNK_MASK	(~(BPF_PROG_CHUNK_SIZE - 1))
@@ -826,7 +830,7 @@ struct bpf_prog_pack { 
	unsigned long bitmap[BITS_TO_LONGS(BPF_PROG_CHUNK_COUNT)];

};



#define BPF_PROG_MAX_PACK_PROG_SIZE	HPAGE_PMD_SIZE

#define BPF_PROG_MAX_PACK_PROG_SIZE	BPF_PROG_PACK_SIZE

#define BPF_PROG_SIZE_TO_NBITS(size)	(round_up(size, BPF_PROG_CHUNK_SIZE) / BPF_PROG_CHUNK_SIZE)



static DEFINE_MUTEX(pack_mutex);