From nobody Wed Dec 17 05:56:00 2025 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 917EBC4167B for ; Wed, 29 Nov 2023 15:47:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344123AbjK2Prj (ORCPT ); Wed, 29 Nov 2023 10:47:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235001AbjK2Pr2 (ORCPT ); Wed, 29 Nov 2023 10:47:28 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04E78D48 for ; Wed, 29 Nov 2023 07:47:34 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64C68C433CC; Wed, 29 Nov 2023 15:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701272854; bh=FaUbZPDs3dt6xgm6CO9qGb61yKAwRh5X/pwZrBp62xQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VA1aly/Fp3gSP7LuZ7/s+dY+PMxJDAQaobgrt25L9Z2lj9nKsxjpPMhA4rxS9xxaA RwW+biJB+8E0Q2gMYVyOM0fc7v3XJTbW+MGqzxQzcxInr0Uh5lAzNU2upoQSScrtn4 /4Yy64W9X7bjutY3VQjCvJ/QWQKBqFohG/zGEZgheOe252paZPs/5L/cu13aVU01mh YGXSal/qgNGpGrxJFYSTNYDzt7khvS3NW6QwwgAs8HL2DVz9sWbcEwvRoqnBCRs9aA CHEP/29AHa7JECcA/V5lpHveTi/s9KDmsVqCQYJBm7hSXlbxquaA1Zr/p/z8EHUNlW 6CNgEh42SOmnA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , Kate Carcia , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 1/2] perf test sigtrap: Generalize the BTF routine to reuse it in this test Date: Wed, 29 Nov 2023 12:47:17 -0300 Message-ID: <20231129154718.326330-2-acme@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231129154718.326330-1-acme@kernel.org> References: <20231129154718.326330-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo Move the part that loads the BTF info to a "btf__available()" that will lazy load the BTF info so that if we need it for some other test, which we will in the following cset, we can reuse it. At some point this will move from this specific 'perf test' entry to be used in other parts of perf, do it when needed. Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/sigtrap.c | 60 +++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/tools/perf/tests/sigtrap.c b/tools/perf/tests/sigtrap.c index 1de7478ec1894d77..a1bc7c776254ed2f 100644 --- a/tools/perf/tests/sigtrap.c +++ b/tools/perf/tests/sigtrap.c @@ -57,36 +57,51 @@ static struct perf_event_attr make_event_attr(void) #ifdef HAVE_BPF_SKEL #include =20 -static bool attr_has_sigtrap(void) +static struct btf *btf; + +static bool btf__available(void) { - bool ret =3D false; - struct btf *btf; - const struct btf_type *t; + if (btf =3D=3D NULL) + btf =3D btf__load_vmlinux_btf(); + + return btf !=3D NULL; +} + +static void btf__exit(void) +{ + btf__free(btf); + btf =3D NULL; +} + +static const struct btf_member *__btf_type__find_member_by_name(int type_i= d, const char *member_name) +{ + const struct btf_type *t =3D btf__type_by_id(btf, type_id); const struct btf_member *m; - const char *name; - int i, id; + int i; + + for (i =3D 0, m =3D btf_members(t); i < btf_vlen(t); i++, m++) { + const char *current_member_name =3D btf__name_by_offset(btf, m->name_off= ); + if (!strcmp(current_member_name, member_name)) + return m; + } + + return NULL; +} + +static bool attr_has_sigtrap(void) +{ + int id; =20 - btf =3D btf__load_vmlinux_btf(); - if (btf =3D=3D NULL) { + if (!btf__available()) { /* should be an old kernel */ return false; } =20 id =3D btf__find_by_name_kind(btf, "perf_event_attr", BTF_KIND_STRUCT); if (id < 0) - goto out; + return false; =20 - t =3D btf__type_by_id(btf, id); - for (i =3D 0, m =3D btf_members(t); i < btf_vlen(t); i++, m++) { - name =3D btf__name_by_offset(btf, m->name_off); - if (!strcmp(name, "sigtrap")) { - ret =3D true; - break; - } - } -out: - btf__free(btf); - return ret; + return __btf_type__find_member_by_name(id, "sigtrap") !=3D NULL; } #else /* !HAVE_BPF_SKEL */ static bool attr_has_sigtrap(void) @@ -109,6 +124,10 @@ static bool attr_has_sigtrap(void) =20 return ret; } + +static void btf__exit(void) +{ +} #endif /* HAVE_BPF_SKEL */ =20 static void @@ -221,6 +240,7 @@ static int test__sigtrap(struct test_suite *test __mayb= e_unused, int subtest __m sigaction(SIGTRAP, &oldact, NULL); out: pthread_barrier_destroy(&barrier); + btf__exit(); return ret; } =20 --=20 2.41.0 From nobody Wed Dec 17 05:56:00 2025 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 40967C07CB1 for ; Wed, 29 Nov 2023 15:47:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343914AbjK2Prs (ORCPT ); Wed, 29 Nov 2023 10:47:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344032AbjK2Pre (ORCPT ); Wed, 29 Nov 2023 10:47:34 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9E5110DB for ; Wed, 29 Nov 2023 07:47:40 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DE61C433C9; Wed, 29 Nov 2023 15:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701272860; bh=45craR8fXhu4UKylqaeeXIMxfA/OQi5bmwotxf0KdVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=srT7EPF8WxYZeCnQTbCvQdasmXfcwhwnDkVorUW54rnoYLdO+f6xSPNSzDJuDPaXh h99pThfxiCqrMpZSzYW5EtBiqUx8yKl163sPOhGrRKzW0pwAR6xfVyInfl5sSK7NjV NLGWDGLap3tYDCkmDQ0iSdE94oL++/7KgH+o5wMWCjIBtk4RbEme/mox+cegknfdrH lx2N6ak7aE9L4Z+sfxFoIo5GOCMflYabhLeqgG9sla8Kb4DAerzyLajqOyaD1lDbLQ NsxYsohRhWeyTHRrJ1VbiDX/XNV2zUN3hiGSloFC4Xi2GGW2yYKWdGn85ZzfwMafg5 C0+Xo6ThVqtew== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , Kate Carcia , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Juri Lelli , Marco Elver , Mike Galbraith , Peter Zijlstra Subject: [PATCH 2/2] perf tests sigtrap: Skip if running on a kernel with sleepable spinlocks Date: Wed, 29 Nov 2023 12:47:18 -0300 Message-ID: <20231129154718.326330-3-acme@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231129154718.326330-1-acme@kernel.org> References: <20231129154718.326330-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo There are issues as reported that need some more investigation on the RT kernel front, till that is addressed, skip this test. This test is already skipped for multiple hardware architectures where the tested kernel feature is not supported. Cc: Adrian Hunter Cc: Clark Williams Cc: Ian Rogers Cc: Jiri Olsa Cc: Juri Lelli Cc: Marco Elver Cc: Mike Galbraith Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Thomas Gleixner Link: https://lore.kernel.org/all/e368f2c848d77fbc8d259f44e2055fe469c219cf.= camel@gmx.de/ Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Marco Elver --- tools/perf/tests/sigtrap.c | 46 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/tools/perf/tests/sigtrap.c b/tools/perf/tests/sigtrap.c index a1bc7c776254ed2f..e6fd934b027a3d0c 100644 --- a/tools/perf/tests/sigtrap.c +++ b/tools/perf/tests/sigtrap.c @@ -103,6 +103,34 @@ static bool attr_has_sigtrap(void) =20 return __btf_type__find_member_by_name(id, "sigtrap") !=3D NULL; } + +static bool kernel_with_sleepable_spinlocks(void) +{ + const struct btf_member *member; + const struct btf_type *type; + const char *type_name; + int id; + + if (!btf__available()) + return false; + + id =3D btf__find_by_name_kind(btf, "spinlock", BTF_KIND_STRUCT); + if (id < 0) + return false; + + // Only RT has a "lock" member for "struct spinlock" + member =3D __btf_type__find_member_by_name(id, "lock"); + if (member =3D=3D NULL) + return false; + + // But check its type as well + type =3D btf__type_by_id(btf, member->type); + if (!type || !btf_is_struct(type)) + return false; + + type_name =3D btf__name_by_offset(btf, type->name_off); + return type_name && !strcmp(type_name, "rt_mutex_base"); +} #else /* !HAVE_BPF_SKEL */ static bool attr_has_sigtrap(void) { @@ -125,6 +153,11 @@ static bool attr_has_sigtrap(void) return ret; } =20 +static bool kernel_with_sleepable_spinlocks(void) +{ + return false; +} + static void btf__exit(void) { } @@ -166,7 +199,7 @@ static int run_test_threads(pthread_t *threads, pthread= _barrier_t *barrier) =20 static int run_stress_test(int fd, pthread_t *threads, pthread_barrier_t *= barrier) { - int ret; + int ret, expected_sigtraps; =20 ctx.iterate_on =3D 3000; =20 @@ -175,7 +208,16 @@ static int run_stress_test(int fd, pthread_t *threads,= pthread_barrier_t *barrie ret =3D run_test_threads(threads, barrier); TEST_ASSERT_EQUAL("disable failed", ioctl(fd, PERF_EVENT_IOC_DISABLE, 0),= 0); =20 - TEST_ASSERT_EQUAL("unexpected sigtraps", ctx.signal_count, NUM_THREADS * = ctx.iterate_on); + expected_sigtraps =3D NUM_THREADS * ctx.iterate_on; + + if (ctx.signal_count < expected_sigtraps && kernel_with_sleepable_spinloc= ks()) { + pr_debug("Expected %d sigtraps, got %d, running on a kernel with sleepab= le spinlocks.\n", + expected_sigtraps, ctx.signal_count); + pr_debug("See https://lore.kernel.org/all/e368f2c848d77fbc8d259f44e2055f= e469c219cf.camel@gmx.de/\n"); + return TEST_SKIP; + } else + TEST_ASSERT_EQUAL("unexpected sigtraps", ctx.signal_count, expected_sigt= raps); + TEST_ASSERT_EQUAL("missing signals or incorrectly delivered", ctx.tids_wa= nt_signal, 0); TEST_ASSERT_VAL("unexpected si_addr", ctx.first_siginfo.si_addr =3D=3D &c= tx.iterate_on); #if 0 /* FIXME: enable when libc's signal.h has si_perf_{type,data} */ --=20 2.41.0