On Fri, Feb 28, 2025 at 9:53 AM Mykyta Yatsenko
<mykyta.yatsenko5@xxxxxxxxx> wrote:
>
> From: Mykyta Yatsenko <yatsenko@xxxxxxxx>
>
> Add struct bpf_object_state, substitute bpf_object member loaded by
> state. State could be OBJ_OPEN - indicates that bpf_object was just
> created, OBJ_PREPARED - prepare step will be introduced in the next
> patch, OBJ_LOADED - indicates that bpf_object is loaded, similar to
> loaded=true currently.
>
> Signed-off-by: Mykyta Yatsenko <yatsenko@xxxxxxxx>
> ---
> tools/lib/bpf/libbpf.c | 47 +++++++++++++++++++++++-------------------
> 1 file changed, 26 insertions(+), 21 deletions(-)
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index 899e98225f3b..9ced1ce2334c 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -670,11 +670,18 @@ struct elf_state {
>
> struct usdt_manager;
>
> +enum bpf_object_state {
> + OBJ_OPEN,
> + OBJ_PREPARED,
> + OBJ_LOADED,
> +};
> +
> struct bpf_object {
> char name[BPF_OBJ_NAME_LEN];
> char license[64];
> __u32 kern_version;
>
> + enum bpf_object_state state;
> struct bpf_program *programs;
> size_t nr_programs;
> struct bpf_map *maps;
> @@ -686,7 +693,6 @@ struct bpf_object {
> int nr_extern;
> int kconfig_map_idx;
>
> - bool loaded;
> bool has_subcalls;
> bool has_rodata;
>
> @@ -1511,7 +1517,7 @@ static struct bpf_object *bpf_object__new(const char *path,
> obj->kconfig_map_idx = -1;
>
> obj->kern_version = get_kernel_version();
> - obj->loaded = false;
> + obj->state = OBJ_OPEN;
>
> return obj;
> }
> @@ -4852,7 +4858,7 @@ bool bpf_map__autocreate(const struct bpf_map *map)
>
> int bpf_map__set_autocreate(struct bpf_map *map, bool autocreate)
> {
> - if (map->obj->loaded)
> + if (map->obj->state >= OBJ_LOADED)
> return libbpf_err(-EBUSY);
>
> map->autocreate = autocreate;
> @@ -4946,7 +4952,7 @@ struct bpf_map *bpf_map__inner_map(struct bpf_map *map)
>
> int bpf_map__set_max_entries(struct bpf_map *map, __u32 max_entries)
> {
> - if (map->obj->loaded)
> + if (map->obj->state >= OBJ_LOADED)
> return libbpf_err(-EBUSY);
>
> map->def.max_entries = max_entries;
> @@ -5193,7 +5199,7 @@ static void bpf_map__destroy(struct bpf_map *map);
>
> static bool map_is_created(const struct bpf_map *map)
> {
> - return map->obj->loaded || map->reused;
> + return map->obj->state >= OBJ_LOADED || map->reused;
> }
>
> static int bpf_object__create_map(struct bpf_object *obj, struct bpf_map *map, bool is_inner)
> @@ -8550,7 +8556,7 @@ static int bpf_object_load(struct bpf_object *obj, int extra_log_level, const ch
> if (!obj)
> return libbpf_err(-EINVAL);
>
> - if (obj->loaded) {
> + if (obj->state >= OBJ_LOADED) {
> pr_warn("object '%s': load can't be attempted twice\n", obj->name);
> return libbpf_err(-EINVAL);
> }
> @@ -8602,8 +8608,7 @@ static int bpf_object_load(struct bpf_object *obj, int extra_log_level, const ch
> btf__free(obj->btf_vmlinux);
> obj->btf_vmlinux = NULL;
>
> - obj->loaded = true; /* doesn't matter if successfully or not */
> -
> + obj->state = OBJ_LOADED;/* doesn't matter if successfully or not */
> if (err)
> goto out;
>
> @@ -8866,7 +8871,7 @@ int bpf_object__pin_maps(struct bpf_object *obj, const char *path)
> if (!obj)
> return libbpf_err(-ENOENT);
>
> - if (!obj->loaded) {
> + if (obj->state < OBJ_LOADED) {
this one seems ok in OBJ_PREPARED as well, all the maps will be
created by that time
> pr_warn("object not yet loaded; load it first\n");
> return libbpf_err(-ENOENT);
> }
> @@ -8945,7 +8950,7 @@ int bpf_object__pin_programs(struct bpf_object *obj, const char *path)
> if (!obj)
> return libbpf_err(-ENOENT);
>
> - if (!obj->loaded) {
> + if (obj->state < OBJ_LOADED) {
> pr_warn("object not yet loaded; load it first\n");
> return libbpf_err(-ENOENT);
> }
> @@ -9132,7 +9137,7 @@ int bpf_object__btf_fd(const struct bpf_object *obj)
>
> int bpf_object__set_kversion(struct bpf_object *obj, __u32 kern_version)
> {
> - if (obj->loaded)
> + if (obj->state >= OBJ_LOADED)
> return libbpf_err(-EINVAL);
>
> obj->kern_version = kern_version;
> @@ -9229,7 +9234,7 @@ bool bpf_program__autoload(const struct bpf_program *prog)
>
> int bpf_program__set_autoload(struct bpf_program *prog, bool autoload)
> {
> - if (prog->obj->loaded)
> + if (prog->obj->state >= OBJ_LOADED)
> return libbpf_err(-EINVAL);
>
> prog->autoload = autoload;
> @@ -9261,7 +9266,7 @@ int bpf_program__set_insns(struct bpf_program *prog,
> {
> struct bpf_insn *insns;
>
> - if (prog->obj->loaded)
> + if (prog->obj->state >= OBJ_LOADED)
> return libbpf_err(-EBUSY);
>
> insns = libbpf_reallocarray(prog->insns, new_insn_cnt, sizeof(*insns));
> @@ -9304,7 +9309,7 @@ static int last_custom_sec_def_handler_id;
>
> int bpf_program__set_type(struct bpf_program *prog, enum bpf_prog_type type)
> {
> - if (prog->obj->loaded)
> + if (prog->obj->state >= OBJ_LOADED)
> return libbpf_err(-EBUSY);
>
> /* if type is not changed, do nothing */
> @@ -9335,7 +9340,7 @@ enum bpf_attach_type bpf_program__expected_attach_type(const struct bpf_program
> int bpf_program__set_expected_attach_type(struct bpf_program *prog,
> enum bpf_attach_type type)
> {
> - if (prog->obj->loaded)
> + if (prog->obj->state >= OBJ_LOADED)
> return libbpf_err(-EBUSY);
>
> prog->expected_attach_type = type;
> @@ -9349,7 +9354,7 @@ __u32 bpf_program__flags(const struct bpf_program *prog)
>
> int bpf_program__set_flags(struct bpf_program *prog, __u32 flags)
> {
> - if (prog->obj->loaded)
> + if (prog->obj->state >= OBJ_LOADED)
> return libbpf_err(-EBUSY);
>
> prog->prog_flags = flags;
> @@ -9363,7 +9368,7 @@ __u32 bpf_program__log_level(const struct bpf_program *prog)
>
> int bpf_program__set_log_level(struct bpf_program *prog, __u32 log_level)
> {
> - if (prog->obj->loaded)
> + if (prog->obj->state >= OBJ_LOADED)
> return libbpf_err(-EBUSY);
>
> prog->log_level = log_level;
> @@ -9382,7 +9387,7 @@ int bpf_program__set_log_buf(struct bpf_program *prog, char *log_buf, size_t log
> return libbpf_err(-EINVAL);
> if (prog->log_size > UINT_MAX)
> return libbpf_err(-EINVAL);
> - if (prog->obj->loaded)
> + if (prog->obj->state >= OBJ_LOADED)
> return libbpf_err(-EBUSY);
>
> prog->log_buf = log_buf;
> @@ -10299,7 +10304,7 @@ static int map_btf_datasec_resize(struct bpf_map *map, __u32 size)
>
> int bpf_map__set_value_size(struct bpf_map *map, __u32 size)
> {
> - if (map->obj->loaded || map->reused)
> + if (map->obj->state >= OBJ_LOADED || map->reused)
OBJ_PREPARED, maps can't be changed after that step
> return libbpf_err(-EBUSY);
>
> if (map->mmaped) {
> @@ -10345,7 +10350,7 @@ int bpf_map__set_initial_value(struct bpf_map *map,
> {
> size_t actual_sz;
>
> - if (map->obj->loaded || map->reused)
> + if (map->obj->state >= OBJ_LOADED || map->reused)
ditto, I think we have to ban it after OBJ_PREPARED
> return libbpf_err(-EBUSY);
>
> if (!map->mmaped || map->libbpf_type == LIBBPF_MAP_KCONFIG)
> @@ -13666,7 +13671,7 @@ int bpf_program__set_attach_target(struct bpf_program *prog,
> if (!prog || attach_prog_fd < 0)
> return libbpf_err(-EINVAL);
>
> - if (prog->obj->loaded)
> + if (prog->obj->state >= OBJ_LOADED)
> return libbpf_err(-EINVAL);
>
> if (attach_prog_fd && !attach_func_name) {
> --
> 2.48.1
>
