From patchwork Thu Apr 8 19:57:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 12192397 X-Patchwork-Delegate: bpf@iogearbox.net 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 A772AC433B4 for ; Thu, 8 Apr 2021 19:57:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 72E5A610E8 for ; Thu, 8 Apr 2021 19:57:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232041AbhDHT6J (ORCPT ); Thu, 8 Apr 2021 15:58:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60255 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232014AbhDHT6H (ORCPT ); Thu, 8 Apr 2021 15:58:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617911875; 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: content-transfer-encoding:content-transfer-encoding; bh=u0nNX2o4h5m416muun3Jd14ek5DO05wnyGCg4TXEeew=; b=Q9O2dvNFjOw29voHGwQoXtkmyOVS5l92b2c9XxjKN7oBXZqgjUG9nJOvpiCVdVvO1mkru8 NEw9YsEs2ONu378c1puH9NUsUR4NAYiD4COahuLfJQMY/qpa/4+4frNCgZQAW3i/yHd6Q/ li9G9L41MqzuuraNbV+qR7fI6QCcNIU= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-232-eZQvHhhxM2SXs0q7_8HBjQ-1; Thu, 08 Apr 2021 15:57:53 -0400 X-MC-Unique: eZQvHhhxM2SXs0q7_8HBjQ-1 Received: by mail-ed1-f69.google.com with SMTP id dj13so1527445edb.14 for ; Thu, 08 Apr 2021 12:57:53 -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:date:message-id:mime-version :content-transfer-encoding; bh=u0nNX2o4h5m416muun3Jd14ek5DO05wnyGCg4TXEeew=; b=mmbJG6xTDTYyaHl3iSMvxV1LcKDwCqrvufpCUfPTxwyeEIRnZQaWNOfyqtKh2dLAW+ 2H7sHr9GTwYKmusNYltepjTJwHS8Asv/fwN7rUs0nUdJo4aUQOP0Tv95lvczeR3o7yta bjRj0lCo++s68lt7LOwlFyIcHW231Y7qwvKLexKr4C8fVQL/oDbjp1Ry6kjS71LkH5KD bq2D4ApNs/XFPUjK+yAVxLu2VP3tm3xoEgEIja68wl2Qo9KIgmceLBLYDnhEMcfRKWlE AbbQka9/+xIuAIxKKw6BGvTPgU3XQv4y6DR8lyjiDX9b9TDp5wD2zO8DnXXXHnKpn/S9 FZ9Q== X-Gm-Message-State: AOAM533q1MvnhQAC3gP1gFY7sgSVrhLPshpdxMNcbTxX0LmIIS+ehE0p POduWJuCP6b24htVeA9XlRHOqojjpI/YxeCBh5nD5yWNGxZSRQYgSXiEaLjG/9ktgRggJaYoTBC XgSEB3KYzEtgt X-Received: by 2002:aa7:cd07:: with SMTP id b7mr13962236edw.293.1617911872566; Thu, 08 Apr 2021 12:57:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy54R4ftKO8Xjvg3SYcXRQN9uXALiuY1BQdTnNpyh7YToz/DAToSOK2txrLbguE4bqiQGLcqQ== X-Received: by 2002:aa7:cd07:: with SMTP id b7mr13962214edw.293.1617911872155; Thu, 08 Apr 2021 12:57:52 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id h3sm183291edv.80.2021.04.08.12.57.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 12:57:51 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id D4EFE18030D; Thu, 8 Apr 2021 21:57:50 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Alexei Starovoitov , Daniel Borkmann Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , bpf@vger.kernel.org Subject: [PATCH bpf-next 1/2] bpf: return target info when a tracing bpf_link is queried Date: Thu, 8 Apr 2021 21:57:39 +0200 Message-Id: <20210408195740.153029-1-toke@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net There is currently no way to discover the target of a tracing program attachment after the fact. Add this information to bpf_link_info and return it when querying the bpf_link fd. Signed-off-by: Toke Høiland-Jørgensen Acked-by: Andrii Nakryiko --- include/linux/bpf_verifier.h | 9 +++++++++ include/uapi/linux/bpf.h | 2 ++ kernel/bpf/syscall.c | 3 +++ tools/include/uapi/linux/bpf.h | 2 ++ 4 files changed, 16 insertions(+) diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index 51c2ffa3d901..6023a1367853 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -487,6 +487,15 @@ static inline u64 bpf_trampoline_compute_key(const struct bpf_prog *tgt_prog, return ((u64)btf_obj_id(btf) << 32) | 0x80000000 | btf_id; } +/* unpack the IDs from the key as constructed above */ +static inline void bpf_trampoline_unpack_key(u64 key, u32 *obj_id, u32 *btf_id) +{ + if (obj_id) + *obj_id = key >> 32; + if (btf_id) + *btf_id = key & 0x7FFFFFFF; +} + int bpf_check_attach_target(struct bpf_verifier_log *log, const struct bpf_prog *prog, const struct bpf_prog *tgt_prog, diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 49371eba98ba..397884396671 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -5379,6 +5379,8 @@ struct bpf_link_info { } raw_tracepoint; struct { __u32 attach_type; + __u32 target_obj_id; /* prog_id for PROG_EXT, otherwise btf object id */ + __u32 target_btf_id; /* BTF type id inside the object */ } tracing; struct { __u64 cgroup_id; diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 6428634da57e..fd495190115e 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -2551,6 +2551,9 @@ static int bpf_tracing_link_fill_link_info(const struct bpf_link *link, container_of(link, struct bpf_tracing_link, link); info->tracing.attach_type = tr_link->attach_type; + bpf_trampoline_unpack_key(tr_link->trampoline->key, + &info->tracing.target_obj_id, + &info->tracing.target_btf_id); return 0; } diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 69902603012c..1a240be873d7 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -5373,6 +5373,8 @@ struct bpf_link_info { } raw_tracepoint; struct { __u32 attach_type; + __u32 target_obj_id; /* prog_id for PROG_EXT, otherwise btf object id */ + __u32 target_btf_id; /* BTF type id inside the object */ } tracing; struct { __u64 cgroup_id; From patchwork Thu Apr 8 19:57:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 12192399 X-Patchwork-Delegate: bpf@iogearbox.net 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 6B9D4C43460 for ; Thu, 8 Apr 2021 19:58:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37BDF610E6 for ; Thu, 8 Apr 2021 19:58:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232167AbhDHT6L (ORCPT ); Thu, 8 Apr 2021 15:58:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51990 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232014AbhDHT6K (ORCPT ); Thu, 8 Apr 2021 15:58:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617911878; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6FLmG+khv36V3Uw5aFDk67/lChGeNIu/BpMAHAPTvWU=; b=U3xEIc9SIflM+hzoElmDHH9wgzZyJ0l8RwyZtwXaCV9QhQsXumJUSmiaZ3dvrcwMEpcixU ZR86BZyEJqI3ioURKhTsSDU9OX+NWjB1U7bXiVhbVh3UiJ6mDEbdsfgT7IWjew5aX6ox9c IRFewNHmkmVQGdBi9aXaMEigOso1OBc= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-494-rad8voQrMY-XLC3lsO53Qg-1; Thu, 08 Apr 2021 15:57:54 -0400 X-MC-Unique: rad8voQrMY-XLC3lsO53Qg-1 Received: by mail-ej1-f70.google.com with SMTP id bg7so1339228ejb.12 for ; Thu, 08 Apr 2021 12:57:54 -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:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6FLmG+khv36V3Uw5aFDk67/lChGeNIu/BpMAHAPTvWU=; b=XzKZ+EnDgmatf6mf9aUjuj7lxeyWKFvhgUNfpbFh7X2ULuIBNProaVQsF2jZZpVb8v XBHIKReVBevNqoHr1niShQ1hiUvkmn2g/yW0Unm37QWiv3SZd0i0qGwba1BpLoZPSuyS aEFQXNXKVWZLQAkLyI68xIMNw1AXTlylgRPQbdCuifUWuJKArhK8hlQf+d/p2520q4ya zZGGoXb2BRdeghttJ46LOap0glJTNzO19k4lSsJ+su+mWNCXLVcAdjSEDTKRHkXgUhBh 4QkPSYTTX77t3q/QhyL7QbPwTJjRMExsDA4ZV9DhT1/QEwuQJjUOuc4WYZLZBxXl84kZ v2bQ== X-Gm-Message-State: AOAM5303l0Z9cBhCTOBCh9DqNvZlmckltsVpaUOdDTKvj7NmiGulCk3c foeXFdIJLHrN5iC2uDOfOKnEIptTYxM0t5b9KkDmG8FijVniFSwkJnuTJ3FEFGJkFsueQNg7YCB s1bVVr0J5t1OL X-Received: by 2002:a05:6402:440d:: with SMTP id y13mr13939541eda.316.1617911873284; Thu, 08 Apr 2021 12:57:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtW6dF9kTWVU6j1pW/3ISNYtFkTyVw59JpS4b22dcu95HHVgu6RVmlDJ6Ti/viXvdCB9jHWw== X-Received: by 2002:a05:6402:440d:: with SMTP id y13mr13939525eda.316.1617911873096; Thu, 08 Apr 2021 12:57:53 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id hz24sm164309ejc.119.2021.04.08.12.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 12:57:52 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id EA9DF180350; Thu, 8 Apr 2021 21:57:51 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Alexei Starovoitov , Daniel Borkmann Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , bpf@vger.kernel.org Subject: [PATCH bpf-next 2/2] selftests/bpf: add tests for target information in bpf_link info queries Date: Thu, 8 Apr 2021 21:57:40 +0200 Message-Id: <20210408195740.153029-2-toke@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408195740.153029-1-toke@redhat.com> References: <20210408195740.153029-1-toke@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Extend the fexit_bpf2bpf test to check that the info for the bpf_link returned by the kernel matches the expected values. While we're updating the test, change existing uses of CHEC() to use the much easier to read ASSERT_*() macros. Signed-off-by: Toke Høiland-Jørgensen Acked-by: Andrii Nakryiko --- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 50 +++++++++++++++---- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c b/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c index 5c0448910426..019a46d8e98e 100644 --- a/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +++ b/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c @@ -57,11 +57,13 @@ static void test_fexit_bpf2bpf_common(const char *obj_file, bool run_prog, test_cb cb) { + __u32 duration = 0, retval, tgt_prog_id, info_len; struct bpf_object *obj = NULL, *tgt_obj; + struct bpf_prog_info prog_info = {}; struct bpf_program **prog = NULL; struct bpf_link **link = NULL; - __u32 duration = 0, retval; int err, tgt_fd, i; + struct btf *btf; err = bpf_prog_load(target_obj_file, BPF_PROG_TYPE_UNSPEC, &tgt_obj, &tgt_fd); @@ -72,28 +74,55 @@ static void test_fexit_bpf2bpf_common(const char *obj_file, .attach_prog_fd = tgt_fd, ); + info_len = sizeof(prog_info); + err = bpf_obj_get_info_by_fd(tgt_fd, &prog_info, &info_len); + if (!ASSERT_OK(err, "tgt_fd_get_info")) + goto close_prog; + + tgt_prog_id = prog_info.id; + btf = bpf_object__btf(tgt_obj); + link = calloc(sizeof(struct bpf_link *), prog_cnt); prog = calloc(sizeof(struct bpf_program *), prog_cnt); - if (CHECK(!link || !prog, "alloc_memory", "failed to alloc memory")) + if (!ASSERT_OK_PTR(link, "link_ptr") || !ASSERT_OK_PTR(prog, "prog_ptr")) goto close_prog; obj = bpf_object__open_file(obj_file, &opts); - if (CHECK(IS_ERR_OR_NULL(obj), "obj_open", - "failed to open %s: %ld\n", obj_file, - PTR_ERR(obj))) + if (!ASSERT_OK_PTR(obj, "obj_open")) goto close_prog; err = bpf_object__load(obj); - if (CHECK(err, "obj_load", "err %d\n", err)) + if (!ASSERT_OK(err, "obj_load")) goto close_prog; for (i = 0; i < prog_cnt; i++) { + struct bpf_link_info link_info; + char *tgt_name; + __s32 btf_id; + + tgt_name = strstr(prog_name[i], "/"); + if (!ASSERT_OK_PTR(tgt_name, "tgt_name")) + goto close_prog; + btf_id = btf__find_by_name_kind(btf, tgt_name + 1, BTF_KIND_FUNC); + prog[i] = bpf_object__find_program_by_title(obj, prog_name[i]); - if (CHECK(!prog[i], "find_prog", "prog %s not found\n", prog_name[i])) + if (!ASSERT_OK_PTR(prog[i], prog_name[i])) goto close_prog; + link[i] = bpf_program__attach_trace(prog[i]); - if (CHECK(IS_ERR(link[i]), "attach_trace", "failed to link\n")) + if (!ASSERT_OK_PTR(link[i], "attach_trace")) goto close_prog; + + info_len = sizeof(link_info); + memset(&link_info, 0, sizeof(link_info)); + err = bpf_obj_get_info_by_fd(bpf_link__fd(link[i]), + &link_info, &info_len); + ASSERT_OK(err, "link_fd_get_info"); + ASSERT_EQ(link_info.tracing.attach_type, + bpf_program__get_expected_attach_type(prog[i]), + "link_attach_type"); + ASSERT_EQ(link_info.tracing.target_obj_id, tgt_prog_id, "link_tgt_obj_id"); + ASSERT_EQ(link_info.tracing.target_btf_id, btf_id, "link_tgt_btf_id"); } if (cb) { @@ -107,9 +136,8 @@ static void test_fexit_bpf2bpf_common(const char *obj_file, err = bpf_prog_test_run(tgt_fd, 1, &pkt_v6, sizeof(pkt_v6), NULL, NULL, &retval, &duration); - CHECK(err || retval, "ipv6", - "err %d errno %d retval %d duration %d\n", - err, errno, retval, duration); + ASSERT_OK(err, "prog_run"); + ASSERT_EQ(retval, 0, "prog_run_ret"); if (check_data_map(obj, prog_cnt, false)) goto close_prog;