From: Florent Revest <revest@chromium.org>
To: bpf@vger.kernel.org
Cc: andrii@kernel.org, kpsingh@kernel.org, jackmanb@google.com,
linux-kernel@vger.kernel.org,
Florent Revest <revest@chromium.org>
Subject: [PATCH bpf-next] libbpf: Add ability to clear per-program load flags
Date: Thu, 18 Nov 2021 11:33:35 +0100 [thread overview]
Message-ID: <20211118103335.1208372-1-revest@chromium.org> (raw)
Recently, bpf_program__flags and bpf_program__set_extra_flags were
introduced to the libbpf API but they only allow adding load flags.
We have a use-case where we construct a skeleton with a sleepable
program and if it fails to load then we want to make it non-sleepable by
clearing BPF_F_SLEEPABLE.
Signed-off-by: Florent Revest <revest@chromium.org>
---
tools/lib/bpf/libbpf.c | 9 +++++++++
tools/lib/bpf/libbpf.h | 1 +
tools/lib/bpf/libbpf.map | 1 +
3 files changed, 11 insertions(+)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index de7e09a6b5ec..dcb7fced5fd2 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -8305,6 +8305,15 @@ int bpf_program__set_extra_flags(struct bpf_program *prog, __u32 extra_flags)
return 0;
}
+int bpf_program__clear_flags(struct bpf_program *prog, __u32 flags)
+{
+ if (prog->obj->loaded)
+ return libbpf_err(-EBUSY);
+
+ prog->prog_flags &= ~flags;
+ return 0;
+}
+
#define SEC_DEF(sec_pfx, ptype, atype, flags, ...) { \
.sec = sec_pfx, \
.prog_type = BPF_PROG_TYPE_##ptype, \
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index 4ec69f224342..08f108e49841 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -495,6 +495,7 @@ bpf_program__set_expected_attach_type(struct bpf_program *prog,
LIBBPF_API __u32 bpf_program__flags(const struct bpf_program *prog);
LIBBPF_API int bpf_program__set_extra_flags(struct bpf_program *prog, __u32 extra_flags);
+LIBBPF_API int bpf_program__clear_flags(struct bpf_program *prog, __u32 flags);
LIBBPF_API int
bpf_program__set_attach_target(struct bpf_program *prog, int attach_prog_fd,
diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
index 6a59514a48cf..eeff700240dc 100644
--- a/tools/lib/bpf/libbpf.map
+++ b/tools/lib/bpf/libbpf.map
@@ -401,6 +401,7 @@ LIBBPF_0.6.0 {
bpf_program__insn_cnt;
bpf_program__insns;
bpf_program__set_extra_flags;
+ bpf_program__clear_flags;
btf__add_btf;
btf__add_decl_tag;
btf__add_type_tag;
--
2.34.0.rc2.393.gf8c9666880-goog
next reply other threads:[~2021-11-18 10:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 10:33 Florent Revest [this message]
2021-11-18 17:49 ` [PATCH bpf-next] libbpf: Add ability to clear per-program load flags Andrii Nakryiko
2021-11-18 20:29 ` Florent Revest
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211118103335.1208372-1-revest@chromium.org \
--to=revest@chromium.org \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=jackmanb@google.com \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).