Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8B0822F76F; Fri, 9 May 2025 15:36:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746804977; cv=none; b=LaBKylkcIaxXBJ/vip29a0+TtYo6JFJlfv1chNzzAZ4zj9leZIbnEgnIsv3hDsDEicjy+JTXly95iRe9KNAd/jOccRzqt2elhy9lb2oHCuGwI43Mi8+SLuAk5+0Ln1vLLvT+pyPEjsZskSzvO7OZT/DYOCefwCribhoCNdjaAwk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746804977; c=relaxed/simple; bh=z4P+ocwK+TMW60dgo60BvSfHHZS2u9deaUvFZGoNwpo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sIQbQwqrc1RixIlGqok/4+2Y1dGTMdvjMNpEDJSlIpAnhHYtpW+r5AzwjzRX7xysNtVKXdbgrJnYyRGdTzKpEoLPVQtu972YdJUgLyIS/ZFfYsxAqpqMIZ9dPlriFo/QZI3fjwvODxzTYlaLjcFkGZNJ+iyXkPnOF4pgqww1tu0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K5YdSlqu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="K5YdSlqu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 501DBC4CEF0; Fri, 9 May 2025 15:36:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746804975; bh=z4P+ocwK+TMW60dgo60BvSfHHZS2u9deaUvFZGoNwpo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K5YdSlquo7oOs3OeW1nT6EDBu8jG/rlpWaCymLhFxNZs0kKlGxgIDlASqQN7/T9XX XPFmkQjNJ4OhnG4XcbJsLv32nACnOh0E3sBtnOodhoXXEY8GvIAA0HZRmaOyq8yFi2 z5dBPY4JBJVFuUFVQ1+pHjRWHQSdnL74uTve3uPffIztv9UgAjIG2XqhVuCfS4Oq5k TY7BboJSZPRovASI92RaNWsBAg5GIsjOuC3pWU5rKyRaWhvX2spKkfHm+Ga3rfhOxm mMDzSnKi3sJctGal93G7pFEtFMZovE2JJzBUt09u0HhWlqTeXpHv3sb8lJtoSvNX+P xkDLC9yLes/cA== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: Yafang Shao , bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , Hao Luo , Quentin Monnet Subject: [PATCHv2 bpf-next 2/3] selftests/bpf: Add link info test for ref_ctr_offset retrieval Date: Fri, 9 May 2025 17:35:38 +0200 Message-ID: <20250509153539.779599-3-jolsa@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250509153539.779599-1-jolsa@kernel.org> References: <20250509153539.779599-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Adding link info test for ref_ctr_offset retrieval for both uprobe and uretprobe probes. Acked-by: Yafang Shao Signed-off-by: Jiri Olsa --- .../selftests/bpf/prog_tests/fill_link_info.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c index e59af2aa6601..e40114620751 100644 --- a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c +++ b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c @@ -37,6 +37,7 @@ static noinline void uprobe_func(void) static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long addr, ssize_t offset, ssize_t entry_offset) { + ssize_t ref_ctr_offset = entry_offset /* ref_ctr_offset for uprobes */; struct bpf_link_info info; __u32 len = sizeof(info); char buf[PATH_MAX]; @@ -97,6 +98,7 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add case BPF_PERF_EVENT_UPROBE: case BPF_PERF_EVENT_URETPROBE: ASSERT_EQ(info.perf_event.uprobe.offset, offset, "uprobe_offset"); + ASSERT_EQ(info.perf_event.uprobe.ref_ctr_offset, ref_ctr_offset, "uprobe_ref_ctr_offset"); ASSERT_EQ(info.perf_event.uprobe.name_len, strlen(UPROBE_FILE) + 1, "name_len"); @@ -241,20 +243,32 @@ static void test_uprobe_fill_link_info(struct test_fill_link_info *skel, .retprobe = type == BPF_PERF_EVENT_URETPROBE, .bpf_cookie = PERF_EVENT_COOKIE, ); + const char *sema[1] = { + "uprobe_link_info_sema_1", + }; + __u64 *ref_ctr_offset; struct bpf_link *link; int link_fd, err; + err = elf_resolve_syms_offsets("/proc/self/exe", 1, sema, + (unsigned long **) &ref_ctr_offset, STT_OBJECT); + if (!ASSERT_OK(err, "elf_resolve_syms_offsets_object")) + return; + + opts.ref_ctr_offset = *ref_ctr_offset; link = bpf_program__attach_uprobe_opts(skel->progs.uprobe_run, 0, /* self pid */ UPROBE_FILE, uprobe_offset, &opts); if (!ASSERT_OK_PTR(link, "attach_uprobe")) - return; + goto out; link_fd = bpf_link__fd(link); - err = verify_perf_link_info(link_fd, type, 0, uprobe_offset, 0); + err = verify_perf_link_info(link_fd, type, 0, uprobe_offset, *ref_ctr_offset); ASSERT_OK(err, "verify_perf_link_info"); bpf_link__destroy(link); +out: + free(ref_ctr_offset); } static int verify_kmulti_link_info(int fd, bool retprobe, bool has_cookies) -- 2.49.0