From: "Toke Høiland-Jørgensen" <toke@redhat.com>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
Jesper Dangaard Brouer <brouer@redhat.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf-next v4 2/5] libbpf: Store map pin path and status in struct bpf_map
Date: Thu, 31 Oct 2019 18:26:48 +0100 [thread overview]
Message-ID: <875zk4omg7.fsf@toke.dk> (raw)
In-Reply-To: <CAEf4BzZ4pRLhwX+5Hh1jKsEhBAkrZbC14rBgAVgUt1gf3qJ+KQ@mail.gmail.com>
Andrii Nakryiko <andrii.nakryiko@gmail.com> writes:
> On Tue, Oct 29, 2019 at 12:39 PM Toke Høiland-Jørgensen <toke@redhat.com> wrote:
>>
>> From: Toke Høiland-Jørgensen <toke@redhat.com>
>>
>> Support storing and setting a pin path in struct bpf_map, which can be used
>> for automatic pinning. Also store the pin status so we can avoid attempts
>> to re-pin a map that has already been pinned (or reused from a previous
>> pinning).
>>
>> The behaviour of bpf_object__{un,}pin_maps() is changed so that if it is
>> called with a NULL path argument (which was previously illegal), it will
>> (un)pin only those maps that have a pin_path set.
>>
>> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
>> ---
>
> Looks good, thanks! Just some minor things to fix up below.
>
> Acked-by: Andrii Nakryiko <andriin@fb.com>
>
>> tools/lib/bpf/libbpf.c | 164 +++++++++++++++++++++++++++++++++++-----------
>> tools/lib/bpf/libbpf.h | 8 ++
>> tools/lib/bpf/libbpf.map | 3 +
>> 3 files changed, 134 insertions(+), 41 deletions(-)
>>
>> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
>> index ce5ef3ddd263..fd11f6aeb32c 100644
>> --- a/tools/lib/bpf/libbpf.c
>> +++ b/tools/lib/bpf/libbpf.c
>> @@ -226,6 +226,8 @@ struct bpf_map {
>> void *priv;
>> bpf_map_clear_priv_t clear_priv;
>> enum libbpf_map_type libbpf_type;
>> + char *pin_path;
>> + bool pinned;
>> };
>>
>> struct bpf_secdata {
>> @@ -4025,47 +4027,119 @@ int bpf_map__pin(struct bpf_map *map, const char *path)
>> char *cp, errmsg[STRERR_BUFSIZE];
>> int err;
>>
>> - err = check_path(path);
>> - if (err)
>> - return err;
>> -
>> if (map == NULL) {
>> pr_warn("invalid map pointer\n");
>> return -EINVAL;
>> }
>>
>> - if (bpf_obj_pin(map->fd, path)) {
>> - cp = libbpf_strerror_r(errno, errmsg, sizeof(errmsg));
>> - pr_warn("failed to pin map: %s\n", cp);
>> - return -errno;
>> + if (map->pin_path) {
>> + if (path && strcmp(path, map->pin_path)) {
>> + pr_warn("map '%s' already has pin path '%s' different from '%s'\n",
>> + bpf_map__name(map), map->pin_path, path);
>> + return -EINVAL;
>> + } else if (map->pinned) {
>> + pr_debug("map '%s' already pinned at '%s'; not re-pinning\n",
>> + bpf_map__name(map), map->pin_path);
>> + return 0;
>> + }
>
> `if (map->pinned)` check is the same in both branches, so I'd do it
> first, before this map->pin_path if/else.
But it's not. It's debug & return if pin_path is set, and an error
otherwise.
Will fix the rest of your nits :)
-Toke
next prev parent reply other threads:[~2019-10-31 17:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 19:39 [PATCH bpf-next v4 0/5] libbpf: Support automatic pinning of maps using 'pinning' BTF attribute Toke Høiland-Jørgensen
2019-10-29 19:39 ` [PATCH bpf-next v4 1/5] libbpf: Fix error handling in bpf_map__reuse_fd() Toke Høiland-Jørgensen
2019-10-29 19:39 ` [PATCH bpf-next v4 2/5] libbpf: Store map pin path and status in struct bpf_map Toke Høiland-Jørgensen
2019-10-31 17:22 ` Andrii Nakryiko
2019-10-31 17:26 ` Toke Høiland-Jørgensen [this message]
2019-10-31 17:28 ` Andrii Nakryiko
2019-10-31 17:31 ` Toke Høiland-Jørgensen
2019-10-31 17:43 ` Andrii Nakryiko
2019-10-29 19:39 ` [PATCH bpf-next v4 3/5] libbpf: Move directory creation into _pin() functions Toke Høiland-Jørgensen
2019-10-31 17:27 ` Andrii Nakryiko
2019-10-29 19:39 ` [PATCH bpf-next v4 4/5] libbpf: Add auto-pinning of maps when loading BPF objects Toke Høiland-Jørgensen
2019-10-31 17:37 ` Andrii Nakryiko
2019-10-31 17:52 ` Andrii Nakryiko
2019-10-31 18:06 ` Toke Høiland-Jørgensen
2019-10-29 19:39 ` [PATCH bpf-next v4 5/5] selftests: Add tests for automatic map pinning Toke Høiland-Jørgensen
2019-10-31 18:02 ` Andrii Nakryiko
2019-10-31 18:18 ` Toke Høiland-Jørgensen
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=875zk4omg7.fsf@toke.dk \
--to=toke@redhat.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=kafai@fb.com \
--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).