Commit 8e138104 authored by David S. Miller's avatar David S. Miller
Browse files

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



Alexei Starovoitov says:

====================
pull-request: bpf 2020-05-15

The following pull-request contains BPF updates for your *net* tree.

We've added 9 non-merge commits during the last 2 day(s) which contain
a total of 14 files changed, 137 insertions(+), 43 deletions(-).

The main changes are:

1) Fix secid_to_secctx LSM hook default value, from Anders.

2) Fix bug in mmap of bpf array, from Andrii.

3) Restrict bpf_probe_read to archs where they work, from Daniel.

4) Enforce returning 0 for fentry/fexit progs, from Yonghong.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9a2dbb59 59df9f1f

Documentation/core-api/printk-formats.rst

+14 −0
Original line number Diff line number Diff line
@@ -112,6 +112,20 @@ used when printing stack backtraces. The specifier takes into 
consideration the effect of compiler optimisations which may occur

when tail-calls are used and marked with the noreturn GCC attribute.



Probed Pointers from BPF / tracing

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



::



	%pks	kernel string

	%pus	user string



The ``k`` and ``u`` specifiers are used for printing prior probed memory from

either kernel memory (k) or user memory (u). The subsequent ``s`` specifier

results in printing a string. For direct use in regular vsnprintf() the (k)

and (u) annotation is ignored, however, when used out of BPF's bpf_trace_printk(),

for example, it reads the memory it is pointing to without faulting.



Kernel Pointers

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

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config ARM 
	select ARCH_HAS_KEEPINITRD

	select ARCH_HAS_KCOV

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

	select ARCH_HAS_PTE_SPECIAL if ARM_LPAE

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_SETUP_DMA_OPS

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config ARM64 
	select ARCH_HAS_KCOV

	select ARCH_HAS_KEEPINITRD

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

	select ARCH_HAS_PTE_DEVMAP

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_SETUP_DMA_OPS

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ config X86 
	select ARCH_HAS_KCOV			if X86_64

	select ARCH_HAS_MEM_ENCRYPT

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

	select ARCH_HAS_PMEM_API		if X86_64

	select ARCH_HAS_PTE_DEVMAP		if X86_64

	select ARCH_HAS_PTE_SPECIAL

include/linux/lsm_hook_defs.h

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ LSM_HOOK(int, -EINVAL, getprocattr, struct task_struct *p, char *name, 
	 char **value)

LSM_HOOK(int, -EINVAL, setprocattr, const char *name, void *value, size_t size)

LSM_HOOK(int, 0, ismaclabel, const char *name)

LSM_HOOK(int, 0, secid_to_secctx, u32 secid, char **secdata,

LSM_HOOK(int, -EOPNOTSUPP, secid_to_secctx, u32 secid, char **secdata,

	 u32 *seclen)

LSM_HOOK(int, 0, secctx_to_secid, const char *secdata, u32 seclen, u32 *secid)

LSM_HOOK(void, LSM_RET_VOID, release_secctx, char *secdata, u32 seclen)

CRA Git | Maintained and supported by SUSTech CRA and CCSE