From: Brian Vazquez <brianvv@google.com>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Brian Vazquez <brianvv.kernel@gmail.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
"David S . Miller" <davem@davemloft.net>,
Yonghong Song <yhs@fb.com>, Stanislav Fomichev <sdf@google.com>,
Petar Penkov <ppenkov@google.com>,
Willem de Bruijn <willemb@google.com>,
open list <linux-kernel@vger.kernel.org>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH v4 bpf-next 7/9] libbpf: add libbpf support to batch ops
Date: Tue, 14 Jan 2020 10:53:48 -0800 [thread overview]
Message-ID: <CAMzD94ScYuQfvx2FLY7RAzgZ8xO-E31L79dGEJH-tNDKJzrmOg@mail.gmail.com> (raw)
In-Reply-To: <CAEf4BzYEGv-q7p0rK-d94Ng0fyQLuTEvsy1ZSzTdk0xZcyibQA@mail.gmail.com>
On Tue, Jan 14, 2020 at 10:36 AM Andrii Nakryiko
<andrii.nakryiko@gmail.com> wrote:
>
> On Tue, Jan 14, 2020 at 8:46 AM Brian Vazquez <brianvv@google.com> wrote:
> >
> > From: Yonghong Song <yhs@fb.com>
> >
> > Added four libbpf API functions to support map batch operations:
> > . int bpf_map_delete_batch( ... )
> > . int bpf_map_lookup_batch( ... )
> > . int bpf_map_lookup_and_delete_batch( ... )
> > . int bpf_map_update_batch( ... )
> >
> > Signed-off-by: Yonghong Song <yhs@fb.com>
> > ---
> > tools/lib/bpf/bpf.c | 60 ++++++++++++++++++++++++++++++++++++++++
> > tools/lib/bpf/bpf.h | 22 +++++++++++++++
> > tools/lib/bpf/libbpf.map | 4 +++
> > 3 files changed, 86 insertions(+)
> >
> > diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
> > index 500afe478e94a..12ce8d275f7dc 100644
> > --- a/tools/lib/bpf/bpf.c
> > +++ b/tools/lib/bpf/bpf.c
> > @@ -452,6 +452,66 @@ int bpf_map_freeze(int fd)
> > return sys_bpf(BPF_MAP_FREEZE, &attr, sizeof(attr));
> > }
> >
> > +static int bpf_map_batch_common(int cmd, int fd, void *in_batch,
> > + void *out_batch, void *keys, void *values,
> > + __u32 *count,
> > + const struct bpf_map_batch_opts *opts)
> > +{
> > + union bpf_attr attr = {};
> > + int ret;
> > +
> > + if (!OPTS_VALID(opts, bpf_map_batch_opts))
> > + return -EINVAL;
> > +
> > + memset(&attr, 0, sizeof(attr));
> > + attr.batch.map_fd = fd;
> > + attr.batch.in_batch = ptr_to_u64(in_batch);
> > + attr.batch.out_batch = ptr_to_u64(out_batch);
> > + attr.batch.keys = ptr_to_u64(keys);
> > + attr.batch.values = ptr_to_u64(values);
> > + if (count)
> > + attr.batch.count = *count;
> > + attr.batch.elem_flags = OPTS_GET(opts, elem_flags, 0);
> > + attr.batch.flags = OPTS_GET(opts, flags, 0);
> > +
> > + ret = sys_bpf(cmd, &attr, sizeof(attr));
> > + if (count)
> > + *count = attr.batch.count;
>
> what if syscall failed, do you still want to assign *count then?
Hi Andrii, thanks for taking a look.
attr.batch.count should report the number of entries correctly
processed before finding and error, an example could be when you
provided a buffer for 3 entries and the map only has 1, ret is going
to be -ENOENT meaning that you traversed the map and you still want to
assign *count.
That being said, the condition 'if (count)' is wrong and I think it
should be removed.
>
> > +
> > + return ret;
> > +}
> > +
>
> [...]
next prev parent reply other threads:[~2020-01-14 18:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 16:46 [PATCH v4 bpf-next 0/9] add bpf batch ops to process more than 1 elem Brian Vazquez
2020-01-14 16:46 ` [PATCH v4 bpf-next 1/9] bpf: add bpf_map_{value_size,update_value,map_copy_value} functions Brian Vazquez
2020-01-14 16:46 ` [PATCH v4 bpf-next 2/9] bpf: add generic support for lookup batch op Brian Vazquez
2020-01-14 16:46 ` [PATCH v4 bpf-next 3/9] bpf: add generic support for update and delete batch ops Brian Vazquez
2020-01-14 16:46 ` [PATCH v4 bpf-next 4/9] bpf: add lookup and update batch ops to arraymap Brian Vazquez
2020-01-14 16:46 ` [PATCH v4 bpf-next 4/9] bpf: add lookup and updated " Brian Vazquez
2020-01-14 16:46 ` [PATCH v4 bpf-next 5/9] bpf: add batch ops to all htab bpf map Brian Vazquez
2020-01-14 22:56 ` Yonghong Song
2020-01-14 23:49 ` Brian Vazquez
2020-01-15 1:03 ` Yonghong Song
2020-01-14 16:46 ` [PATCH v4 bpf-next 6/9] tools/bpf: sync uapi header bpf.h Brian Vazquez
2020-01-14 16:46 ` [PATCH v4 bpf-next 7/9] libbpf: add libbpf support to batch ops Brian Vazquez
2020-01-14 18:36 ` Andrii Nakryiko
2020-01-14 18:53 ` Brian Vazquez [this message]
2020-01-14 19:13 ` Andrii Nakryiko
2020-01-14 19:24 ` Brian Vazquez
2020-01-14 21:33 ` Yonghong Song
2020-01-14 16:46 ` [PATCH v4 bpf-next 8/9] selftests/bpf: add batch ops testing for htab and htab_percpu map Brian Vazquez
2020-01-14 16:46 ` [PATCH v4 bpf-next 9/9] selftests/bpf: add batch ops testing to array bpf map Brian Vazquez
2020-01-15 0:46 ` Andrii Nakryiko
2020-01-14 23:12 ` [PATCH v4 bpf-next 0/9] add bpf batch ops to process more than 1 elem Yonghong Song
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=CAMzD94ScYuQfvx2FLY7RAzgZ8xO-E31L79dGEJH-tNDKJzrmOg@mail.gmail.com \
--to=brianvv@google.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brianvv.kernel@gmail.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ppenkov@google.com \
--cc=sdf@google.com \
--cc=willemb@google.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).