Commit 86bbf019 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 

Alexei Starovoitov says:

====================
pull-request: bpf 2020-11-06

1) Pre-allocated per-cpu hashmap needs to zero-fill reused element, from David.

2) Tighten bpf_lsm function check, from KP.

3) Fix bpftool attaching to flow dissector, from Lorenz.

4) Use -fno-gcse for the whole kernel/bpf/core.c instead of function attribute, from Ard.

* git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  bpf: Update verification logic for LSM programs
  bpf: Zero-fill re-used per-cpu map element
  bpf: BPF_PRELOAD depends on BPF_SYSCALL
  tools/bpftool: Fix attaching flow dissector
  libbpf: Fix possible use after free in xsk_socket__delete
  libbpf: Fix null dereference in xsk_socket__delete
  libbpf, hashmap: Fix undefined behavior in hash_bits
  bpf: Don't rely on GCC __attribute__((optimize)) to disable GCSE
  tools, bpftool: Remove two unused variables.
  tools, bpftool: Avoid array index warnings.
  xsk: Fix possible memory leak at socket close
  bpf: Add struct bpf_redir_neigh forward declaration to BPF helper defs
  samples/bpf: Set rlimit for memlock to infinity in all samples
  bpf: Fix -Wshadow warnings
  selftest/bpf: Fix profiler test using CO-RE relocation for enums
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents bf3e7628 6f64e477

include/linux/compiler-gcc.h

+0 −2
Original line number Diff line number Diff line
@@ -175,5 +175,3 @@ 
#else

#define __diag_GCC_8(s)

#endif
 


#define __no_fgcse __attribute__((optimize("-fno-gcse")))

include/linux/compiler_types.h

+0 −4
Original line number Diff line number Diff line
@@ -247,10 +247,6 @@ struct ftrace_likely_data { 
#define asm_inline asm

#endif



#ifndef __no_fgcse

# define __no_fgcse

#endif



/* Are two types/vars the same type (ignoring qualifiers)? */

#define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))

include/linux/filter.h

+11 −11
Original line number Diff line number Diff line
@@ -558,21 +558,21 @@ struct sk_filter { 
DECLARE_STATIC_KEY_FALSE(bpf_stats_enabled_key);



#define __BPF_PROG_RUN(prog, ctx, dfunc)	({			\

	u32 ret;							\

	u32 __ret;							\

	cant_migrate();							\

	if (static_branch_unlikely(&bpf_stats_enabled_key)) {		\

		struct bpf_prog_stats *stats;				\

		u64 start = sched_clock();				\

		ret = dfunc(ctx, (prog)->insnsi, (prog)->bpf_func);	\

		stats = this_cpu_ptr(prog->aux->stats);			\

		u64_stats_update_begin(&stats->syncp);			\

		stats->cnt++;						\

		stats->nsecs += sched_clock() - start;			\

		u64_stats_update_end(&stats->syncp);			\

		struct bpf_prog_stats *__stats;				\

		u64 __start = sched_clock();				\

		__ret = dfunc(ctx, (prog)->insnsi, (prog)->bpf_func);	\

		__stats = this_cpu_ptr(prog->aux->stats);		\

		u64_stats_update_begin(&__stats->syncp);		\

		__stats->cnt++;						\

		__stats->nsecs += sched_clock() - __start;		\

		u64_stats_update_end(&__stats->syncp);			\

	} else {							\

		ret = dfunc(ctx, (prog)->insnsi, (prog)->bpf_func);	\

		__ret = dfunc(ctx, (prog)->insnsi, (prog)->bpf_func);	\

	}								\

	ret; })

	__ret; })



#define BPF_PROG_RUN(prog, ctx)						\

	__BPF_PROG_RUN(prog, ctx, bpf_dispatcher_nop_func)

include/net/xsk_buff_pool.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_umem *umem, 
void xp_destroy(struct xsk_buff_pool *pool);

void xp_release(struct xdp_buff_xsk *xskb);

void xp_get_pool(struct xsk_buff_pool *pool);

void xp_put_pool(struct xsk_buff_pool *pool);

bool xp_put_pool(struct xsk_buff_pool *pool);

void xp_clear_dev(struct xsk_buff_pool *pool);

void xp_add_xsk(struct xsk_buff_pool *pool, struct xdp_sock *xs);

void xp_del_xsk(struct xsk_buff_pool *pool, struct xdp_sock *xs);

kernel/bpf/Makefile

+5 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y := core.o

CFLAGS_core.o += $(call cc-disable-warning, override-init)

ifneq ($(CONFIG_BPF_JIT_ALWAYS_ON),y)

# ___bpf_prog_run() needs GCSE disabled on x86; see 3193c0836f203 for details

cflags-nogcse-$(CONFIG_X86)$(CONFIG_CC_IS_GCC) := -fno-gcse

endif

CFLAGS_core.o += $(call cc-disable-warning, override-init) $(cflags-nogcse-yy)



obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o helpers.o tnum.o bpf_iter.o map_iter.o task_iter.o prog_iter.o

obj-$(CONFIG_BPF_SYSCALL) += hashtab.o arraymap.o percpu_freelist.o bpf_lru_list.o lpm_trie.o map_in_map.o