Daniel Borkmann
54e8cf41b2
bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K ...
[ Upstream commit fdadd04931c2d7cd294dc5b2b342863f94be53a3 ]
Michael and Sandipan report:
Commit ede95a63b5 introduced a bpf_jit_limit tuneable to limit BPF
JIT allocations. At compile time it defaults to PAGE_SIZE * 40000,
and is adjusted again at init time if MODULES_VADDR is defined.
For ppc64 kernels, MODULES_VADDR isn't defined, so we're stuck with
the compile-time default at boot-time, which is 0x9c400000 when
using 64K page size. This overflows the signed 32-bit bpf_jit_limit
value:
root@ubuntu:/tmp# cat /proc/sys/net/core/bpf_jit_limit
-1673527296
and can cause various unexpected failures throughout the network
stack. In one case `strace dhclient eth0` reported:
setsockopt(5, SOL_SOCKET, SO_ATTACH_FILTER, {len=11, filter=0x105dd27f8},
16) = -1 ENOTSUPP (Unknown error 524)
and similar failures can be seen with tools like tcpdump. This doesn't
always reproduce however, and I'm not sure why. The more consistent
failure I've seen is an Ubuntu 18.04 KVM guest booted on a POWER9
host would time out on systemd/netplan configuring a virtio-net NIC
with no noticeable errors in the logs.
Given this and also given that in near future some architectures like
arm64 will have a custom area for BPF JIT image allocations we should
get rid of the BPF_JIT_LIMIT_DEFAULT fallback / default entirely. For
4.21, we have an overridable bpf_jit_alloc_exec(), bpf_jit_free_exec()
so therefore add another overridable bpf_jit_alloc_exec_limit() helper
function which returns the possible size of the memory area for deriving
the default heuristic in bpf_jit_charge_init().
Like bpf_jit_alloc_exec() and bpf_jit_free_exec(), the new
bpf_jit_alloc_exec_limit() assumes that module_alloc() is the default
JIT memory provider, and therefore in case archs implement their custom
module_alloc() we use MODULES_{END,_VADDR} for limits and otherwise for
vmalloc_exec() cases like on ppc64 we use VMALLOC_{END,_START}.
Additionally, for archs supporting large page sizes, we should change
the sysctl to be handled as long to not run into sysctl restrictions
in future.
Fixes: ede95a63b5e8 ("bpf: add bpf_jit_limit knob to restrict unpriv allocations")
Reported-by: Sandipan Das <sandipan@linux.ibm.com>
Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-07-10 09:53:47 +02:00
bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K
2019-07-10 09:53:47 +02:00
cpuset: restore sanity to cpuset_cpus_allowed_fallback()
2019-07-10 09:53:39 +02:00
kconfig: tinyconfig: remove stale stack protector fixups
2018-06-15 07:15:28 +09:00
kdb: Don't back trace on a cpu that didn't round up
2019-02-12 19:47:19 +01:00
dma-direct: do not include SME mask in the DMA supported check
2019-01-13 09:51:05 +01:00
perf/ring-buffer: Always use {READ,WRITE}_ONCE() for rb->user_page data
2019-06-22 08:15:16 +02:00
gcov: remove CONFIG_GCOV_FORMAT_AUTODETECT
2018-06-08 18:56:02 +09:00
genirq: Prevent use-after-free and work list corruption
2019-05-10 17:54:10 +02:00
module: Fix livepatch/ftrace module text permissions race
2019-07-10 09:53:40 +02:00
locking/rwsem: Prevent decrement of reader count before increment
2019-05-22 07:37:34 +02:00
x86/power: Fix 'nosmt' vs hibernation triple fault during resume
2019-06-11 12:20:52 +02:00
printk: Fix panic caused by passing log_buf_len to command line
2018-11-13 11:08:48 -08:00
rcuperf: Fix cleanup path for invalid perf_type strings
2019-05-31 06:46:30 -07:00
jump_label: move 'asm goto' support test to Kconfig
2019-06-04 08:02:34 +02:00
timekeeping: Repair ktime_get_coarse*() granularity
2019-06-19 08:18:06 +02:00
ftrace/x86: Remove possible deadlock between register_kprobe() and ftrace_run_update_code()
2019-07-10 09:53:44 +02:00
acct_on(): don't mess with freeze protection
2019-05-31 06:46:05 -07:00
kernel/async.c: revert "async: simplify lowest_in_progress()"
2018-02-06 18:32:44 -08:00
audit: use ktime_get_coarse_real_ts64() for timestamps
2018-07-17 14:45:08 -04:00
audit: track the owner of the command mutex ourselves
2018-02-23 11:22:22 -05:00
fsnotify: add fsnotify_add_inode_mark() wrappers
2018-05-18 14:58:22 +02:00
\n
2018-08-17 09:41:28 -07:00
audit: fix use-after-free in audit_add_watch
2018-07-18 11:43:36 -04:00
audit: fix a memory leak bug
2019-05-31 06:46:17 -07:00
audit/stable-4.18 PR 20180814
2018-08-15 10:46:54 -07:00
kbuild: fix kernel/bounds.c 'W=1' warning
2018-11-13 11:08:47 -08:00
time: Enable get/put_compat_itimerspec64 always
2018-06-24 14:39:47 +02:00
cpu/speculation: Warn on unsupported mitigations= parameter
2019-07-03 13:14:46 +02:00
kernel/crash_core.c: print timestamp using time64_t
2018-08-22 10:52:47 -07:00
ptrace: restore smp_rmb() in __ptrace_may_access()
2019-06-19 08:18:00 +02:00
delayacct: Use raw_spinlocks
2018-04-27 14:34:51 +02:00
proc: introduce proc_create_single{,_data}
2018-05-16 07:23:35 +02:00
proc: introduce proc_create_single{,_data}
2018-05-16 07:23:35 +02:00
cgroup/pids: turn cgroup_subsys->free() into cgroup_subsys->release() to fix the accounting
2019-04-05 22:33:13 +02:00
extable: Make init_kernel_text() global
2018-02-21 16:54:06 +01:00
bpf/error-inject/kprobes: Clear current_kprobe and enable preempt in kprobe
2018-06-21 12:33:19 +02:00
userfaultfd: use RCU to free the task struct when fork fails
2019-05-22 07:37:41 +02:00
PM / reboot: Eliminate race between reboot and suspend
2018-08-06 12:35:20 +02:00
locking/futex: Allow low-level atomic operations to return -EAGAIN
2019-05-10 17:54:11 +02:00
kernel: hung_task.c: disable on suspend
2019-04-20 09:16:02 +02:00
memremap: split devm_memremap_pages() and memremap() infrastructure
2018-05-15 23:08:33 -07:00
irq_work: Do not raise an IPI when queueing work on the local CPU
2019-05-31 06:46:19 -07:00
jump_label: move 'asm goto' support test to Kconfig
2019-06-04 08:02:34 +02:00
kallsyms, x86: Export addresses of PTI entry trampolines
2018-08-14 19:12:29 -03:00
kconfig: include kernel/Kconfig.preempt from init/Kconfig
2018-08-02 08:06:54 +09:00
kernel/kcov.c: mark write_comp_data() as notrace
2019-02-12 19:47:20 +01:00
kexec: add call to LSM hook in original kexec_load syscall
2018-07-16 12:31:57 -07:00
kexec: yield to scheduler when loading kimage segments
2018-06-15 07:55:24 +09:00
treewide: Use array_size() in vzalloc()
2018-06-12 16:19:22 -07:00
kprobes: Fix error check when reusing optimized probes
2019-04-27 09:36:37 +02:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2018-08-13 11:25:07 -07:00
x86/uaccess, kcov: Disable stack protector
2019-06-19 08:18:01 +02:00
mm, devm_memremap_pages: add MEMORY_DEVICE_PRIVATE support
2019-01-13 09:51:04 +01:00
modsign: log module name in the event of an error
2018-07-02 11:36:17 +02:00
jump_label: move 'asm goto' support test to Kconfig
2019-06-04 08:02:34 +02:00
modsign: log module name in the event of an error
2018-07-02 11:36:17 +02:00
panic: avoid deadlocks in re-entrant console drivers
2018-12-29 13:37:57 +01:00
kernel/params.c: downgrade warning for unsafe parameters
2018-04-11 10:28:37 -07:00
Fix failure path in alloc_pid()
2019-01-13 09:51:06 +01:00
Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2018-04-03 19:15:32 -07:00
ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
2019-07-10 09:53:41 +02:00
PM / reboot: Eliminate race between reboot and suspend
2018-08-06 12:35:20 +02:00
relay: check return of create_buf_file() properly
2019-03-13 14:02:35 -07:00
libnvdimm for 4.18
2018-06-08 17:21:52 -07:00
rseq: uapi: Declare rseq_cs field as union, update includes
2018-07-10 22:18:52 +02:00
audit/stable-4.18 PR 20180605
2018-06-06 16:34:00 -07:00
kernel/signal.c: trace_signal_deliver when signal_group_exit
2019-06-09 09:17:20 +02:00
cpu/hotplug: Fix "SMT disabled by BIOS" detection for KVM
2019-02-12 19:47:25 +01:00
smpboot: Remove cpumask from the API
2018-07-03 09:20:44 +02:00
nohz: Fix missing tick reprogram when interrupting an inline softirq
2018-08-03 15:52:10 +02:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2018-08-13 11:25:07 -07:00
kernel/sys.c: prctl: fix false positive in validate_prctl_map()
2019-06-15 11:54:01 +02:00
Merge branch 'core-rseq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2018-06-10 10:17:09 -07:00
sysctl: return -EINVAL if val violates minmax
2019-06-15 11:53:59 +02:00
staging: irda: remove remaining remants of irda code removal
2018-04-16 11:26:49 +02:00
pids: introduce find_get_task_by_vpid() helper
2018-02-06 18:32:46 -08:00
kprobes: Remove jprobe API implementation
2018-06-21 12:33:05 +02:00
torture: Keep old-school dmesg format
2018-06-25 11:30:10 -07:00
tracepoint: Fix tracepoint array element size mismatch
2018-10-17 15:35:29 -04:00
headers: untangle kmemleak.h from mm.h
2018-04-05 21:36:27 -07:00
fs: add do_fchownat(), ksys_fchown() helpers and ksys_{,l}chown() wrappers
2018-04-02 20:15:59 +02:00
kernel: provide ksys_*() wrappers for syscalls called by kernel/uid16.c
2018-04-02 20:15:30 +02:00
umh: fix race condition
2018-06-07 16:56:28 -04:00
userns: use irqsave variant of refcount_dec_and_lock()
2018-08-22 10:52:47 -07:00
userns: also map extents in the reverse map to kernel IDs
2018-11-13 11:09:00 -08:00
uts: create "struct uts_namespace" from kmem_cache
2018-04-11 10:28:35 -07:00
sys: don't hold uts_sem while accessing userspace memory
2018-08-11 02:05:53 -05:00
watchdog: Respect watchdog cpumask on CPU hotplug
2019-04-03 06:26:29 +02:00
watchdog: Mark watchdog touch functions as notrace
2018-08-30 12:56:40 +02:00
workqueue: Try to catch flush_work() without INIT_WORK().
2019-05-02 09:58:56 +02:00
workqueue: Set worker->desc to workqueue name by default
2018-05-18 08:47:13 -07:00
54e8cf41b2