From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4F4FC43334 for ; Wed, 20 Jul 2022 23:15:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230021AbiGTXPN (ORCPT ); Wed, 20 Jul 2022 19:15:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230496AbiGTXPL (ORCPT ); Wed, 20 Jul 2022 19:15:11 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31F252DC9 for ; Wed, 20 Jul 2022 16:15:10 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id 17so176487pfy.0 for ; Wed, 20 Jul 2022 16:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QK88BVgJlmAz1EW2ZNSUHSTLu9SQM8onquvpl9HH+wY=; b=AxK8APEdrJ445WLTV47CbDB2Lj+CyXjlSVZ8bxpnaGF+FSZeibiuGt5iRqW2FO1ucm MBb7XKq2VapoCg2cjQFXa6cblm5ayNBUhiZO04XGg79fWULvYzm8MDtt/WrrwhZZU+D4 UVLxbe9W5YMR9/20sqEsRbxYlG3YGxRJEAt1rwkznN/p1qSC4GRVUBCdoEM9OuYhwapE xIEEMcfDQv1RGa4l200xH2/gTpr35bqAlBxdVb2A+txnJjpcUCj+J3eAm1Rq6YhbNlb8 pDbkPT80CJHeyf7E8/cQjc578F9cdyzr/IpOSU/O84Pdr7uYATDQHjHvg9bmX21EfOJO WeQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QK88BVgJlmAz1EW2ZNSUHSTLu9SQM8onquvpl9HH+wY=; b=Fhh0wY8m25xOUnAcIcVPNWnh3wh8Aa6ob7mGv+UmQGfx5akK87Y6O5vaOsQEoErd6Z l0V6n+SNQE7FyJ/xZG+UThDB9IQ8xT5i3wrNpl6rK4CnTOMJ27JRETjMxFcfhmYAXHIV jYdS0AmPgajSfXGWWz6jDClA1dxwImw+G8zjfp3wBidwSYeVmuCck/eaVVaq8VMo2vDB j6fXOKvJQ5HOL7ToxBfd8T/H81SVLNfXxc2xGVi+acGLXpiwU55J3WZBRP5j5zMD9/Y+ KE89TL0t4NrvpeCQXAfvj+se+xPbv5OS8u1UYM7DjtAL/nrowUuk8WVAxFiLYBvUDoor 03RQ== X-Gm-Message-State: AJIora/O3pTxS4oyqcJM4UW15qAhnJwDpEEcP8oDGeWsLyf9Cz+iazV+ t/HgTzaY6Jm1BYxapdqBGBBnMhOX748MChiRKMwl2w== X-Google-Smtp-Source: AGRyM1tpBgFKPXIrRQ2Nuay2e3tm4i6DmYA9x1YOjhO9tEUHV4z0qJlPrRHaot14IkK2woHdeCSoCK+nPTQ57HLkIB0= X-Received: by 2002:a05:6a00:428e:b0:52b:7e40:56cf with SMTP id bx14-20020a056a00428e00b0052b7e4056cfmr14535895pfb.72.1658358909163; Wed, 20 Jul 2022 16:15:09 -0700 (PDT) MIME-Version: 1.0 References: <20220719194028.4180569-1-jevburton.kernel@gmail.com> <179cfb89be0e4f928a55d049fe62aa9e@huawei.com> <31473ddf364f4f16becfd5cd4b9cd7d2@huawei.com> <0c284e09817e4e699aa448aa25af5d79@huawei.com> In-Reply-To: From: Stanislav Fomichev Date: Wed, 20 Jul 2022 16:14:58 -0700 Message-ID: Subject: Re: [PATCH v2 bpf-next] libbpf: Add bpf_obj_get_opts() To: Roberto Sassu Cc: Joe Burton , Andrii Nakryiko , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Hao Luo , Jiri Olsa , "bpf@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Joe Burton Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 20, 2022 at 4:12 PM Roberto Sassu wrote: > > > From: Stanislav Fomichev [mailto:sdf@google.com] > > Sent: Thursday, July 21, 2022 1:09 AM > > On Wed, Jul 20, 2022 at 4:02 PM Roberto Sassu > > wrote: > > > > > > > From: Stanislav Fomichev [mailto:sdf@google.com] > > > > Sent: Thursday, July 21, 2022 12:48 AM > > > > On Wed, Jul 20, 2022 at 3:44 PM Roberto Sassu > > > > > > wrote: > > > > > > > > > > > From: Stanislav Fomichev [mailto:sdf@google.com] > > > > > > Sent: Thursday, July 21, 2022 12:38 AM > > > > > > On Wed, Jul 20, 2022 at 3:30 PM Roberto Sassu > > > > > > > > > > wrote: > > > > > > > > > > > > > > > From: Stanislav Fomichev [mailto:sdf@google.com] > > > > > > > > Sent: Wednesday, July 20, 2022 5:57 PM > > > > > > > > On Wed, Jul 20, 2022 at 1:02 AM Roberto Sassu > > > > > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > From: Stanislav Fomichev [mailto:sdf@google.com] > > > > > > > > > > Sent: Tuesday, July 19, 2022 10:40 PM > > > > > > > > > > On Tue, Jul 19, 2022 at 12:40 PM Joe Burton > > > > > > > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > From: Joe Burton > > > > > > > > > > > > > > > > > > > > > > Add an extensible variant of bpf_obj_get() capable of setting the > > > > > > > > > > > `file_flags` parameter. > > > > > > > > > > > > > > > > > > > > > > This parameter is needed to enable unprivileged access to BPF > > > > maps. > > > > > > > > > > > Without a method like this, users must manually make the > > syscall. > > > > > > > > > > > > > > > > > > > > > > Signed-off-by: Joe Burton > > > > > > > > > > > > > > > > > > > > Reviewed-by: Stanislav Fomichev > > > > > > > > > > > > > > > > > > > > For context: > > > > > > > > > > We've found this out while we were trying to add support for > > unpriv > > > > > > > > > > processes to open pinned r-x maps. > > > > > > > > > > Maybe this deserves a test as well? Not sure. > > > > > > > > > > > > > > > > > > Hi Stanislav, Joe > > > > > > > > > > > > > > > > > > I noticed now this patch. I'm doing a broader work to add opts > > > > > > > > > to bpf_*_get_fd_by_id(). I also adjusted permissions of bpftool > > > > > > > > > depending on the operation type (e.g. show, dump: > > BPF_F_RDONLY). > > > > > > > > > > > > > > > > > > Will send it soon (I'm trying to solve an issue with the CI, where > > > > > > > > > libbfd is not available in the VM doing actual tests). > > > > > > > > > > > > > > > > Is something like this patch included in your series as well? Can you > > > > > > > > use this new interface or do you need something different? > > > > > > > > > > > > > > It is very similar. Except that I called it bpf_get_fd_opts, as it > > > > > > > is shared with the bpf_*_get_fd_by_id() functions. The member > > > > > > > name is just flags, plus an extra u32 for alignment. > > > > > > > > > > > > We can bikeshed the naming, but we've been using existing conventions > > > > > > where opts fields match syscall fields, that seems like a sensible > > > > > > thing to do? > > > > > > > > > > The only problem is that bpf_*_get_fd_by_id() functions would > > > > > set the open_flags member of bpf_attr. > > > > > > > > > > Flags would be good for both, even if not exact. Believe me, > > > > > duplicating the opts would just create more confusion. > > > > > > > > Wait, that's completely different, right? We are talking here about > > > > BPF_OBJ_GET (which has related BPF_OBJ_PIN). > > > > Your GET_XXX_BY_ID are different so you'll still have to have another > > > > wrapper with opts? > > > > > > Yes, they have different wrappers, just accept the same opts as > > > obj_get(). From bpftool subcommands you want to set the correct > > > permission, and propagate it uniformly to bpf_*_get_fd_by_id() > > > or obj_get(). See map_parse_fds(). > > > > I don't think they are accepting the same opts. > > > > For our case, we care about: > > > > struct { /* anonymous struct used by BPF_OBJ_* commands */ > > __aligned_u64 pathname; > > __u32 bpf_fd; > > __u32 file_flags; > > }; > > > > For your case, you care about: > > > > struct { /* anonymous struct used by BPF_*_GET_*_ID */ > > union { > > __u32 start_id; > > __u32 prog_id; > > __u32 map_id; > > __u32 btf_id; > > __u32 link_id; > > }; > > __u32 next_id; > > __u32 open_flags; > > }; > > > > So your new _opts libbpf routine should be independent of what Joe is > > doing here. > > It is. Just I use the same opts to set file_flags or open_flags. That seems confusing. Let's have separate calls for separate syscall commands as we do already? > Roberto > > > > Roberto > > > > > > > > > > It needs to be shared, as there are functions in bpftool calling > > > > > > > both. Since the meaning of flags is the same, seems ok sharing. > > > > > > > > > > > > So I guess there are no objections to the current patch? If it gets > > > > > > accepted, you should be able to drop some of your code and use this > > > > > > new bpf_obj_get_opts.. > > > > > > > > > > If you use a name good also for bpf_*_get_fd_by_id() and flags > > > > > as structure member name, that would be ok. > > > > > > > > > > Roberto > > > > > > > > > > > > Roberto > > > > > > > > > > > > > > > > Roberto > > > > > > > > > > > > > > > > > > > > --- > > > > > > > > > > > tools/lib/bpf/bpf.c | 10 ++++++++++ > > > > > > > > > > > tools/lib/bpf/bpf.h | 9 +++++++++ > > > > > > > > > > > tools/lib/bpf/libbpf.map | 1 + > > > > > > > > > > > 3 files changed, 20 insertions(+) > > > > > > > > > > > > > > > > > > > > > > diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c > > > > > > > > > > > index 5eb0df90eb2b..5acb0e8bd13c 100644 > > > > > > > > > > > --- a/tools/lib/bpf/bpf.c > > > > > > > > > > > +++ b/tools/lib/bpf/bpf.c > > > > > > > > > > > @@ -578,12 +578,22 @@ int bpf_obj_pin(int fd, const char > > > > > > *pathname) > > > > > > > > > > > } > > > > > > > > > > > > > > > > > > > > > > int bpf_obj_get(const char *pathname) > > > > > > > > > > > +{ > > > > > > > > > > > + LIBBPF_OPTS(bpf_obj_get_opts, opts); > > > > > > > > > > > + return bpf_obj_get_opts(pathname, &opts); > > > > > > > > > > > +} > > > > > > > > > > > + > > > > > > > > > > > +int bpf_obj_get_opts(const char *pathname, const struct > > > > > > > > bpf_obj_get_opts > > > > > > > > > > *opts) > > > > > > > > > > > { > > > > > > > > > > > union bpf_attr attr; > > > > > > > > > > > int fd; > > > > > > > > > > > > > > > > > > > > > > + if (!OPTS_VALID(opts, bpf_obj_get_opts)) > > > > > > > > > > > + return libbpf_err(-EINVAL); > > > > > > > > > > > + > > > > > > > > > > > memset(&attr, 0, sizeof(attr)); > > > > > > > > > > > attr.pathname = ptr_to_u64((void *)pathname); > > > > > > > > > > > + attr.file_flags = OPTS_GET(opts, file_flags, 0); > > > > > > > > > > > > > > > > > > > > > > fd = sys_bpf_fd(BPF_OBJ_GET, &attr, sizeof(attr)); > > > > > > > > > > > return libbpf_err_errno(fd); > > > > > > > > > > > diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h > > > > > > > > > > > index 88a7cc4bd76f..f31b493b5f9a 100644 > > > > > > > > > > > --- a/tools/lib/bpf/bpf.h > > > > > > > > > > > +++ b/tools/lib/bpf/bpf.h > > > > > > > > > > > @@ -270,8 +270,17 @@ LIBBPF_API int > > bpf_map_update_batch(int > > > > fd, > > > > > > > > const > > > > > > > > > > void *keys, const void *values > > > > > > > > > > > __u32 *count, > > > > > > > > > > > const struct bpf_map_batch_opts *opts); > > > > > > > > > > > > > > > > > > > > > > +struct bpf_obj_get_opts { > > > > > > > > > > > + size_t sz; /* size of this struct for forward/backward > > > > compatibility > > > > > > */ > > > > > > > > > > > + > > > > > > > > > > > + __u32 file_flags; > > > > > > > > > > > +}; > > > > > > > > > > > +#define bpf_obj_get_opts__last_field file_flags > > > > > > > > > > > + > > > > > > > > > > > LIBBPF_API int bpf_obj_pin(int fd, const char *pathname); > > > > > > > > > > > LIBBPF_API int bpf_obj_get(const char *pathname); > > > > > > > > > > > +LIBBPF_API int bpf_obj_get_opts(const char *pathname, > > > > > > > > > > > + const struct bpf_obj_get_opts *opts); > > > > > > > > > > > > > > > > > > > > > > struct bpf_prog_attach_opts { > > > > > > > > > > > size_t sz; /* size of this struct for forward/backward > > > > compatibility > > > > > > */ > > > > > > > > > > > diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map > > > > > > > > > > > index 0625adb9e888..119e6e1ea7f1 100644 > > > > > > > > > > > --- a/tools/lib/bpf/libbpf.map > > > > > > > > > > > +++ b/tools/lib/bpf/libbpf.map > > > > > > > > > > > @@ -355,6 +355,7 @@ LIBBPF_0.8.0 { > > > > > > > > > > > > > > > > > > > > > > LIBBPF_1.0.0 { > > > > > > > > > > > global: > > > > > > > > > > > + bpf_obj_get_opts; > > > > > > > > > > > bpf_prog_query_opts; > > > > > > > > > > > bpf_program__attach_ksyscall; > > > > > > > > > > > btf__add_enum64; > > > > > > > > > > > -- > > > > > > > > > > > 2.37.0.170.g444d1eabd0-goog > > > > > > > > > > >