Replace BPF memory allocator with kmalloc_nolock() in local storage #10285
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Author
|
Upstream branch: 93ce3be |
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
4752827 to
05f2f03
Compare
Author
|
Upstream branch: c1da3df |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
d629934 to
1bd3b3c
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
05f2f03 to
c343f72
Compare
Author
|
Upstream branch: e5d2e34 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
1bd3b3c to
bcc816f
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
c343f72 to
6a32d09
Compare
Author
|
Upstream branch: fea3f5e |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
bcc816f to
b5a312a
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
6a32d09 to
b967d93
Compare
Author
|
Upstream branch: 63066b7 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
b5a312a to
48cf085
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
b967d93 to
250c35a
Compare
Author
|
Upstream branch: c133390 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
48cf085 to
6733d10
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
250c35a to
5630fb8
Compare
Author
|
Upstream branch: ef2c0b2 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
6733d10 to
b6314d3
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
5630fb8 to
f815251
Compare
Author
|
Upstream branch: a4d31f4 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
b6314d3 to
d88f47c
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
f815251 to
eb66b0c
Compare
Author
|
Upstream branch: 4f7bc83 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
d88f47c to
96e8d2d
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
eb66b0c to
bfad2ee
Compare
Author
|
Upstream branch: 6cc73f3 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
96e8d2d to
3505cd7
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
bfad2ee to
4a6b8b7
Compare
Author
|
Upstream branch: 4722981 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
3505cd7 to
e3999ad
Compare
Author
|
Upstream branch: 4722981 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
e3999ad to
0e600ce
Compare
Author
|
Upstream branch: 4722981 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
0e600ce to
1075666
Compare
…elements Since commit a96a44a ("bpf: bpf_sk_storage: Fix invalid wait context lockdep report"), {charge,uncharge}_mem are always true when allocating a bpf_local_storage_elem or unlinking a bpf_local_storage_elem from local storage, so drop these arguments. No functional change. Signed-off-by: Amery Hung <[email protected]> Reviewed-by: Martin KaFai Lau <[email protected]>
Since selem already saves a pointer to smap, use it instead of an additional argument in bpf_selem_free(). This requires moving the SDATA(selem)->smap assignment from bpf_selem_link_map() to bpf_selem_alloc() since bpf_selem_free() may be called without the selem being linked to smap in bpf_local_storage_update(). Signed-off-by: Amery Hung <[email protected]> Reviewed-by: Martin KaFai Lau <[email protected]>
Save the memory allocation method used for bpf_local_storage in the struct explicitly so that we don't need to go through the hassle to find out the info. When a later patch replaces BPF memory allocator with kmalloc_noloc(), bpf_local_storage_free() will no longer need smap->storage_ma to return the memory and completely remove the dependency on smap in bpf_local_storage_free(). Signed-off-by: Amery Hung <[email protected]> Reviewed-by: Martin KaFai Lau <[email protected]>
Author
|
Upstream branch: 4722981 |
Replace bpf memory allocator with kmalloc_nolock() to reduce memory wastage due to preallocation. In bpf_selem_free(), an selem now needs to wait for a RCU grace period before being freed when reuse_now == true. Therefore, rcu_barrier() should be always be called in bpf_local_storage_map_free(). In bpf_local_storage_free(), since smap->storage_ma is no longer needed to return the memory, the function is now independent from smap. Remove the outdated comment in bpf_local_storage_alloc(). We already free selem after an RCU grace period in bpf_local_storage_update() when bpf_local_storage_alloc() failed the cmpxchg since commit c0d63f3 ("bpf: Add bpf_selem_free()"). Signed-off-by: Amery Hung <[email protected]> Reviewed-by: Martin KaFai Lau <[email protected]>
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1023724=>bpf-next
branch
from
1075666 to
5d82136
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request for series with
subject: Replace BPF memory allocator with kmalloc_nolock() in local storage
version: 2
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1023724