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 82E5CC25B0E for ; Tue, 16 Aug 2022 17:20:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235737AbiHPRUO (ORCPT ); Tue, 16 Aug 2022 13:20:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236161AbiHPRUM (ORCPT ); Tue, 16 Aug 2022 13:20:12 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72EDF53D0C for ; Tue, 16 Aug 2022 10:20:11 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id a89so14357662edf.5 for ; Tue, 16 Aug 2022 10:20:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=xQgBiZn7IwdW7wFdIXkpXLjtrzw4eFlDNDUsvwq2u6U=; b=dkNjDw0SvzOi5kDflHBXRj7PwCkOHvP8z6UnuHxtQ8soUzjah/QU+If/V/sxuQr87S V3QxN7XQGXywPf4P75uuWGB17d7cs2xsx0eWIA/op1vAnCFDJo9J0WEqXIQZ6s5e2HQe 15cMGlcxam46M8lSHZf9pRPwNt+/neel6rKhPMM0+C+f5dSgWOn2BCWNpHWGP6Y278y7 W2vpAee3l+ZsKdfvpRawJ2mNVTzyLs0Imml/oxzEj+NZkdLVzTLqZ33rezDltm0rRw2h eNViIkksyDZS1SzT0eO2M83fXOaorO4NtyPz+PmmhjIH6bLjv64QQUQ9xIuAaP0fKXCS JG0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=xQgBiZn7IwdW7wFdIXkpXLjtrzw4eFlDNDUsvwq2u6U=; b=EN+Sppg7hGGzrihAb9hIzzvIwYdyUUrscdFonpzKSvlOjn/av3cDHxrntNlQxHaxr7 alrJnLdD53pQR5va0VL1qSlQJ34YGpL0FeFVvuQmXdwiNBmUg4tI0OOLAisk4LsWwIcf 93OZJHm9UxXfGrQoDgJglPibIX6jxFnpiRu+npTcPK6Xb96CM6WwEEKOWKHWjUCc7R2L P1ofjZ5p5x4sv+YsQuKRuF3NOX193WPieV3pq4umP9noVKRIhACw6gUf00QkILjzxsV5 PYyWlGhG1q4radpkzgThFYmUZ0x/JP+ZiKDIUvSmnbL7z90i7GEBmX/OULga3kEtKtc2 m2vw== X-Gm-Message-State: ACgBeo2Xcme/YtzMr+cPG0Qp2UyRYTgDlz6ZEbZ5mUMeskDLmb6zcZ6k Zf+fO4ObJROgcPzdmW5H/0CE4LK8z7kbIHzAxKs= X-Google-Smtp-Source: AA6agR7UypC4PiVrSmKuG1xLlTRBjSgY6sFDmx6W/bjkXzJk5kLAdCP82b6oT+uUCA1chmpVQ1tWhyb+s11r73DRWwo= X-Received: by 2002:aa7:ccc4:0:b0:43d:9e0e:b7ff with SMTP id y4-20020aa7ccc4000000b0043d9e0eb7ffmr20236866edt.14.1660670410001; Tue, 16 Aug 2022 10:20:10 -0700 (PDT) MIME-Version: 1.0 References: <20220811091526.172610-1-jolsa@kernel.org> <20220811091526.172610-7-jolsa@kernel.org> In-Reply-To: From: Andrii Nakryiko Date: Tue, 16 Aug 2022 10:19:58 -0700 Message-ID: Subject: Re: [PATCHv2 bpf-next 6/6] selftests/bpf: Fix get_func_ip offset test for CONFIG_X86_KERNEL_IBT To: Jiri Olsa Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Peter Zijlstra , "Masami Hiramatsu (Google)" Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Tue, Aug 16, 2022 at 12:00 AM Jiri Olsa wrote: > > On Mon, Aug 15, 2022 at 08:25:51PM -0700, Andrii Nakryiko wrote: > > On Thu, Aug 11, 2022 at 2:16 AM Jiri Olsa wrote: > > > > > > With CONFIG_X86_KERNEL_IBT enabled the test for kprobe with offset > > > won't work because of the extra endbr instruction. > > > > > > As suggested by Andrii adding CONFIG_X86_KERNEL_IBT detection > > > and using appropriate offset value based on that. > > > > > > Also removing test7 program, because it does the same as test6. > > > > > > Suggested-by: Andrii Nakryiko > > > Signed-off-by: Jiri Olsa > > > --- > > > .../bpf/prog_tests/get_func_ip_test.c | 62 +++++++++++++++---- > > > .../selftests/bpf/progs/get_func_ip_test.c | 20 +++--- > > > 2 files changed, 60 insertions(+), 22 deletions(-) > > > > > > diff --git a/tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c b/tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c > > > index 938dbd4d7c2f..a4dab2fa2258 100644 > > > --- a/tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c > > > +++ b/tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c > > > @@ -2,7 +2,9 @@ > > > #include > > > #include "get_func_ip_test.skel.h" > > > > > > -void test_get_func_ip_test(void) > > > +static int config_ibt; > > > + > > > +static void test_function_entry(void) > > > { > > > struct get_func_ip_test *skel = NULL; > > > int err, prog_fd; > > > @@ -12,14 +14,6 @@ void test_get_func_ip_test(void) > > > if (!ASSERT_OK_PTR(skel, "get_func_ip_test__open")) > > > return; > > > > > > - /* test6 is x86_64 specifc because of the instruction > > > - * offset, disabling it for all other archs > > > - */ > > > -#ifndef __x86_64__ > > > - bpf_program__set_autoload(skel->progs.test6, false); > > > - bpf_program__set_autoload(skel->progs.test7, false); > > > -#endif > > > - > > > err = get_func_ip_test__load(skel); > > > if (!ASSERT_OK(err, "get_func_ip_test__load")) > > > goto cleanup; > > > @@ -38,16 +32,62 @@ void test_get_func_ip_test(void) > > > > > > ASSERT_OK(err, "test_run"); > > > > > > + config_ibt = skel->bss->config_ibt; > > > > skel->bss->config_ibt isn't actually necessary, you can just check > > skel->kconfig->CONFIG_X86_KERNEL_IBT directly. And you won't need to > > trigger BPF program unnecessary, libbpf will fill out kconfig section > > during object/skeleton load phase. > > nice, did not know that ;-) will remove it > > > > > > + ASSERT_TRUE(config_ibt == 0 || config_ibt == 1, "config_ibt"); > > > > you won't need this anymore > > > > > + printf("%s:config_ibt %d\n", __func__, config_ibt); > > > > and this is just debug leftover > > it's intentional to find out quickly what config we are failing on ASSERT_GE(config_ibt, 0, "config_ibt_lower_bound"); ASSERT_LE(config_ibt, 1, "config_ibt_upper_bound"); Will print out actual value and a bit more meaningful error message if checks fail. Without polluting output with stray printfs. > > > > > > + > > > ASSERT_EQ(skel->bss->test1_result, 1, "test1_result"); > > > ASSERT_EQ(skel->bss->test2_result, 1, "test2_result"); > > > ASSERT_EQ(skel->bss->test3_result, 1, "test3_result"); > > > ASSERT_EQ(skel->bss->test4_result, 1, "test4_result"); > > > ASSERT_EQ(skel->bss->test5_result, 1, "test5_result"); > > > + > > > > [...] > > [...]