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 DED99C433F5 for ; Wed, 2 Feb 2022 13:54:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237953AbiBBNyQ (ORCPT ); Wed, 2 Feb 2022 08:54:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:45157 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344676AbiBBNyK (ORCPT ); Wed, 2 Feb 2022 08:54:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643810049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gqIBYhSED2KiLRiPVvQEcn95LWAaRUgov7svs5RNRz4=; b=Hu0l9O7ZHMS+sNZB3UsrrjPCVNpGtHd0VKhxdOYKbyv5Yi0f73V0nmPsetPrx/CKtNmhcT eLIQZxTFSuOO+wbdWs0VimFQQpVUg1i0Ly1oP0QjGN1qXiBX+vfe9Myj0UmItWbB+2BkLO jGnp8Bq7TIgi28atfiSpcmkuaiLDZ70= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-265-f9D-KPtmPv-pMoI6pm24GA-1; Wed, 02 Feb 2022 08:54:08 -0500 X-MC-Unique: f9D-KPtmPv-pMoI6pm24GA-1 Received: by mail-ej1-f69.google.com with SMTP id m4-20020a170906160400b006be3f85906eso2275111ejd.23 for ; Wed, 02 Feb 2022 05:54:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gqIBYhSED2KiLRiPVvQEcn95LWAaRUgov7svs5RNRz4=; b=n1iPxRv0hlq/Od8m+2wyx4MVxT9qxdLeQzys4IPMTMtZF6rcrepKpT8H1dmiU7mK3/ nkZ8QLSrP0pt/l5t8BOIVJ81sGRMjxbbOo1v0GCIEAvFBeUPPTM/oEiPaOcqApWDb3mK Y9a7IXmnEFa14gSiFiTGNAyDQEhtauuNc+hoOIIqGdOg2p/Nn+wN85L8NFkj+phvDyMO fWcks8pE2/XFVU9dZdm6TdQZKL1uX8rR3jcwmZEQ0tJYadmqeW9G7odiNMKY+2cURSB8 GGcZ0td00NpljGowUzO+qjpbYMl8Wa94ktBtIuT0VyJbF5TiWhd1nDSs5qugJ64KvpL/ iRdg== X-Gm-Message-State: AOAM531ZLhMurGfquWQsRAfmXDx7QAunlkrSrYH0HC5wpYAvxxuzVTzE 7/uaZ2RsHxIaGuC4wAWlk2mjYZg40buxRzTfFgQi6t6CMrRlLK5xdKg0/9Ic+xVzMBg8b8tqVML 9i961l2Z340lm X-Received: by 2002:a05:6402:509:: with SMTP id m9mr29640222edv.237.1643810046235; Wed, 02 Feb 2022 05:54:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcUwK13/nY2kcApXDzGsFhV/cZCeMZ9htyubnhs5SDp70e98r81NKwfnOABmoL6EkvsLeXhg== X-Received: by 2002:a05:6402:509:: with SMTP id m9mr29640200edv.237.1643810046059; Wed, 02 Feb 2022 05:54:06 -0800 (PST) Received: from krava.redhat.com (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id s7sm15703501ejo.212.2022.02.02.05.54.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 05:54:05 -0800 (PST) From: Jiri Olsa X-Google-Original-From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Masami Hiramatsu Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, lkml , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Steven Rostedt , Jiri Olsa Subject: [PATCH 5/8] libbpf: Add bpf_link_create support for multi kprobes Date: Wed, 2 Feb 2022 14:53:30 +0100 Message-Id: <20220202135333.190761-6-jolsa@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220202135333.190761-1-jolsa@kernel.org> References: <20220202135333.190761-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Adding new kprobe struct in bpf_link_create_opts object to pass multi kprobe data to link_create attr API. Signed-off-by: Jiri Olsa --- tools/lib/bpf/bpf.c | 7 +++++++ tools/lib/bpf/bpf.h | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 418b259166f8..98156709a96c 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -853,6 +853,13 @@ int bpf_link_create(int prog_fd, int target_fd, if (!OPTS_ZEROED(opts, perf_event)) return libbpf_err(-EINVAL); break; + case BPF_TRACE_FPROBE: + attr.link_create.fprobe.syms = OPTS_GET(opts, fprobe.syms, 0); + attr.link_create.fprobe.addrs = OPTS_GET(opts, fprobe.addrs, 0); + attr.link_create.fprobe.cnt = OPTS_GET(opts, fprobe.cnt, 0); + attr.link_create.fprobe.flags = OPTS_GET(opts, fprobe.flags, 0); + attr.link_create.fprobe.bpf_cookies = OPTS_GET(opts, fprobe.bpf_cookies, 0); + break; default: if (!OPTS_ZEROED(opts, flags)) return libbpf_err(-EINVAL); diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index c2e8327010f9..114e828ae027 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -413,10 +413,17 @@ struct bpf_link_create_opts { struct { __u64 bpf_cookie; } perf_event; + struct { + __u64 syms; + __u64 addrs; + __u32 cnt; + __u32 flags; + __u64 bpf_cookies; + } fprobe; }; size_t :0; }; -#define bpf_link_create_opts__last_field perf_event +#define bpf_link_create_opts__last_field fprobe.bpf_cookies LIBBPF_API int bpf_link_create(int prog_fd, int target_fd, enum bpf_attach_type attach_type, -- 2.34.1