“87a20df44e7aca4de1173069a7e14e31d5c32bbf”上不存在“...vm/git@gitcode.net:openanolis/dragonwell8_hotspot.git”
提交 c0d74bfb 编写于 作者: A Alexei Starovoitov 提交者: Zheng Zengkai

libbpf: Support init of inner maps in light skeleton.

mainline inclusion
from mainline-5.17-rc1
commit be05c944
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5EUVD
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=be05c94476f3cf4fdc29feab4ed1053187323296

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

Add ability to initialize inner maps in light skeleton.
Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
Signed-off-by: NAndrii Nakryiko <andrii@kernel.org>
Acked-by: NAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211201181040.23337-11-alexei.starovoitov@gmail.com
(cherry picked from commit be05c944)
Signed-off-by: NWang Yufen <wangyufen@huawei.com>
上级 2fe6b20f
...@@ -60,5 +60,6 @@ void bpf_gen__record_attach_target(struct bpf_gen *gen, const char *name, enum b ...@@ -60,5 +60,6 @@ void bpf_gen__record_attach_target(struct bpf_gen *gen, const char *name, enum b
void bpf_gen__record_extern(struct bpf_gen *gen, const char *name, bool is_weak, void bpf_gen__record_extern(struct bpf_gen *gen, const char *name, bool is_weak,
bool is_typeless, int kind, int insn_idx); bool is_typeless, int kind, int insn_idx);
void bpf_gen__record_relo_core(struct bpf_gen *gen, const struct bpf_core_relo *core_relo); void bpf_gen__record_relo_core(struct bpf_gen *gen, const struct bpf_core_relo *core_relo);
void bpf_gen__populate_outer_map(struct bpf_gen *gen, int outer_map_idx, int key, int inner_map_idx);
#endif #endif
...@@ -1077,6 +1077,33 @@ void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *pvalue, ...@@ -1077,6 +1077,33 @@ void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *pvalue,
emit_check_err(gen); emit_check_err(gen);
} }
void bpf_gen__populate_outer_map(struct bpf_gen *gen, int outer_map_idx, int slot,
int inner_map_idx)
{
int attr_size = offsetofend(union bpf_attr, flags);
int map_update_attr, key;
union bpf_attr attr;
memset(&attr, 0, attr_size);
pr_debug("gen: populate_outer_map: outer %d key %d inner %d\n",
outer_map_idx, slot, inner_map_idx);
key = add_data(gen, &slot, sizeof(slot));
map_update_attr = add_data(gen, &attr, attr_size);
move_blob2blob(gen, attr_field(map_update_attr, map_fd), 4,
blob_fd_array_off(gen, outer_map_idx));
emit_rel_store(gen, attr_field(map_update_attr, key), key);
emit_rel_store(gen, attr_field(map_update_attr, value),
blob_fd_array_off(gen, inner_map_idx));
/* emit MAP_UPDATE_ELEM command */
emit_sys_bpf(gen, BPF_MAP_UPDATE_ELEM, map_update_attr, attr_size);
debug_ret(gen, "populate_outer_map outer %d key %d inner %d",
outer_map_idx, slot, inner_map_idx);
emit_check_err(gen);
}
void bpf_gen__map_freeze(struct bpf_gen *gen, int map_idx) void bpf_gen__map_freeze(struct bpf_gen *gen, int map_idx)
{ {
int attr_size = offsetofend(union bpf_attr, map_fd); int attr_size = offsetofend(union bpf_attr, map_fd);
......
...@@ -4939,9 +4939,9 @@ static int init_map_in_map_slots(struct bpf_object *obj, struct bpf_map *map) ...@@ -4939,9 +4939,9 @@ static int init_map_in_map_slots(struct bpf_object *obj, struct bpf_map *map)
fd = bpf_map__fd(targ_map); fd = bpf_map__fd(targ_map);
if (obj->gen_loader) { if (obj->gen_loader) {
pr_warn("// TODO map_update_elem: idx %td key %d value==map_idx %td\n", bpf_gen__populate_outer_map(obj->gen_loader,
map - obj->maps, i, targ_map - obj->maps); map - obj->maps, i,
return -ENOTSUP; targ_map - obj->maps);
} else { } else {
err = bpf_map_update_elem(map->fd, &i, &fd, 0); err = bpf_map_update_elem(map->fd, &i, &fd, 0);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册