From patchwork Fri Feb 28 17:52:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Yatsenko X-Patchwork-Id: 13996861 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 298C72500AA for ; Fri, 28 Feb 2025 17:53:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740765186; cv=none; b=UbOyljeQdYYSy/6KNTTxAGP8ByFJrNXYi0Ee0Ow+hiw8Sz5SE40bscPiy+gs60uhoY7XiEZAtNnBObaJCK/vo8IYnQC1wZO6I68LR0yepZ7G6NXoTnZRtKdbOEyKtjE7CoRfAfsvUduEv5PTf1X/VqRxWVxixJTElaNvCvjSsmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740765186; c=relaxed/simple; bh=SkQzZknmpcJv/gbUwgtOVlw06lcQxQ2SkSNdRR0tHMY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LYucCmAswpXXTbbiCl+09XwSqUZUYymAY27Jmi8rmxqZKTbCZKAYujQzab6vY8eqPmCOKB1R/ZGyMX4HLRmmUJn4or+lIltLFawxmNfdFmbfzOCBimwJELdsU+/XbsHdjaZl53DKcakgpZHAKjCV5Z+38pXJ6bYvmqz7zmUYZdo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lQlRoVVX; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lQlRoVVX" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso25900885e9.1 for ; Fri, 28 Feb 2025 09:53:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740765182; x=1741369982; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mmkGcfiLXY4+tkfqzh2amxmlBPsMMB9OQnpgy2uUVAc=; b=lQlRoVVXaK0c3ZUe8wbSvWlGVrzxdb996oYrGOm5aGZ9JKz8isKe06QEsoSyKvB0tx 91t6rCPci+ou38l+k8Xqn5DXK3mtVRKsgbG25UIf0gEDPM8e81EUQQIE1mNX0k6NCry1 X5OMfjGC1/WBDhOw/zm3sEGqgWFoaSwDrTbfinH/OPPTG5jMJVRFWEaI9OTwAZMuwZyc tzp72goEMlgjKSG49AKF3my46zgLV3JnBK5b+fBMo+ex3OTO/A2OaHcgZZe3/jHj7VXK 1LlT/rUOIroy/YBecwJht1HdqucmDQXyoWrwXGXmHbEGOoTI+jiOe27uwkKh+ThOhw7a xD/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740765182; x=1741369982; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mmkGcfiLXY4+tkfqzh2amxmlBPsMMB9OQnpgy2uUVAc=; b=wYTecL7zd+eM4NUpTK6tyOoLNX6ZiqwrFPORpMILTCX+B4PDdbWda5bCv6T1tHYK0H XQx17R1lW8q1UGAM9xKWreFyjRY/TldnCtBqrLLkmLSBsnHKM3ZfM6onJ3Twah9upuB/ sXxoZTNSSWq81YyJ3zP8aIFpaFHqpwczkdXfaV857FGfgLwmDTh8Fd30zSfLFUEeK71R mbbr9dlGSF6vAsKpes+gB2GwuA2LYRjLE5ZNAZIYSlIDnvnLbfRBds7yaInyDH4ntOAK m0ixVu1JNBJ2JWqbkblESeqIJxUfvB1+H9jA+LjqfJdVydgZkNTbYRRqlI8+FcF2trWv wnjw== X-Gm-Message-State: AOJu0YxgGueMg3LAKBCV2nhR7ZUuEYjlIDPUKOXwscGTwWCcV/0vxcpC Itm/IWQPrHok5Fk+BTNporPsLzA30IWhiHk3cVb6CK9CCYMK823QSrrunA== X-Gm-Gg: ASbGncvTMimf5sB5nrryipCi6Q3pCkEv815hgTAICH3q9hgn/lHL1Ni0SFiT7IGfySR rDTzq3vmeB4H9Th52FqfUnh7nqWqbew04gkr0tOhLouG9DYyb/j7xUAtOe776vBD10l+L0zCHB5 f+M6J+nUv2ZW+XjmGupz80a5XR7LaYhvE0M6N1z/CHwOhbuv4bKhCleIiYLAqy0tbPrhTKcqCVn IyMh59aI89Lod45h0/5OGtC/6iKpikhoqT2Tkx1fjbbc9+mHMJBtBI7uRq4PrEV11WjkQlKjl6H Ktruhg/0zipku5sXK7VkWtOpDJ4PJpdCh1fXd1lRvKLV1pgy11eavCYRrPFpMJ754Hi9eXpydQu jLBD7q3U7NCl2k+OopC73WkaRquLlbMw= X-Google-Smtp-Source: AGHT+IH+Qb7vQ04DYgCqEWWYtQ0fy+GJCPbcU8Qdt0eqY8BWNutFAcyrW8l2WyqtJawSwQ7lbKdWGw== X-Received: by 2002:a05:6000:1acd:b0:38f:51a3:a708 with SMTP id ffacd0b85a97d-390ec9bcb07mr4817698f8f.28.1740765182225; Fri, 28 Feb 2025 09:53:02 -0800 (PST) Received: from localhost.localdomain (cpc158789-hari22-2-0-cust468.20-2.cable.virginm.net. [86.26.115.213]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47a7b88sm5861664f8f.40.2025.02.28.09.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 09:53:01 -0800 (PST) From: Mykyta Yatsenko To: bpf@vger.kernel.org, ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, kafai@meta.com, kernel-team@meta.com, eddyz87@gmail.com Cc: Mykyta Yatsenko Subject: [PATCH bpf-next 1/3] libbpf: introduce more granular state for bpf_object Date: Fri, 28 Feb 2025 17:52:53 +0000 Message-ID: <20250228175255.254009-2-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250228175255.254009-1-mykyta.yatsenko5@gmail.com> References: <20250228175255.254009-1-mykyta.yatsenko5@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Mykyta Yatsenko 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 --- 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) { 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) 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) 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) { From patchwork Fri Feb 28 17:52:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Yatsenko X-Patchwork-Id: 13996862 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0C371BD9F2 for ; Fri, 28 Feb 2025 17:53:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740765187; cv=none; b=EEGckdahLPwaeSUCAF9/+pfsAxJM5zf/QzPon4xN1+Lfh8/dY7QetFJ5Jhbgyhso3zwLJ/FTicwKPWsBTm8zhFsDgaeiUk2kCbTRJAIvw1Y0T3ZrIggl7dnOCbeDzncT9I4A/1yausElIM/UBJWqToMKhv051Qi8GH/0FOeifRU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740765187; c=relaxed/simple; bh=YIZFVBGVknv9054PE8fxoSGPhyCTgMIrimt8+wjny9s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rw+N6xXonp+xkTdYfKzPLgN4l0gosIrZFavV3RJgcR/l8eHX5oYGc/iecTKe4ySFD3oPDoMMoJ0TY4Q5MQYO3PCV1TnnjEUZB4xLaPAKmTPE8Mea3E2D8SpSEZxtHJb84tt9MQci2WdXTICbtky+2LFlRNbYQBTFMSOvOWo/BTo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PYVyYr8d; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PYVyYr8d" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-390ddf037ffso1172563f8f.2 for ; Fri, 28 Feb 2025 09:53:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740765184; x=1741369984; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OstbQSt2Vr7ZgCHf6elK4Ux1V9WOURBZ78O07X1u8pM=; b=PYVyYr8dk+2j0axxvYazPRALwlTX1/2irG/4mJlnT67GX4vMUH/xG4J8EpQmC5Uayz R9VBsKdUleM72cdgg2vhY2ir5Z9OgoNVkOUhpkiFz0lDH5WFzAPsQ3hfQvQPtmGtsKBi nfdT1DQdxNcvwV7mXCQdmibbwZxxWgs03Kt0NI1Z07+APlZsIhgYQaIM2EW7G0i6bVjN RWypwi6GHszUkvfUqzIPAC8561xwxfqbeEATyDnmmG+98sp3WZViVaL8fBZHweS+cBm0 5+H7jWxDvVmfBXjdFSMyj50uf/0TRhJT9GEFZ+EtLYJ6LqAGEJjTJMEhRKQccUTTuhMP S+5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740765184; x=1741369984; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OstbQSt2Vr7ZgCHf6elK4Ux1V9WOURBZ78O07X1u8pM=; b=hjhjmBTf2fpNSSUEFKxzTSVuaIl/kUBs3ISk2js4+8Siu1peRFCedmC2S9/43Yybbb KOLktqbuzO8oZaSoIEt2CeWNkjLOKBkC2EMvP9FHySlWPukrRNAQopImuvCtb5ngDoB5 HHPgZHsXelmpNh9fy9eb9Dsh/ZyEHSPUIxHfxzeuClkDQWc+FlZsoulu2xrkF1MNTxBL r4fo0CzDPGs3jZpz1cM1vcRmsq9qvOkAq+sm/tV73s93//G3kanbsJ8Pwwc4eARtmMzj esClUI6ELeMYSwHNoTrqaCBHmF8uZtTFCzsk+PQNj/u2+RohhCqU9xkQHn0pd7ZFDQZ8 iJSw== X-Gm-Message-State: AOJu0Yw6sgtWDQfXQlsEgHtRQxpu9UOGGGmY253Qz4StrGx1t8xCnWgT wQuL25Vbs6zEErvNeyrSO9f/8bEB95zlofStu3UKMp7Lo5WQ9LYcA2aG6A== X-Gm-Gg: ASbGncuceQKbSmCiQd7D3006GlgQ4OcZVbbT0SVTmiX9tKK24Lmr22rBjut2lZN0TkR Ij3gloehYBHSAl0oRSepSBkPqFYiagDGj1F0py/YscjzDsLeoze6MqpnZaXxKjJ4/Hu2p25GAmZ DdAyDuag9mDlLOnTNweSaICpEwkbPfQ/gNoEHsCSqC+QmStnVlgTTuNvPQuxY/ehCZCfFbVRTHS dlId8DfWLJAUJ6qovelC3dWAK0ta4CXkQ/lmx/ZSZh6O4kwzKIQnA/WNsxN1MnEfpuqw3tEzn2V C5MwKuGoFzZHBux/GsstsbkCz+HfAb+BhL+CWFMTQ0nDPmMzZCBCuP4zDcziVvrdTcoxILUSPI0 gkyG7ymAVfbiMS2KBkAeHbivdZj/zZ/8= X-Google-Smtp-Source: AGHT+IFs442uCzLll73pgB1Bkpbe58OoiwtZP0vV3iFDoKxSEqXDRGGV1plR9/miOY9ErJs3UjKXQQ== X-Received: by 2002:a5d:47ae:0:b0:390:f642:e283 with SMTP id ffacd0b85a97d-390f642e3a2mr1132710f8f.10.1740765183748; Fri, 28 Feb 2025 09:53:03 -0800 (PST) Received: from localhost.localdomain (cpc158789-hari22-2-0-cust468.20-2.cable.virginm.net. [86.26.115.213]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47a7b88sm5861664f8f.40.2025.02.28.09.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 09:53:03 -0800 (PST) From: Mykyta Yatsenko To: bpf@vger.kernel.org, ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, kafai@meta.com, kernel-team@meta.com, eddyz87@gmail.com Cc: Mykyta Yatsenko Subject: [PATCH bpf-next 2/3] libbpf: split bpf object load into prepare/load Date: Fri, 28 Feb 2025 17:52:54 +0000 Message-ID: <20250228175255.254009-3-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250228175255.254009-1-mykyta.yatsenko5@gmail.com> References: <20250228175255.254009-1-mykyta.yatsenko5@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Mykyta Yatsenko Introduce bpf_object__prepare API: additional intermediate step, executing all steps that bpf_object__load is running before the actual loading of BPF programs. Signed-off-by: Mykyta Yatsenko --- tools/lib/bpf/libbpf.c | 161 +++++++++++++++++++++++++++------------ tools/lib/bpf/libbpf.h | 9 +++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 121 insertions(+), 50 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 9ced1ce2334c..dd2f64903c3b 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -4858,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->state >= OBJ_LOADED) + if (map->obj->state >= OBJ_PREPARED) return libbpf_err(-EBUSY); map->autocreate = autocreate; @@ -4952,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->state >= OBJ_LOADED) + if (map->obj->state >= OBJ_PREPARED) return libbpf_err(-EBUSY); map->def.max_entries = max_entries; @@ -5199,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->state >= OBJ_LOADED || map->reused; + return map->obj->state >= OBJ_PREPARED || map->reused; } static int bpf_object__create_map(struct bpf_object *obj, struct bpf_map *map, bool is_inner) @@ -7901,13 +7901,6 @@ bpf_object__load_progs(struct bpf_object *obj, int log_level) size_t i; int err; - for (i = 0; i < obj->nr_programs; i++) { - prog = &obj->programs[i]; - err = bpf_object__sanitize_prog(obj, prog); - if (err) - return err; - } - for (i = 0; i < obj->nr_programs; i++) { prog = &obj->programs[i]; if (prog_is_subprog(obj, prog)) @@ -7933,6 +7926,21 @@ bpf_object__load_progs(struct bpf_object *obj, int log_level) return 0; } +static int bpf_object_prepare_progs(struct bpf_object *obj) +{ + struct bpf_program *prog; + size_t i; + int err; + + for (i = 0; i < obj->nr_programs; i++) { + prog = &obj->programs[i]; + err = bpf_object__sanitize_prog(obj, prog); + if (err) + return err; + } + return 0; +} + static const struct bpf_sec_def *find_sec_def(const char *sec_name); static int bpf_object_init_progs(struct bpf_object *obj, const struct bpf_object_open_opts *opts) @@ -8549,9 +8557,72 @@ static int bpf_object_prepare_struct_ops(struct bpf_object *obj) return 0; } +static void bpf_object_unpin(struct bpf_object *obj) +{ + int i; + + /* unpin any maps that were auto-pinned during load */ + for (i = 0; i < obj->nr_maps; i++) + if (obj->maps[i].pinned && !obj->maps[i].reused) + bpf_map__unpin(&obj->maps[i], NULL); +} + +static void bpf_object_post_load_cleanup(struct bpf_object *obj) +{ + int i; + + /* clean up fd_array */ + zfree(&obj->fd_array); + + /* clean up module BTFs */ + for (i = 0; i < obj->btf_module_cnt; i++) { + close(obj->btf_modules[i].fd); + btf__free(obj->btf_modules[i].btf); + free(obj->btf_modules[i].name); + } + free(obj->btf_modules); + + /* clean up vmlinux BTF */ + btf__free(obj->btf_vmlinux); + obj->btf_vmlinux = NULL; +} + +static int bpf_object_prepare(struct bpf_object *obj, const char *target_btf_path) +{ + int err; + + if (!obj) + return -EINVAL; + + if (obj->state >= OBJ_PREPARED) { + pr_warn("object '%s': prepare loading can't be attempted twice\n", obj->name); + return -EINVAL; + } + + err = bpf_object_prepare_token(obj); + err = err ? : bpf_object__probe_loading(obj); + err = err ? : bpf_object__load_vmlinux_btf(obj, false); + err = err ? : bpf_object__resolve_externs(obj, obj->kconfig); + err = err ? : bpf_object__sanitize_maps(obj); + err = err ? : bpf_object__init_kern_struct_ops_maps(obj); + err = err ? : bpf_object_adjust_struct_ops_autoload(obj); + err = err ? : bpf_object__relocate(obj, obj->btf_custom_path ? : target_btf_path); + err = err ? : bpf_object__sanitize_and_load_btf(obj); + err = err ? : bpf_object__create_maps(obj); + err = err ? : bpf_object_prepare_progs(obj); + obj->state = OBJ_PREPARED; + + if (err) { + bpf_object_unpin(obj); + bpf_object_unload(obj); + return err; + } + return 0; +} + static int bpf_object_load(struct bpf_object *obj, int extra_log_level, const char *target_btf_path) { - int err, i; + int err; if (!obj) return libbpf_err(-EINVAL); @@ -8571,17 +8642,12 @@ static int bpf_object_load(struct bpf_object *obj, int extra_log_level, const ch return libbpf_err(-LIBBPF_ERRNO__ENDIAN); } - err = bpf_object_prepare_token(obj); - err = err ? : bpf_object__probe_loading(obj); - err = err ? : bpf_object__load_vmlinux_btf(obj, false); - err = err ? : bpf_object__resolve_externs(obj, obj->kconfig); - err = err ? : bpf_object__sanitize_maps(obj); - err = err ? : bpf_object__init_kern_struct_ops_maps(obj); - err = err ? : bpf_object_adjust_struct_ops_autoload(obj); - err = err ? : bpf_object__relocate(obj, obj->btf_custom_path ? : target_btf_path); - err = err ? : bpf_object__sanitize_and_load_btf(obj); - err = err ? : bpf_object__create_maps(obj); - err = err ? : bpf_object__load_progs(obj, extra_log_level); + if (obj->state < OBJ_PREPARED) { + err = bpf_object_prepare(obj, target_btf_path); + if (err) + return libbpf_err(err); + } + err = bpf_object__load_progs(obj, extra_log_level); err = err ? : bpf_object_init_prog_arrays(obj); err = err ? : bpf_object_prepare_struct_ops(obj); @@ -8593,35 +8659,22 @@ static int bpf_object_load(struct bpf_object *obj, int extra_log_level, const ch err = bpf_gen__finish(obj->gen_loader, obj->nr_programs, obj->nr_maps); } - /* clean up fd_array */ - zfree(&obj->fd_array); + bpf_object_post_load_cleanup(obj); + obj->state = OBJ_LOADED;/* doesn't matter if successfully or not */ - /* clean up module BTFs */ - for (i = 0; i < obj->btf_module_cnt; i++) { - close(obj->btf_modules[i].fd); - btf__free(obj->btf_modules[i].btf); - free(obj->btf_modules[i].name); + if (err) { + bpf_object_unpin(obj); + bpf_object_unload(obj); + pr_warn("failed to load object '%s'\n", obj->path); + return libbpf_err(err); } - free(obj->btf_modules); - - /* clean up vmlinux BTF */ - btf__free(obj->btf_vmlinux); - obj->btf_vmlinux = NULL; - - obj->state = OBJ_LOADED;/* doesn't matter if successfully or not */ - if (err) - goto out; return 0; -out: - /* unpin any maps that were auto-pinned during load */ - for (i = 0; i < obj->nr_maps; i++) - if (obj->maps[i].pinned && !obj->maps[i].reused) - bpf_map__unpin(&obj->maps[i], NULL); +} - bpf_object_unload(obj); - pr_warn("failed to load object '%s'\n", obj->path); - return libbpf_err(err); +int bpf_object__prepare(struct bpf_object *obj) +{ + return libbpf_err(bpf_object_prepare(obj, NULL)); } int bpf_object__load(struct bpf_object *obj) @@ -8871,8 +8924,8 @@ int bpf_object__pin_maps(struct bpf_object *obj, const char *path) if (!obj) return libbpf_err(-ENOENT); - if (obj->state < OBJ_LOADED) { - pr_warn("object not yet loaded; load it first\n"); + if (obj->state < OBJ_PREPARED) { + pr_warn("object not yet loaded/prepared; load/prepare it first\n"); return libbpf_err(-ENOENT); } @@ -9069,6 +9122,14 @@ void bpf_object__close(struct bpf_object *obj) if (IS_ERR_OR_NULL(obj)) return; + /* + * if user called bpf_object__prepare() without ever getting to + * bpf_object__load(), we need to clean up stuff that is normally + * cleaned up at the end of loading step + */ + if (obj->state == OBJ_PREPARED) + bpf_object_post_load_cleanup(obj); + usdt_manager_free(obj->usdt_man); obj->usdt_man = NULL; @@ -10304,7 +10365,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->state >= OBJ_LOADED || map->reused) + if (map->obj->state >= OBJ_PREPARED || map->reused) return libbpf_err(-EBUSY); if (map->mmaped) { @@ -10350,7 +10411,7 @@ int bpf_map__set_initial_value(struct bpf_map *map, { size_t actual_sz; - if (map->obj->state >= OBJ_LOADED || map->reused) + if (map->obj->state >= OBJ_PREPARED || map->reused) return libbpf_err(-EBUSY); if (!map->mmaped || map->libbpf_type == LIBBPF_MAP_KCONFIG) diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 3020ee45303a..09e87998c64e 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -241,6 +241,15 @@ LIBBPF_API struct bpf_object * bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz, const struct bpf_object_open_opts *opts); +/** + * @brief **bpf_object__prepare()** prepares BPF object for loading. + * @param obj Pointer to a valid BPF object instance returned by + * **bpf_object__open*()** API + * @return 0, on success; negative error code, otherwise, error code is + * stored in errno + */ +int bpf_object__prepare(struct bpf_object *obj); + /** * @brief **bpf_object__load()** loads BPF object into kernel. * @param obj Pointer to a valid BPF object instance returned by diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index b5a838de6f47..22edde0bf85e 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -438,4 +438,5 @@ LIBBPF_1.6.0 { bpf_linker__new_fd; btf__add_decl_attr; btf__add_type_attr; + bpf_object__prepare; } LIBBPF_1.5.0; From patchwork Fri Feb 28 17:52:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Yatsenko X-Patchwork-Id: 13996863 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CE6D27127A for ; Fri, 28 Feb 2025 17:53:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740765189; cv=none; b=JWMUsOsQWjzp7HwSA8n+KAvwvMl9GYIddf99U1v0kmL2JeUiNV8UgB1YuDDacLMKXW82m5tYknqWmvQ2J+zPTHjQWiCJLPU6KVsSl4Jwrxue/4tMWXfqKzStGLlg7RRiPhkL4nbZBAqQec00ocHvibK4Lt8b9yrvkBZvFVfHKNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740765189; c=relaxed/simple; bh=5GBOo3r62X/N9yzGkYPhUoSYkiTGhWgxkwe8JrQbfAM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S6dbhk/LynoEKrIYwWHz11bi7jCf2pc1NmqCA+P6Qoqz5ZpBF2mCvXnNk0ctACJqDkVbmiU4Nc3CAXXnnjiUeblNPjD4qGiUFCLD9yVPnxXkVKXjf10AmCnYxwFFdcjk3ZbFw0yJ62AVntgBB2gxDEtzIfs7K1xya3fCNDJbC48= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UFMXFP7j; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UFMXFP7j" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-439a1e8ba83so23239595e9.3 for ; Fri, 28 Feb 2025 09:53:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740765185; x=1741369985; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2p4whArfH9IPn6ptyYPuMDThnFelGkYZfeRUPHSq5NE=; b=UFMXFP7jAZ7O0ZUnU3nXb/WXER0aRd+tEpW9RZ8NUR3NEuEzw2nv80FpXbowQmQb1x /+FMvy/soHxTWCtQHvZR2hysEroXF5zDqHNvmGrVJm2PZt1Wxex2J46Be3jcvaw+4AXY e8Cii2pSo0V94AtogI8RbtsGeX8cdMQpu4Kqj5sVrEgFc42nA7Lmx4BYgvJHsmGL6szV J09DpZgtp9HZ1mAEcsmPAAf3bLy8PysGfM1vI97PEg/7ZyW84pkFxrnu5xKI962iF7If xQKyHTlI7+Wig4PbUEeEDZWTpv+rr81R8O7dmbplC9tYZVWjeHgj1bh6TlDkGnPsQ6BK nObA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740765185; x=1741369985; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2p4whArfH9IPn6ptyYPuMDThnFelGkYZfeRUPHSq5NE=; b=TZso+qRgVfztIizIiRzGBKz9wdrmW43Pa2qddQCHUnorUORiTlNfKkhSDmUyM6sTdd s0GmCj6gCcJG5rdDb924jQpKTT3g0C0GS0Xjm+27gf6822SeJFrLGE+ydiwOGng79osH enYyAzVfUaJYqU59J9smwy8sz46C1s46oM/ohx43HX/mev743qaYvE++Av5UDR994PyV bKgR+g123CMDqHkqZb4w6GpEMlL5T9s8MPulbiYu9Fz613CeSF+86nLhTHdCR+bUCFJu vt9814rLwSDHJe1RKnlfT+FsTbfPaKWdifnOIOQItGJ3d6+7w9+gJo4m2LzzUnGRu+EE R3GA== X-Gm-Message-State: AOJu0Yyvnpl31Ic6LCF5q8D8lVCp8qsZxDNVNOpYpp9q2PAJbrCkAl7C iX2pIfsrLflPchjSqklpet2pgUxAPX+SMlBEk8RVGFLd/xpF4eKHdvf/bQ== X-Gm-Gg: ASbGnctlBbPeZbWrxZL+14Kh7pVP1I695nz7QEBYSFeWGTUDADUFMOoKvPu4oKBE+GZ boH+XOCrkaoJPBblONPgXRmdbsaiZZZ1yDBe4pup907dkfqS57a8hIsuZG7sT7fbt2+VEdvyoFq G6CmJ/jUTK9UJiqH/wxgLmI1u4Ak0hyeIk0sArssQzMgfV42b7YMJkFHVJ6DUfSK7phdf4vI21C 7Rnaq06Hu2poG4l15YIK7/eWLNV+DgBok6f1cLTdKzAEKwXf5Ix28IdKKPQ4Yrf5hsVABwQHqFV feVzKsXMCOS9YRUYWdYdm10NzseoshWRMDAzyrQRHOiRtdr5DDkbefY4ZcCwcWG28y7A7kumuUo WN0okNqYaJht3c3BTkCPi9p+csFjISoU= X-Google-Smtp-Source: AGHT+IHYLvP2tDKFA2jGzJ2JfOWtNtw/kSHH62jefQTwxh3S9dAUVFJv2ZbSZE1RB5IM5yOmqBsPAA== X-Received: by 2002:a05:600c:4444:b0:439:92ca:f01b with SMTP id 5b1f17b1804b1-43ba6708bd2mr38879455e9.13.1740765185305; Fri, 28 Feb 2025 09:53:05 -0800 (PST) Received: from localhost.localdomain (cpc158789-hari22-2-0-cust468.20-2.cable.virginm.net. [86.26.115.213]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47a7b88sm5861664f8f.40.2025.02.28.09.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 09:53:04 -0800 (PST) From: Mykyta Yatsenko To: bpf@vger.kernel.org, ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, kafai@meta.com, kernel-team@meta.com, eddyz87@gmail.com Cc: Mykyta Yatsenko Subject: [PATCH bpf-next 3/3] selftests/bpf: add tests for bpf_object__prepare Date: Fri, 28 Feb 2025 17:52:55 +0000 Message-ID: <20250228175255.254009-4-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250228175255.254009-1-mykyta.yatsenko5@gmail.com> References: <20250228175255.254009-1-mykyta.yatsenko5@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Mykyta Yatsenko Add selftests, checking that running bpf_object__prepare successfully creates maps before load step. Signed-off-by: Mykyta Yatsenko --- .../selftests/bpf/prog_tests/prepare.c | 99 +++++++++++++++++++ tools/testing/selftests/bpf/progs/prepare.c | 28 ++++++ 2 files changed, 127 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/prepare.c create mode 100644 tools/testing/selftests/bpf/progs/prepare.c diff --git a/tools/testing/selftests/bpf/prog_tests/prepare.c b/tools/testing/selftests/bpf/prog_tests/prepare.c new file mode 100644 index 000000000000..fb5cdad97116 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/prepare.c @@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2025 Meta */ + +#include +#include +#include "prepare.skel.h" + +static bool check_prepared(struct bpf_object *obj) +{ + bool is_prepared = true; + const struct bpf_map *map; + + bpf_object__for_each_map(map, obj) { + if (bpf_map__fd(map) < 0) + is_prepared = false; + } + + return is_prepared; +} + +static void test_prepare_no_load(void) +{ + struct prepare *skel; + int err; + LIBBPF_OPTS(bpf_test_run_opts, topts, + .data_in = &pkt_v4, + .data_size_in = sizeof(pkt_v4), + ); + + skel = prepare__open(); + if (!ASSERT_OK_PTR(skel, "prepare__open")) + return; + + if (!ASSERT_FALSE(check_prepared(skel->obj), "not check_prepared")) + goto cleanup; + + err = bpf_object__prepare(skel->obj); + + if (!ASSERT_TRUE(check_prepared(skel->obj), "check_prepared")) + goto cleanup; + + if (!ASSERT_OK(err, "bpf_object__prepare")) + goto cleanup; + +cleanup: + prepare__destroy(skel); +} + +static void test_prepare_load(void) +{ + struct prepare *skel; + int err, prog_fd; + LIBBPF_OPTS(bpf_test_run_opts, topts, + .data_in = &pkt_v4, + .data_size_in = sizeof(pkt_v4), + ); + + skel = prepare__open(); + if (!ASSERT_OK_PTR(skel, "prepare__open")) + return; + + if (!ASSERT_FALSE(check_prepared(skel->obj), "not check_prepared")) + goto cleanup; + + err = bpf_object__prepare(skel->obj); + if (!ASSERT_OK(err, "bpf_object__prepare")) + goto cleanup; + + err = prepare__load(skel); + if (!ASSERT_OK(err, "prepare__load")) + goto cleanup; + + if (!ASSERT_TRUE(check_prepared(skel->obj), "check_prepared")) + goto cleanup; + + prog_fd = bpf_program__fd(skel->progs.program); + if (!ASSERT_GE(prog_fd, 0, "prog_fd")) + goto cleanup; + + err = bpf_prog_test_run_opts(prog_fd, &topts); + if (!ASSERT_OK(err, "test_run_opts err")) + goto cleanup; + + if (!ASSERT_OK(topts.retval, "test_run_opts retval")) + goto cleanup; + + ASSERT_EQ(skel->bss->err, 0, "err"); + +cleanup: + prepare__destroy(skel); +} + +void test_prepare(void) +{ + if (test__start_subtest("prepare_load")) + test_prepare_load(); + if (test__start_subtest("prepare_no_load")) + test_prepare_no_load(); +} diff --git a/tools/testing/selftests/bpf/progs/prepare.c b/tools/testing/selftests/bpf/progs/prepare.c new file mode 100644 index 000000000000..1f1dd547e4ee --- /dev/null +++ b/tools/testing/selftests/bpf/progs/prepare.c @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2025 Meta */ +#include +#include +//#include + +char _license[] SEC("license") = "GPL"; + +int err; + +struct { + __uint(type, BPF_MAP_TYPE_RINGBUF); + __uint(max_entries, 4096); +} ringbuf SEC(".maps"); + +struct { + __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(max_entries, 1); + __type(key, __u32); + __type(value, __u32); +} array_map SEC(".maps"); + +SEC("cgroup_skb/egress") +int program(struct __sk_buff *skb) +{ + err = 0; + return 0; +}