From patchwork Wed Nov 29 15:47:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 171448 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp429051vqn; Wed, 29 Nov 2023 07:47:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHttAl97y/DdpBvArxU7p8NKQxfXRaeXFtrD5+ieDpw/fdIHP0X+3Q+FrHcWXS1a87iyI/N X-Received: by 2002:a17:90b:3545:b0:283:2c19:c9bb with SMTP id lt5-20020a17090b354500b002832c19c9bbmr21309021pjb.13.1701272870659; Wed, 29 Nov 2023 07:47:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701272870; cv=none; d=google.com; s=arc-20160816; b=BhFOpphpgFyVXfcx8mWVXm4KKC3+ZG3CaBJ7+DPRX8DybnA9Cx40cKPZqP184bju3r QchfSbYSN9cql64JHD8h9YV8zh3IulRqNuxE1ms0L0w/HIW1RYrf/vF2/G1+Cv2IxMVF I1vp+ZJ3brjQfPli6+RMwkW+1vOxicazBgjdmUWQTzy5WKhgwgWXNOF1BZwXiK/VbWks CWH2dDfL0Q+qdNyO3OcLzb0xTK8Nv5AlQIaEJwMoBWBISS9no8fZFDLWtcqzuiwClkeP BzookhcrxfoA4RJudjqpWgkT73GU9M6u4rXtRuxk7cuaGTucYXUnRKRGBddOTiwhxpjU PEYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MpzPfEX1Zkj2719RKp5EmMu6IDz7u+uFuBKGdKU09Ck=; fh=WV/Q3i1Afu2/5+m7Cvf6T+31EFLAkJ0ICROXGgKcdPA=; b=mrb/BDMDicwO2t9fQ2Hy6znB1Gnpkuev/rLxwsHaLdh2E2WyEbDqTjEkJopFp9caCU 73BC+ESy297m91wH3Hf7fsmSnIwcK9hPkigS0ynZ1lSwkEFSE4d8JZ1d4rTZr3YSe6yZ 1Zcehlpd0stXie9fnQnmtU8ejgikfDPcXoo0ZPWZ2UGDQ17L2knSB78HTdBBKCLhvGdZ 5XwAvcrsyswj8Aq9fqBFs+nKecIM/HdAxCpzppJL8sQIU2I+RITKFQpnznpKZK0JWfOT o8ReCVG+zGZzcbaad/uemN0r0yFnL+JPr/4uPdxytkOldltmlFCZ4Nnwdwbb24PCmPv9 Jhgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="VA1aly/F"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id p5-20020a17090a868500b0028590df178esi1493404pjn.158.2023.11.29.07.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 07:47:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="VA1aly/F"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id DF1B4804C21A; Wed, 29 Nov 2023 07:47:47 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234971AbjK2Pri (ORCPT + 99 others); Wed, 29 Nov 2023 10:47:38 -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 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 29 Nov 2023 07:47:48 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783913901414396368 X-GMAIL-MSGID: 1783913901414396368 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 -static bool attr_has_sigtrap(void) +static struct btf *btf; + +static bool btf__available(void) { - bool ret = false; - struct btf *btf; - const struct btf_type *t; + if (btf == NULL) + btf = btf__load_vmlinux_btf(); + + return btf != NULL; +} + +static void btf__exit(void) +{ + btf__free(btf); + btf = NULL; +} + +static const struct btf_member *__btf_type__find_member_by_name(int type_id, const char *member_name) +{ + const struct btf_type *t = btf__type_by_id(btf, type_id); const struct btf_member *m; - const char *name; - int i, id; + int i; + + for (i = 0, m = btf_members(t); i < btf_vlen(t); i++, m++) { + const char *current_member_name = 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; - btf = btf__load_vmlinux_btf(); - if (btf == NULL) { + if (!btf__available()) { /* should be an old kernel */ return false; } id = btf__find_by_name_kind(btf, "perf_event_attr", BTF_KIND_STRUCT); if (id < 0) - goto out; + return false; - t = btf__type_by_id(btf, id); - for (i = 0, m = btf_members(t); i < btf_vlen(t); i++, m++) { - name = btf__name_by_offset(btf, m->name_off); - if (!strcmp(name, "sigtrap")) { - ret = true; - break; - } - } -out: - btf__free(btf); - return ret; + return __btf_type__find_member_by_name(id, "sigtrap") != NULL; } #else /* !HAVE_BPF_SKEL */ static bool attr_has_sigtrap(void) @@ -109,6 +124,10 @@ static bool attr_has_sigtrap(void) return ret; } + +static void btf__exit(void) +{ +} #endif /* HAVE_BPF_SKEL */ static void @@ -221,6 +240,7 @@ static int test__sigtrap(struct test_suite *test __maybe_unused, int subtest __m sigaction(SIGTRAP, &oldact, NULL); out: pthread_barrier_destroy(&barrier); + btf__exit(); return ret; } From patchwork Wed Nov 29 15:47:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 171449 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp429246vqn; Wed, 29 Nov 2023 07:48:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IHF+n50bXouIFZLqK4VPNrQEpUnJSc9hFQnXeBvh/EIZv2oApDgUSnvDAb8/5hknc0didTN X-Received: by 2002:a17:902:dac4:b0:1cf:d7e2:5e73 with SMTP id q4-20020a170902dac400b001cfd7e25e73mr10837166plx.49.1701272892538; Wed, 29 Nov 2023 07:48:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701272892; cv=none; d=google.com; s=arc-20160816; b=Y2AJ5iqvOm/oyKprLuP9/DL9Ydw8xAh8L+FzBv988x2YDZ8iBcIi1Ftr4nt6f6g5Mm utxTISyMruHvKfHkyvYb+W6hToWupVCVV3PzJaaPAkgEOeH7TxSRVRGCWz7Pn4bRwLuG xKSWqIpxvB7qprf7lOk0/L4mpNyDSEhTzmSJAAKh/V7mwAObp0vkXdSb2mR0LE0L1KVR 48ri7rh37UQs2t97Qgt9ww1JV27BGA7T1kh74SZ5Hjt8/ZDikYWg0PvwPwUDsuZTl5sE tS1XIG2lSlI68QoNBv7Upm9MzQjexvJM73SFF9SlorIIJjeJ6ZEn2xDEXYeXn1TGlc4A 8CeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NEZw4GlvuZDgEBy2iXwv0HKH0SUrkAeOVlouSVdCYQ4=; fh=jy3LohGc5hVyn54A5LgJUZY1dOWXq435vgH8fY8iy+s=; b=nNJRl9R7Zyo+U2GaXDRXcUBvk63Rbs03y7N+W4UPLxo8pbRg4kfRthrHd6ct+cmuHG DxIYknG1BF1cufX1WC+fZ4oHc9S+CRwWIxXnQqfVO7sPJqlMq7RNI//LXJXJhWPp8+Zf IkIvdr4r+bTRuzOI7o6UJVd9qNkTWqKFG8/5hkEDeimIOKNt/r+0a38EccAI4X6js9jP 8PXK3ytSsbe5pSBY/ZQiz4RoCs1Hl1Yv1MkkPTQe0T7nPH5pbos/zKrpBU01YNvzy0yn uRteJbQ3o+tfC9edQos7IRGLrV1FlMgaxPyP1lIHXDjwVCiIRSVb79yM+8jMwbevTL65 GB1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=srT7EPF8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id u13-20020a170903124d00b001b045d65aedsi14748217plh.228.2023.11.29.07.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 07:48:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=srT7EPF8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id CE91C8035132; Wed, 29 Nov 2023 07:48:09 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344143AbjK2Prr (ORCPT + 99 others); Wed, 29 Nov 2023 10:47:47 -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 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 29 Nov 2023 07:48:09 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783913924440097918 X-GMAIL-MSGID: 1783913924440097918 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) return __btf_type__find_member_by_name(id, "sigtrap") != 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 = 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 = __btf_type__find_member_by_name(id, "lock"); + if (member == NULL) + return false; + + // But check its type as well + type = btf__type_by_id(btf, member->type); + if (!type || !btf_is_struct(type)) + return false; + + type_name = 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; } +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) static int run_stress_test(int fd, pthread_t *threads, pthread_barrier_t *barrier) { - int ret; + int ret, expected_sigtraps; ctx.iterate_on = 3000; @@ -175,7 +208,16 @@ static int run_stress_test(int fd, pthread_t *threads, pthread_barrier_t *barrie ret = run_test_threads(threads, barrier); TEST_ASSERT_EQUAL("disable failed", ioctl(fd, PERF_EVENT_IOC_DISABLE, 0), 0); - TEST_ASSERT_EQUAL("unexpected sigtraps", ctx.signal_count, NUM_THREADS * ctx.iterate_on); + expected_sigtraps = NUM_THREADS * ctx.iterate_on; + + if (ctx.signal_count < expected_sigtraps && kernel_with_sleepable_spinlocks()) { + pr_debug("Expected %d sigtraps, got %d, running on a kernel with sleepable spinlocks.\n", + expected_sigtraps, ctx.signal_count); + pr_debug("See https://lore.kernel.org/all/e368f2c848d77fbc8d259f44e2055fe469c219cf.camel@gmx.de/\n"); + return TEST_SKIP; + } else + TEST_ASSERT_EQUAL("unexpected sigtraps", ctx.signal_count, expected_sigtraps); + TEST_ASSERT_EQUAL("missing signals or incorrectly delivered", ctx.tids_want_signal, 0); TEST_ASSERT_VAL("unexpected si_addr", ctx.first_siginfo.si_addr == &ctx.iterate_on); #if 0 /* FIXME: enable when libc's signal.h has si_perf_{type,data} */