From: Yafang Shao <laoar.shao@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
kafai@fb.com, songliubraving@fb.com, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCH bpf-next 1/4] libbpf: Define DEFAULT_BPFFS
Date: Sat, 23 Apr 2022 14:00:55 +0000 [thread overview]
Message-ID: <20220423140058.54414-2-laoar.shao@gmail.com> (raw)
In-Reply-To: <20220423140058.54414-1-laoar.shao@gmail.com>
Let's use a macro DEFAULT_BPFFS instead of the hard-coded "/sys/fs/bpf".
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
tools/lib/bpf/bpf_helpers.h | 2 +-
tools/lib/bpf/libbpf.c | 2 +-
tools/lib/bpf/libbpf.h | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/lib/bpf/bpf_helpers.h b/tools/lib/bpf/bpf_helpers.h
index 44df982d2a5c..9161ebcd3466 100644
--- a/tools/lib/bpf/bpf_helpers.h
+++ b/tools/lib/bpf/bpf_helpers.h
@@ -137,7 +137,7 @@ struct bpf_map_def {
enum libbpf_pin_type {
LIBBPF_PIN_NONE,
- /* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */
+ /* PIN_BY_NAME: pin maps by name (in DEFAULT_BPFFS by default) */
LIBBPF_PIN_BY_NAME,
};
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 9a213aaaac8a..13fcf91e9e0e 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -2180,7 +2180,7 @@ static int build_map_pin_path(struct bpf_map *map, const char *path)
int len;
if (!path)
- path = "/sys/fs/bpf";
+ path = DEFAULT_BPFFS;
len = snprintf(buf, PATH_MAX, "%s/%s", path, bpf_map__name(map));
if (len < 0)
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index cdbfee60ea3e..3784867811a4 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -28,6 +28,8 @@ LIBBPF_API __u32 libbpf_major_version(void);
LIBBPF_API __u32 libbpf_minor_version(void);
LIBBPF_API const char *libbpf_version_string(void);
+#define DEFAULT_BPFFS "/sys/fs/bpf"
+
enum libbpf_errno {
__LIBBPF_ERRNO__START = 4000,
@@ -91,7 +93,7 @@ struct bpf_object_open_opts {
bool relaxed_core_relocs;
/* maps that set the 'pinning' attribute in their definition will have
* their pin_path attribute set to a file in this directory, and be
- * auto-pinned to that path on load; defaults to "/sys/fs/bpf".
+ * auto-pinned to that path on load; defaults to DEFAULT_BPFFS.
*/
const char *pin_root_path;
@@ -190,7 +192,7 @@ bpf_object__open_xattr(struct bpf_object_open_attr *attr);
enum libbpf_pin_type {
LIBBPF_PIN_NONE,
- /* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */
+ /* PIN_BY_NAME: pin maps by name (in DEFAULT_BPFFS by default) */
LIBBPF_PIN_BY_NAME,
};
--
2.17.1
next prev parent reply other threads:[~2022-04-23 14:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-23 14:00 [PATCH bpf-next 0/4] bpf: Generate helpers for pinning through bpf object skeleton Yafang Shao
2022-04-23 14:00 ` Yafang Shao [this message]
2022-04-25 13:47 ` [PATCH bpf-next 1/4] libbpf: Define DEFAULT_BPFFS Daniel Borkmann
2022-04-26 6:45 ` Andrii Nakryiko
2022-04-26 16:12 ` Yafang Shao
2022-04-23 14:00 ` [PATCH bpf-next 2/4] libbpf: Add helpers for pinning bpf prog through bpf object skeleton Yafang Shao
2022-04-25 13:57 ` Daniel Borkmann
2022-04-26 15:58 ` Yafang Shao
2022-04-26 23:15 ` Andrii Nakryiko
2022-04-27 14:45 ` Yafang Shao
2022-04-27 15:47 ` Yafang Shao
2022-04-27 18:51 ` Andrii Nakryiko
2022-04-23 14:00 ` [PATCH bpf-next 3/4] bpftool: Fix incorrect return in generated detach helper Yafang Shao
2022-04-26 6:47 ` Andrii Nakryiko
2022-04-26 16:14 ` Yafang Shao
2022-04-23 14:00 ` [PATCH bpf-next 4/4] bpftool: Generate helpers for pinning prog through bpf object skeleton Yafang Shao
2022-04-25 14:03 ` Daniel Borkmann
2022-04-26 16:00 ` Yafang Shao
2022-04-26 6:45 ` [PATCH bpf-next 0/4] bpf: Generate helpers for pinning " Andrii Nakryiko
2022-04-26 16:09 ` Yafang Shao
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=20220423140058.54414-2-laoar.shao@gmail.com \
--to=laoar.shao@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--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).