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

Daniel Borkmann says: ==================== pull-request: bpf 2023-12-06 We've added 4 non-merge commits during the last 6 day(s) which contain a total of 7 files changed, 185 insertions(+), 55 deletions(-). The main changes are: 1) Fix race found by syzkaller on prog_array_map_poke_run when a BPF program's kallsym symbols were still missing, from Jiri Olsa. 2) Fix BPF verifier's branch offset comparison for BPF_JMP32 | BPF_JA, from Yonghong Song. 3) Fix xsk's poll handling to only set mask on bound xsk sockets, from Yewon Choi. * tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf: selftests/bpf: Add test for early update in prog_array_map_poke_run bpf: Fix prog_array_map_poke_run map poke update xsk: Skip polling event check for unbound socket bpf: Fix a verifier bug due to incorrect branch offset comparison with cpu=v4 ====================

Jakub Kicinski committed 2 years ago

Commit c85e5592 parents 0ad722b ffed24e7 files · +185 −55Browse files

Showing the changes to include/linux (1 of 7 files). Show all

Unified · Split

include/linux/bpf.h+3−0

@@ -3175,6 +3175,9 @@ enum bpf_text_poke_type { · 3174 unmodified lines
3175	3175	int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type t,
3176	3176	void addr1, void addr2);
3177	3177
	3178	+void bpf_arch_poke_desc_update(struct bpf_jit_poke_descriptor *poke,
	3179	+ struct bpf_prog new, struct bpf_prog old);
	3180	+
3178	3181	void bpf_arch_text_copy(void dst, void *src, size_t len);
3179	3182	int bpf_arch_text_invalidate(void *dst, size_t len);
3180	3183