From: Hou Tao Date: Wed, 8 Jan 2025 01:07:26 +0000 (+0800) Subject: bpf: Remove migrate_{disable|enable} from bpf_local_storage_alloc() X-Git-Tag: v6.14-rc1~133^2~18^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4855a75ebf485f74b06ba85b16b71c4b71a4086d;p=thirdparty%2Flinux.git bpf: Remove migrate_{disable|enable} from bpf_local_storage_alloc() These two callers of bpf_local_storage_alloc() are the same as bpf_selem_alloc(): bpf_sk_storage_clone() and bpf_local_storage_update(). The running contexts of these two callers have already disabled migration, therefore, there is no need to add extra migrate_{disable|enable} pair in bpf_local_storage_alloc(). Signed-off-by: Hou Tao Link: https://lore.kernel.org/r/20250108010728.207536-15-houtao@huaweicloud.com Signed-off-by: Alexei Starovoitov --- diff --git a/kernel/bpf/bpf_local_storage.c b/kernel/bpf/bpf_local_storage.c index 4b016f29f57e4..d78d53b921180 100644 --- a/kernel/bpf/bpf_local_storage.c +++ b/kernel/bpf/bpf_local_storage.c @@ -498,15 +498,11 @@ int bpf_local_storage_alloc(void *owner, if (err) return err; - if (smap->bpf_ma) { - migrate_disable(); + if (smap->bpf_ma) storage = bpf_mem_cache_alloc_flags(&smap->storage_ma, gfp_flags); - migrate_enable(); - } else { + else storage = bpf_map_kzalloc(&smap->map, sizeof(*storage), gfp_flags | __GFP_NOWARN); - } - if (!storage) { err = -ENOMEM; goto uncharge;