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 2/4] bpf: Add pin_name into struct bpf_map
Date: Fri, 11 Feb 2022 12:11:43 +0000 [thread overview]
Message-ID: <20220211121145.35237-3-laoar.shao@gmail.com> (raw)
In-Reply-To: <20220211121145.35237-1-laoar.shao@gmail.com>
A new member pin_name is added into struct bpf_map, which will set when
the map is pinned and cleared when the pinned file is removed.
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
include/linux/bpf.h | 1 +
kernel/bpf/inode.c | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 9cf8055..220de69 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -182,6 +182,7 @@ struct bpf_map {
struct mem_cgroup *memcg;
#endif
char name[BPF_OBJ_NAME_LEN];
+ char pin_name[BPF_PIN_NAME_LEN];
bool bypass_spec_v1;
bool frozen; /* write-once; write-protected by freeze_mutex */
/* 14 bytes hole */
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index f1a8811..586adef 100644
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -440,6 +440,7 @@ static int bpf_obj_do_pin(const char __user *pathname, void *raw,
struct bpf_prog_aux *aux;
struct bpf_prog *prog;
struct dentry *dentry;
+ struct bpf_map *map;
struct inode *dir;
struct path path;
umode_t mode;
@@ -470,6 +471,9 @@ static int bpf_obj_do_pin(const char __user *pathname, void *raw,
ret = vfs_mkobj(dentry, mode, bpf_mkprog, raw);
break;
case BPF_TYPE_MAP:
+ map = raw;
+ (void) strncpy_from_user(map->pin_name, pathname, BPF_PIN_NAME_LEN);
+ map->pin_name[BPF_PIN_NAME_LEN - 1] = '\0';
ret = vfs_mkobj(dentry, mode, bpf_mkmap, raw);
break;
case BPF_TYPE_LINK:
@@ -619,6 +623,7 @@ static void bpf_free_inode(struct inode *inode)
{
struct bpf_prog_aux *aux;
struct bpf_prog *prog;
+ struct bpf_map *map;
enum bpf_type type;
if (S_ISLNK(inode->i_mode))
@@ -630,6 +635,10 @@ static void bpf_free_inode(struct inode *inode)
aux = prog->aux;
aux->pin_name[0] = '\0';
break;
+ case BPF_TYPE_MAP:
+ map = inode->i_private;
+ map->pin_name[0] = '\0';
+ break;
default:
break;
}
--
1.8.3.1
next prev parent reply other threads:[~2022-02-11 12:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-11 12:11 [PATCH 0/4] bpf: Add more information into bpffs Yafang Shao
2022-02-11 12:11 ` [PATCH 1/4] bpf: Add pin_name into struct bpf_prog_aux Yafang Shao
2022-02-11 12:43 ` Daniel Borkmann
2022-02-11 12:44 ` Daniel Borkmann
2022-02-13 11:28 ` Yafang Shao
2022-02-13 11:27 ` Yafang Shao
2022-02-11 17:58 ` kernel test robot
2022-02-13 11:29 ` Yafang Shao
2022-02-11 12:11 ` Yafang Shao [this message]
2022-02-11 12:11 ` [PATCH 3/4] bpf: Show pinned file name in {progs, maps}.debug Yafang Shao
2022-02-11 12:11 ` [PATCH 4/4] bpf: Show the used maps of each prog in progs.debug 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=20220211121145.35237-3-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