Commit f1a3944c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 

Pull bpf fixes from Alexei Starovoitov:

 - Add namespace to BPF internal symbols (Alexei Starovoitov)

 - Fix possible endless loop in BPF map iteration (Brandon Kammerdiener)

 - Fix compilation failure for samples/bpf on LoongArch (Haoran Jiang)

 - Disable a part of sockmap_ktls test (Ihor Solodrai)

 - Correct typo in __clang_major__ macro (Peilin Ye)

* tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  selftests/bpf: Correct typo in __clang_major__ macro
  samples/bpf: Fix compilation failure for samples/bpf on LoongArch Fedora
  bpf: Add namespace to BPF internal symbols
  selftests/bpf: add test for softlock when modifying hashmap while iterating
  bpf: fix possible endless loop in BPF map iteration
  selftests/bpf: Mitigate sockmap_ktls disconnect_after_delete failure
parents 1eb09e62 f0007910

Documentation/bpf/bpf_devel_QA.rst

+8 −0
Original line number Diff line number Diff line
@@ -382,6 +382,14 @@ In case of new BPF instructions, once the changes have been accepted 
into the Linux kernel, please implement support into LLVM's BPF back

end. See LLVM_ section below for further information.



Q: What "BPF_INTERNAL" symbol namespace is for?

-----------------------------------------------

A: Symbols exported as BPF_INTERNAL can only be used by BPF infrastructure

like preload kernel modules with light skeleton. Most symbols outside

of BPF_INTERNAL are not expected to be used by code outside of BPF either.

Symbols may lack the designation because they predate the namespaces,

or due to an oversight.



Stable submission

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

kernel/bpf/hashtab.c

+1 −1
Original line number Diff line number Diff line
@@ -2189,7 +2189,7 @@ static long bpf_for_each_hash_elem(struct bpf_map *map, bpf_callback_t callback_ 
		b = &htab->buckets[i];

		rcu_read_lock();

		head = &b->head;

		hlist_nulls_for_each_entry_rcu(elem, n, head, hash_node) {

		hlist_nulls_for_each_entry_safe(elem, n, head, hash_node) {

			key = elem->key;

			if (is_percpu) {

				/* current cpu value for percpu map */

kernel/bpf/preload/bpf_preload_kern.c

+1 −0
Original line number Diff line number Diff line
@@ -89,5 +89,6 @@ static void __exit fini(void) 
}

late_initcall(load);

module_exit(fini);

MODULE_IMPORT_NS("BPF_INTERNAL");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Embedded BPF programs for introspection in bpffs");

kernel/bpf/syscall.c

+3 −3
Original line number Diff line number Diff line
@@ -1583,7 +1583,7 @@ struct bpf_map *bpf_map_get(u32 ufd) 


	return map;

}

EXPORT_SYMBOL(bpf_map_get);

EXPORT_SYMBOL_NS(bpf_map_get, "BPF_INTERNAL");



struct bpf_map *bpf_map_get_with_uref(u32 ufd)

{
@@ -3364,7 +3364,7 @@ struct bpf_link *bpf_link_get_from_fd(u32 ufd) 
	bpf_link_inc(link);

	return link;

}

EXPORT_SYMBOL(bpf_link_get_from_fd);

EXPORT_SYMBOL_NS(bpf_link_get_from_fd, "BPF_INTERNAL");



static void bpf_tracing_link_release(struct bpf_link *link)

{
@@ -6020,7 +6020,7 @@ int kern_sys_bpf(int cmd, union bpf_attr *attr, unsigned int size) 
		return ____bpf_sys_bpf(cmd, attr, size);

	}

}

EXPORT_SYMBOL(kern_sys_bpf);

EXPORT_SYMBOL_NS(kern_sys_bpf, "BPF_INTERNAL");



static const struct bpf_func_proto bpf_sys_bpf_proto = {

	.func		= bpf_sys_bpf,

samples/bpf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ $(obj)/%.o: $(src)/%.c 
	@echo "  CLANG-bpf " $@

	$(Q)$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(BPF_EXTRA_CFLAGS) \

		-I$(obj) -I$(srctree)/tools/testing/selftests/bpf/ \

		-I$(LIBBPF_INCLUDE) \

		-I$(LIBBPF_INCLUDE) $(CLANG_SYS_INCLUDES) \

		-D__KERNEL__ -D__BPF_TRACING__ -Wno-unused-value -Wno-pointer-sign \

		-D__TARGET_ARCH_$(SRCARCH) -Wno-compare-distinct-pointer-types \

		-Wno-gnu-variable-sized-type-not-at-end \