Merge branch 'Enable non-atomic allocations in local storage'

Browse source

Joanne Koong says:

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

From: Joanne Koong <joannelkoong@gmail.com>

Currently, local storage memory can only be allocated atomically
(GFP_ATOMIC). This restriction is too strict for sleepable bpf
programs.

In this patchset, sleepable programs can allocate memory in local
storage using GFP_KERNEL, while non-sleepable programs always default to
GFP_ATOMIC.

v3 <- v2:
* Add extra case to local_storage.c selftest to test associating multiple
elements with the local storage, which triggers a GFP_KERNEL allocation in
local_storage_update().
* Cast gfp_t to __s32 in verifier to fix the sparse warnings

v2 <- v1:
* Allocate the memory before/after the raw_spin_lock_irqsave, depending
on the gfp flags
* Rename mem_flags to gfp_flags
* Reword the comment "*mem_flags* is set by the bpf verifier" to
"*gfp_flags* is a hidden argument provided by the verifier"
* Add a sentence to the commit message about existing local storage
selftests covering both the GFP_ATOMIC and GFP_KERNEL paths in
bpf_local_storage_update.
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2022-03-20 18:55:05 -07:00

parent a8fee96202 0e790cbb1a

commit 30630e44b6

7 changed files with 103 additions and 41 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

include/linux/bpf_local_storage.h

View file

9

kernel/bpf/bpf_inode_storage.c

View file

58

kernel/bpf/bpf_local_storage.c

View file

10

kernel/bpf/bpf_task_storage.c

View file

20

kernel/bpf/verifier.c

View file

21

net/core/bpf_sk_storage.c

View file

19

tools/testing/selftests/bpf/progs/local_storage.c

View file