Commit 5f20e6ab authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next 

Alexei Starovoitov says:

====================
pull-request: bpf-next 2024-03-11

We've added 59 non-merge commits during the last 9 day(s) which contain
a total of 88 files changed, 4181 insertions(+), 590 deletions(-).

The main changes are:

1) Enforce VM_IOREMAP flag and range in ioremap_page_range and introduce
   VM_SPARSE kind and vm_area_[un]map_pages to be used in bpf_arena,
   from Alexei.

2) Introduce bpf_arena which is sparse shared memory region between bpf
   program and user space where structures inside the arena can have
   pointers to other areas of the arena, and pointers work seamlessly for
   both user-space programs and bpf programs, from Alexei and Andrii.

3) Introduce may_goto instruction that is a contract between the verifier
   and the program. The verifier allows the program to loop assuming it's
   behaving well, but reserves the right to terminate it, from Alexei.

4) Use IETF format for field definitions in the BPF standard
   document, from Dave.

5) Extend struct_ops libbpf APIs to allow specify version suffixes for
   stuct_ops map types, share the same BPF program between several map
   definitions, and other improvements, from Eduard.

6) Enable struct_ops support for more than one page in trampolines,
   from Kui-Feng.

7) Support kCFI + BPF on riscv64, from Puranjay.

8) Use bpf_prog_pack for arm64 bpf trampoline, from Puranjay.

9) Fix roundup_pow_of_two undefined behavior on 32-bit archs, from Toke.
====================

Link: https://lore.kernel.org/r/20240312003646.8692-1-alexei.starovoitov@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f095fefa 66c84731

Documentation/bpf/standardization/instruction-set.rst

+292 −243

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mm/ioremap.c

+4 −4
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ void __init add_static_vm_early(struct static_vm *svm) 
int ioremap_page(unsigned long virt, unsigned long phys,

		 const struct mem_type *mtype)

{

	return ioremap_page_range(virt, virt + PAGE_SIZE, phys,

	return vmap_page_range(virt, virt + PAGE_SIZE, phys,

			       __pgprot(mtype->prot_pte));

}

EXPORT_SYMBOL(ioremap_page);
@@ -466,7 +466,7 @@ int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr) 
	if (res->end > IO_SPACE_LIMIT)

		return -EINVAL;



	return ioremap_page_range(vaddr, vaddr + resource_size(res), phys_addr,

	return vmap_page_range(vaddr, vaddr + resource_size(res), phys_addr,

			       __pgprot(get_mem_type(pci_ioremap_mem_type)->prot_pte));

}

EXPORT_SYMBOL(pci_remap_iospace);

arch/arm64/net/bpf_jit_comp.c

+46 −9
Original line number Diff line number Diff line
@@ -2076,7 +2076,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im, 
		/* store return value */

		emit(A64_STR64I(A64_R(0), A64_SP, retval_off), ctx);

		/* reserve a nop for bpf_tramp_image_put */

		im->ip_after_call = ctx->image + ctx->idx;

		im->ip_after_call = ctx->ro_image + ctx->idx;

		emit(A64_NOP, ctx);

	}
@@ -2091,7 +2091,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im, 
				run_ctx_off, false);



	if (flags & BPF_TRAMP_F_CALL_ORIG) {

		im->ip_epilogue = ctx->image + ctx->idx;

		im->ip_epilogue = ctx->ro_image + ctx->idx;

		emit_addr_mov_i64(A64_R(0), (const u64)im, ctx);

		emit_call((const u64)__bpf_tramp_exit, ctx);

	}
@@ -2124,9 +2124,6 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im, 
		emit(A64_RET(A64_R(10)), ctx);

	}



	if (ctx->image)

		bpf_flush_icache(ctx->image, ctx->image + ctx->idx);



	kfree(branches);



	return ctx->idx;
@@ -2169,14 +2166,43 @@ int arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags, 
	return ret < 0 ? ret : ret * AARCH64_INSN_SIZE;

}



int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image,

				void *image_end, const struct btf_func_model *m,

void *arch_alloc_bpf_trampoline(unsigned int size)

{

	return bpf_prog_pack_alloc(size, jit_fill_hole);

}



void arch_free_bpf_trampoline(void *image, unsigned int size)

{

	bpf_prog_pack_free(image, size);

}



void arch_protect_bpf_trampoline(void *image, unsigned int size)

{

}



void arch_unprotect_bpf_trampoline(void *image, unsigned int size)

{

}



int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *ro_image,

				void *ro_image_end, const struct btf_func_model *m,

				u32 flags, struct bpf_tramp_links *tlinks,

				void *func_addr)

{

	int ret, nregs;

	void *image, *tmp;

	u32 size = ro_image_end - ro_image;



	/* image doesn't need to be in module memory range, so we can

	 * use kvmalloc.

	 */

	image = kvmalloc(size, GFP_KERNEL);

	if (!image)

		return -ENOMEM;



	struct jit_ctx ctx = {

		.image = image,

		.ro_image = ro_image,

		.idx = 0,

	};
@@ -2185,15 +2211,26 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, 
	if (nregs > 8)

		return -ENOTSUPP;



	jit_fill_hole(image, (unsigned int)(image_end - image));

	jit_fill_hole(image, (unsigned int)(ro_image_end - ro_image));

	ret = prepare_trampoline(&ctx, im, tlinks, func_addr, nregs, flags);



	if (ret > 0 && validate_code(&ctx) < 0)

	if (ret > 0 && validate_code(&ctx) < 0) {

		ret = -EINVAL;

		goto out;

	}



	if (ret > 0)

		ret *= AARCH64_INSN_SIZE;



	tmp = bpf_arch_text_copy(ro_image, image, size);

	if (IS_ERR(tmp)) {

		ret = PTR_ERR(tmp);

		goto out;

	}



	bpf_flush_icache(ro_image, ro_image + size);

out:

	kvfree(image);

	return ret;

}

arch/loongarch/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static int __init add_legacy_isa_io(struct fwnode_handle *fwnode, 
	}



	vaddr = (unsigned long)(PCI_IOBASE + range->io_start);

	ioremap_page_range(vaddr, vaddr + size, hw_start, pgprot_device(PAGE_KERNEL));

	vmap_page_range(vaddr, vaddr + size, hw_start, pgprot_device(PAGE_KERNEL));



	return 0;

}

arch/mips/loongson64/init.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int __init add_legacy_isa_io(struct fwnode_handle *fwnode, resource_size_ 


	vaddr = PCI_IOBASE + range->io_start;



	ioremap_page_range(vaddr, vaddr + size, hw_start, pgprot_device(PAGE_KERNEL));

	vmap_page_range(vaddr, vaddr + size, hw_start, pgprot_device(PAGE_KERNEL));



	return 0;

}