From: Florent Revest <revest@chromium.org>
To: bpf@vger.kernel.org
Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
yhs@fb.com, kpsingh@kernel.org, jackmanb@chromium.org,
linux-kernel@vger.kernel.org,
Florent Revest <revest@chromium.org>
Subject: [PATCH bpf-next v4 5/6] libbpf: Introduce a BPF_SNPRINTF helper macro
Date: Wed, 14 Apr 2021 20:54:05 +0200 [thread overview]
Message-ID: <20210414185406.917890-6-revest@chromium.org> (raw)
In-Reply-To: <20210414185406.917890-1-revest@chromium.org>
Similarly to BPF_SEQ_PRINTF, this macro turns variadic arguments into an
array of u64, making it more natural to call the bpf_snprintf helper.
Signed-off-by: Florent Revest <revest@chromium.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
---
tools/lib/bpf/bpf_tracing.h | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h
index 1c2e91ee041d..8c954ebc0c7c 100644
--- a/tools/lib/bpf/bpf_tracing.h
+++ b/tools/lib/bpf/bpf_tracing.h
@@ -447,4 +447,22 @@ static __always_inline typeof(name(0)) ____##name(struct pt_regs *ctx, ##args)
___param, sizeof(___param)); \
})
+/*
+ * BPF_SNPRINTF wraps the bpf_snprintf helper with variadic arguments instead of
+ * an array of u64.
+ */
+#define BPF_SNPRINTF(out, out_size, fmt, args...) \
+({ \
+ static const char ___fmt[] = fmt; \
+ unsigned long long ___param[___bpf_narg(args)]; \
+ \
+ _Pragma("GCC diagnostic push") \
+ _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \
+ ___bpf_fill(___param, args); \
+ _Pragma("GCC diagnostic pop") \
+ \
+ bpf_snprintf(out, out_size, ___fmt, \
+ ___param, sizeof(___param)); \
+})
+
#endif
--
2.31.1.295.g9ea45b61b8-goog
next prev parent reply other threads:[~2021-04-14 18:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 18:54 [PATCH bpf-next v4 0/6] Add a snprintf eBPF helper Florent Revest
2021-04-14 18:54 ` [PATCH bpf-next v4 1/6] bpf: Factorize bpf_trace_printk and bpf_seq_printf Florent Revest
2021-04-15 0:37 ` Andrii Nakryiko
2021-04-15 9:32 ` Florent Revest
2021-04-15 22:37 ` Andrii Nakryiko
2021-04-14 18:54 ` [PATCH bpf-next v4 2/6] bpf: Add a ARG_PTR_TO_CONST_STR argument type Florent Revest
2021-04-14 18:54 ` [PATCH bpf-next v4 3/6] bpf: Add a bpf_snprintf helper Florent Revest
2021-04-15 23:11 ` Andrii Nakryiko
2021-04-14 18:54 ` [PATCH bpf-next v4 4/6] libbpf: Initialize the bpf_seq_printf parameters array field by field Florent Revest
2021-04-14 18:54 ` Florent Revest [this message]
2021-04-14 18:54 ` [PATCH bpf-next v4 6/6] selftests/bpf: Add a series of tests for bpf_snprintf Florent Revest
2021-04-15 23:20 ` Andrii Nakryiko
2021-04-16 11:43 ` 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=20210414185406.917890-6-revest@chromium.org \
--to=revest@chromium.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jackmanb@chromium.org \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=yhs@fb.com \
/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).