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 X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 499EDC2BA2B for ; Mon, 6 Apr 2020 11:34:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 205A42064A for ; Mon, 6 Apr 2020 11:34:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QOTbxdQt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727349AbgDFLeo (ORCPT ); Mon, 6 Apr 2020 07:34:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21712 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727193AbgDFLeo (ORCPT ); Mon, 6 Apr 2020 07:34:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586172882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=clYO5lZnP0UyHoFp9zmJLM0Hru8EVd9gDmU8smyRsp4=; b=QOTbxdQtOcxe+S4fWX64SGVz/1/B/Zd1Fa2mDjmLgE80SvEZPMwSJtL4GHJNckQbnTxFot 4jVcRCrE2kxMUOO1DYFUCCokaWzuF5mXZsvbx7+C8bbfPklrTDiRdNLF65yHhq7mI3IpQi 7KLtfEuJG67sLK5Hs9gX+yspTuHRaMc= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-273-SazFHvQXMl6-v97uGJPP5A-1; Mon, 06 Apr 2020 07:34:40 -0400 X-MC-Unique: SazFHvQXMl6-v97uGJPP5A-1 Received: by mail-lj1-f200.google.com with SMTP id k26so1825832lji.0 for ; Mon, 06 Apr 2020 04:34:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=clYO5lZnP0UyHoFp9zmJLM0Hru8EVd9gDmU8smyRsp4=; b=nXgay8tpsbp7C0rTU6LY0yoPqoaMdDpIp5r1B6u/iqhshgYrX3bk2R8vXuwgTSwMR2 JxRhbiY8Ay2A6K7MMhNHBfA0Fsyq0wF2vOHRK0Avqt1j2hI0sC9YqkdBl/0etghVBany /IEZDREPesBOuSuYz5Qx69WnWZTetQXkMDtAXykC7WqrzxVmskd2Qe8+rADrBsReGOFV 9bDN9APBfSmgDBJ/mW68Nm2VdW14WL1jOZ7LRTiECI4c/dkzSBZDGWaF+yb0lH3Sx2l2 lxgEaeqNzbHZa4aaqFD9yqnW6klmjJGGV4eckurQKpp/jm1Vp8qssib3x0y9T9rfQphn RWew== X-Gm-Message-State: AGi0PuZ2osoF8/EkDcGKo9QudhD6ghm6xB8vPfYp1s2nvzEbUYkWQ+BM yxGpbMOY3btl7m8uzH/EM2GwtDVkSDZ96RwM5aGws2FqYiN1ZssDomZUokQoU1Cqky7PiyAO97d QfF4kgG8X3Vue X-Received: by 2002:a2e:9798:: with SMTP id y24mr12331792lji.267.1586172879182; Mon, 06 Apr 2020 04:34:39 -0700 (PDT) X-Google-Smtp-Source: APiQypJbK5FN2HRT+nh/53N44WDU7KpdCCQBMSszqhIE4c/D/AMdiir9UaM2udhBBLkAzbWKmBotRA== X-Received: by 2002:a2e:9798:: with SMTP id y24mr12331774lji.267.1586172878901; Mon, 06 Apr 2020 04:34:38 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id x28sm11405892lfq.46.2020.04.06.04.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 04:34:38 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 653ED1804E7; Mon, 6 Apr 2020 13:34:35 +0200 (CEST) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Andrii Nakryiko , bpf@vger.kernel.org, netdev@vger.kernel.org, ast@fb.com, daniel@iogearbox.net Cc: andrii.nakryiko@gmail.com, kernel-team@fb.com, Andrii Nakryiko Subject: Re: [RFC PATCH bpf-next 5/8] bpf: add support for BPF_OBJ_GET_INFO_BY_FD for bpf_link In-Reply-To: <20200404000948.3980903-6-andriin@fb.com> References: <20200404000948.3980903-1-andriin@fb.com> <20200404000948.3980903-6-andriin@fb.com> X-Clacks-Overhead: GNU Terry Pratchett Date: Mon, 06 Apr 2020 13:34:35 +0200 Message-ID: <87o8s4c0fo.fsf@toke.dk> MIME-Version: 1.0 Content-Type: text/plain Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Andrii Nakryiko writes: > Add ability to fetch bpf_link details through BPF_OBJ_GET_INFO_BY_FD command. > Also enhance show_fdinfo to potentially include bpf_link type-specific > information (similarly to obj_info). > > Also introduce enum bpf_link_type stored in bpf_link itself and expose it in > UAPI. bpf_link_tracing also now will store and return bpf_attach_type. > > Signed-off-by: Andrii Nakryiko > --- > include/linux/bpf-cgroup.h | 2 - > include/linux/bpf.h | 10 +- > include/linux/bpf_types.h | 6 ++ > include/uapi/linux/bpf.h | 28 ++++++ > kernel/bpf/btf.c | 2 + > kernel/bpf/cgroup.c | 45 ++++++++- > kernel/bpf/syscall.c | 164 +++++++++++++++++++++++++++++---- > kernel/bpf/verifier.c | 2 + > tools/include/uapi/linux/bpf.h | 31 +++++++ > 9 files changed, 266 insertions(+), 24 deletions(-) > > diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h > index d2d969669564..ab95824a1d99 100644 > --- a/include/linux/bpf-cgroup.h > +++ b/include/linux/bpf-cgroup.h > @@ -57,8 +57,6 @@ struct bpf_cgroup_link { > enum bpf_attach_type type; > }; > > -extern const struct bpf_link_ops bpf_cgroup_link_lops; > - > struct bpf_prog_list { > struct list_head node; > struct bpf_prog *prog; > diff --git a/include/linux/bpf.h b/include/linux/bpf.h > index 67ce74890911..8cf182d256d4 100644 > --- a/include/linux/bpf.h > +++ b/include/linux/bpf.h > @@ -1026,9 +1026,11 @@ extern const struct file_operations bpf_prog_fops; > extern const struct bpf_verifier_ops _name ## _verifier_ops; > #define BPF_MAP_TYPE(_id, _ops) \ > extern const struct bpf_map_ops _ops; > +#define BPF_LINK_TYPE(_id, _name) > #include > #undef BPF_PROG_TYPE > #undef BPF_MAP_TYPE > +#undef BPF_LINK_TYPE > > extern const struct bpf_prog_ops bpf_offload_prog_ops; > extern const struct bpf_verifier_ops tc_cls_act_analyzer_ops; > @@ -1086,6 +1088,7 @@ int bpf_prog_new_fd(struct bpf_prog *prog); > struct bpf_link { > atomic64_t refcnt; > u32 id; > + enum bpf_link_type type; > const struct bpf_link_ops *ops; > struct bpf_prog *prog; > struct work_struct work; > @@ -1103,9 +1106,14 @@ struct bpf_link_ops { > void (*dealloc)(struct bpf_link *link); > int (*update_prog)(struct bpf_link *link, struct bpf_prog *new_prog, > struct bpf_prog *old_prog); > + void (*show_fdinfo)(const struct bpf_link *link, struct seq_file *seq); > + int (*fill_link_info)(const struct bpf_link *link, > + struct bpf_link_info *info, > + const struct bpf_link_info *uinfo, > + u32 info_len); > }; > > -void bpf_link_init(struct bpf_link *link, > +void bpf_link_init(struct bpf_link *link, enum bpf_link_type type, > const struct bpf_link_ops *ops, struct bpf_prog *prog); > int bpf_link_prime(struct bpf_link *link, struct bpf_link_primer *primer); > int bpf_link_settle(struct bpf_link_primer *primer); > diff --git a/include/linux/bpf_types.h b/include/linux/bpf_types.h > index ba0c2d56f8a3..8345cdf553b8 100644 > --- a/include/linux/bpf_types.h > +++ b/include/linux/bpf_types.h > @@ -118,3 +118,9 @@ BPF_MAP_TYPE(BPF_MAP_TYPE_STACK, stack_map_ops) > #if defined(CONFIG_BPF_JIT) > BPF_MAP_TYPE(BPF_MAP_TYPE_STRUCT_OPS, bpf_struct_ops_map_ops) > #endif > + > +BPF_LINK_TYPE(BPF_LINK_TYPE_RAW_TRACEPOINT, raw_tracepoint) > +BPF_LINK_TYPE(BPF_LINK_TYPE_TRACING, tracing) > +#ifdef CONFIG_CGROUP_BPF > +BPF_LINK_TYPE(BPF_LINK_TYPE_CGROUP, cgroup) > +#endif > diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h > index 407c086bc9e4..d2f269082a33 100644 > --- a/include/uapi/linux/bpf.h > +++ b/include/uapi/linux/bpf.h > @@ -222,6 +222,15 @@ enum bpf_attach_type { > > #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE > > +enum bpf_link_type { > + BPF_LINK_TYPE_UNSPEC = 0, > + BPF_LINK_TYPE_RAW_TRACEPOINT = 1, > + BPF_LINK_TYPE_TRACING = 2, > + BPF_LINK_TYPE_CGROUP = 3, > + > + MAX_BPF_LINK_TYPE, > +}; > + > /* cgroup-bpf attach flags used in BPF_PROG_ATTACH command > * > * NONE(default): No further bpf programs allowed in the subtree. > @@ -3601,6 +3610,25 @@ struct bpf_btf_info { > __u32 id; > } __attribute__((aligned(8))); > > +struct bpf_link_info { > + __u32 type; > + __u32 id; > + __u32 prog_id; > + union { > + struct { > + __aligned_u64 tp_name; /* in/out: tp_name buffer ptr */ > + __u32 tp_name_len; /* in/out: tp_name buffer len */ > + } raw_tracepoint; > + struct { > + __u32 attach_type; > + } tracing; Shouldn't this also include the attach target? -Toke