From patchwork Mon Jul 3 10:57:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 13299969 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 21B04EB64DC for ; Mon, 3 Jul 2023 10:58:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229984AbjGCK6o (ORCPT ); Mon, 3 Jul 2023 06:58:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbjGCK6l (ORCPT ); Mon, 3 Jul 2023 06:58:41 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02DB1C9; Mon, 3 Jul 2023 03:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688381921; x=1719917921; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5O3ycQ0jPsLOdFx+EoGLPYvpt2BkiJe1rCk/xqPkFJk=; b=BsZ8+tLjErBDZ9RebRsDrDtNKv722D3sFvJTvhqv6ljnEiZrfhEtcbBu KZ5rXel7klJYXpMRJEe3o4zzqCrv0numy5cD27LbUW9eEdXyWJ2CMVj4q IzFnOEF3JR2gm0/LIIt8ju3WrDQVzDWpq/YbJzQZO1RfcLa4sRyavBChq qZzKdfOhCZElYFvFXg8fL0ooGP60XyDMqXEP4x3pziMQmBShCs0Za/9qb MACK7auPjc+kuERriwOzt9e01VgqAxAibb2BhoQLnBCj59HMSsUQhFy+O ugWtaXH5fPRiQEBSeSnfbkL5T9DlJXjdUa1JQ2eRNUgSZaNNVvCDrIMhA w==; X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="360329715" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="360329715" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 03:58:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="748108255" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="748108255" Received: from agrabezh-mobl1.ccr.corp.intel.com (HELO tkristo-desk.intel.com) ([10.252.48.27]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 03:58:27 -0700 From: Tero Kristo To: shuah@kernel.org, tglx@linutronix.de, x86@kernel.org, bp@alien8.de, dave.hansen@linux.intel.com, mingo@redhat.com Cc: ast@kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, andrii@kernel.org, daniel@iogearbox.net, bpf@vger.kernel.org Subject: [PATCH 1/2] x86/tsc: Add new BPF helper call bpf_rdtsc Date: Mon, 3 Jul 2023 13:57:44 +0300 Message-Id: <20230703105745.1314475-2-tero.kristo@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230703105745.1314475-1-tero.kristo@linux.intel.com> References: <20230703105745.1314475-1-tero.kristo@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Currently the raw TSC counter can be read within kernel via rdtsc_ordered() and friends, and additionally even userspace has access to it via the RDTSC assembly instruction. BPF programs on the other hand don't have direct access to the TSC counter, but alternatively must go through the performance subsystem (bpf_perf_event_read), which only provides relative value compared to the start point of the program, and is also much slower than the direct read. Add a new BPF helper definition for bpf_rdtsc() which can be used for any accurate profiling needs. A use-case for the new API is for example wakeup latency tracing via eBPF on Intel architecture, where it is extremely beneficial to be able to get raw TSC timestamps and compare these directly to the value programmed to the MSR_IA32_TSC_DEADLINE register. This way a direct latency value from the hardware interrupt to the execution of the interrupt handler can be calculated. Having the functionality within eBPF also has added benefits of allowing to filter any other relevant data like C-state residency values, and also to drop any irrelevant data points directly in the kernel context, without passing all the data to userspace for post-processing. Signed-off-by: Tero Kristo --- arch/x86/include/asm/msr.h | 1 + arch/x86/kernel/tsc.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 65ec1965cd28..3dde673cb563 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -309,6 +309,7 @@ struct msr *msrs_alloc(void); void msrs_free(struct msr *msrs); int msr_set_bit(u32 msr, u8 bit); int msr_clear_bit(u32 msr, u8 bit); +u64 bpf_rdtsc(void); #ifdef CONFIG_SMP int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 344698852146..ded857abef81 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include @@ -29,6 +31,7 @@ #include #include #include +#include unsigned int __read_mostly cpu_khz; /* TSC clocks / usec, not used here */ EXPORT_SYMBOL(cpu_khz); @@ -1551,6 +1554,24 @@ void __init tsc_early_init(void) tsc_enable_sched_clock(); } +u64 bpf_rdtsc(void) +{ + /* Check if Time Stamp is enabled only in ring 0 */ + if (cr4_read_shadow() & X86_CR4_TSD) + return 0; + + return rdtsc_ordered(); +} + +BTF_SET8_START(tsc_bpf_kfunc_ids) +BTF_ID_FLAGS(func, bpf_rdtsc) +BTF_SET8_END(tsc_bpf_kfunc_ids) + +static const struct btf_kfunc_id_set tsc_bpf_kfunc_set = { + .owner = THIS_MODULE, + .set = &tsc_bpf_kfunc_ids, +}; + void __init tsc_init(void) { if (!cpu_feature_enabled(X86_FEATURE_TSC)) { @@ -1594,6 +1615,8 @@ void __init tsc_init(void) clocksource_register_khz(&clocksource_tsc_early, tsc_khz); detect_art(); + + register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, &tsc_bpf_kfunc_set); } #ifdef CONFIG_SMP From patchwork Mon Jul 3 10:57:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 13299968 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 6258AEB64DD for ; Mon, 3 Jul 2023 10:58:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231294AbjGCK6o (ORCPT ); Mon, 3 Jul 2023 06:58:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230203AbjGCK6n (ORCPT ); Mon, 3 Jul 2023 06:58:43 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFBB6D2; Mon, 3 Jul 2023 03:58:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688381922; x=1719917922; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GZZoC3iTyzrkENAoUyx8fll+6b0qjLWSGcIt+67G8aY=; b=fW1iZcWuyOmDiB/8SOMcQDjgOnV/B6ct4zUBiILa6IASr0RVj7lJ0qml qGOv/J3bpW7AbGYA7hzSKszzPQftRhnmcsANkcqD9I2urtghP7ovYIA7u wpArnjG0y5xWLbXQ92AWrHOTlQvCIZzCgg7Ve1IzW/UdJEj8oV6KIttLG 4vJ0OAJpNMuN+vH2BZLQlGwYclBbt7AokCw0pkmIvxntQIaazEjxYVIsk R5h09GKPy4r/6xyjiTPqj3Bukg85zAyA+VCXpj9qaAzq/R3ct6PGdsRJg F5ERYdM0clAnbDbUE67gOSIqb/s4BOvKrl9Q9TsxloaSo/guv2eQ2huDx A==; X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="360329731" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="360329731" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 03:58:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10759"; a="748108266" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="748108266" Received: from agrabezh-mobl1.ccr.corp.intel.com (HELO tkristo-desk.intel.com) ([10.252.48.27]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 03:58:30 -0700 From: Tero Kristo To: shuah@kernel.org, tglx@linutronix.de, x86@kernel.org, bp@alien8.de, dave.hansen@linux.intel.com, mingo@redhat.com Cc: ast@kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, andrii@kernel.org, daniel@iogearbox.net, bpf@vger.kernel.org Subject: [PATCH 2/2] selftests/bpf: Add test for bpf_rdtsc Date: Mon, 3 Jul 2023 13:57:45 +0300 Message-Id: <20230703105745.1314475-3-tero.kristo@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230703105745.1314475-1-tero.kristo@linux.intel.com> References: <20230703105745.1314475-1-tero.kristo@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add selftest for bpf_rdtsc() which reads the TSC (Time Stamp Counter) on x86_64 architectures. The test reads the TSC from both userspace and the BPF program, and verifies the TSC values are in incremental order as expected. The test is automatically skipped on architectures that do not support the feature. Signed-off-by: Tero Kristo --- .../selftests/bpf/prog_tests/test_rdtsc.c | 67 +++++++++++++++++++ .../testing/selftests/bpf/progs/test_rdtsc.c | 21 ++++++ 2 files changed, 88 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/test_rdtsc.c create mode 100644 tools/testing/selftests/bpf/progs/test_rdtsc.c diff --git a/tools/testing/selftests/bpf/prog_tests/test_rdtsc.c b/tools/testing/selftests/bpf/prog_tests/test_rdtsc.c new file mode 100644 index 000000000000..2b26deb5b35a --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/test_rdtsc.c @@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2023 Intel Corporation */ + +#include "test_progs.h" +#include "test_rdtsc.skel.h" + +#ifdef __x86_64__ + +static inline u64 _rdtsc(void) +{ + u32 low, high; + + __asm__ __volatile__("rdtscp" : "=a" (low), "=d" (high)); + return ((u64)high << 32) | low; +} + +static int rdtsc(struct test_rdtsc *skel) +{ + int err, prog_fd; + u64 user_c1, user_c2; + + LIBBPF_OPTS(bpf_test_run_opts, topts); + + err = test_rdtsc__attach(skel); + if (!ASSERT_OK(err, "test_rdtsc_attach")) + return err; + + user_c1 = _rdtsc(); + + prog_fd = bpf_program__fd(skel->progs.test1); + err = bpf_prog_test_run_opts(prog_fd, &topts); + + user_c2 = _rdtsc(); + + ASSERT_OK(err, "test_run"); + ASSERT_EQ(topts.retval, 0, "test_run"); + + test_rdtsc__detach(skel); + + ASSERT_GE(skel->bss->c1, user_c1, "bpf c1 > user c1"); + ASSERT_GE(user_c2, skel->bss->c2, "user c2 > bpf c2"); + ASSERT_GE(skel->bss->c2, user_c1, "bpf c2 > bpf c1"); + ASSERT_GE(user_c2, user_c1, "user c2 > user c1"); + + return 0; +} +#endif + +void test_rdtsc(void) +{ +#ifdef __x86_64__ + struct test_rdtsc *skel; + int err; + + skel = test_rdtsc__open_and_load(); + if (!ASSERT_OK_PTR(skel, "test_rdtsc_skel_load")) + goto cleanup; + err = rdtsc(skel); + ASSERT_OK(err, "rdtsc"); + +cleanup: + test_rdtsc__destroy(skel); +#else + printf("%s:SKIP:bpf_rdtsc() kfunc not supported\n", __func__); + test__skip(); +#endif +} diff --git a/tools/testing/selftests/bpf/progs/test_rdtsc.c b/tools/testing/selftests/bpf/progs/test_rdtsc.c new file mode 100644 index 000000000000..14776b83bd3e --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_rdtsc.c @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2023 Intel Corporation */ +#include +#include +#include + +char _license[] SEC("license") = "GPL"; + +__u64 c1; +__u64 c2; + +extern __u64 bpf_rdtsc(void) __ksym; + +SEC("fentry/bpf_fentry_test1") +int BPF_PROG2(test1, int, a) +{ + c1 = bpf_rdtsc(); + c2 = bpf_rdtsc(); + + return 0; +}