From nobody Fri Nov 29 21:01:31 2024 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2040.outbound.protection.outlook.com [40.107.237.40]) (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 0A06A4206E; Fri, 22 Nov 2024 08:46:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732265198; cv=fail; b=OYQ5Xq6ihrQwa+glkX0JXmOO+/ktBZKRm3YYV6krVpT96j8uxNfWhGvvvMpwxRfkighaFic0nERoq8YzZv1218Nupyapt/l369Y2ov8YLtAZwGy41oER/fu6H+fdjqQRU2qjj4fu9aPfoh7f2kRACFMfBnNr0l8jz4BPY5JW3Kw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732265198; c=relaxed/simple; bh=k3Km63ZXZ4y5KJvn+Fx4IToUcXF9H8Nt/XdDwJREv4Q=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qf4N91KdSVo9koqF2k8CERv+kbWG1Btv3LexRzQwmNckRrLAJ76NOFOYPBdbUyF6J+XDZCr/np0b6f8iayGMZhjq9Ys4v2itK6Ibwfz1fli5aWDkGWTHEgL/QTPVLSTWW8T3lMKDEma1ThNI+HjlaXz6xi1ZKADT3l5FJJ4LB9U= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=Dr5B7sEp; arc=fail smtp.client-ip=40.107.237.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Dr5B7sEp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nFNMrk8C1RaonzJGpKnwy5XVkJPn7gqmxcvssr2LqsVsxZua9LbKaz+9ZnF5emL5X8GCfXxJC9cJQLEeWil80/0TjEtlAjSXaAZt4T8rhwp7Sc30Itu8Okge3ndXKO+UI+tPb2jxg6wWxfom0c+2YcAAr11qel5oBV4/hCGbKmYhP8g8kV9fBpoBVqJ+TM2NOL7yhs6H/BAFNRkFQjcUHmWrw3jx6eevypKlP0WEpbNkoD6K5eF8fFCa+2OLwN/+OF27vNnUbHrHh2Gbm5P7cPdR7nTip47gAnTaKyXIe8YtQYooeYHWMzL9mtpWUHogE7Nps9VUNGiEZP7Cw/UsvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=g3rguBylLklod6O4BskoEO+/VMrCquf3NdJarAFv8Eo=; b=mbjbrN4H61ycAVrwIhICee1GjOk0msTADvtnETeH1KQ/fYdHPM5va7PIMuXveUnw2pFQXeYsCQPdy4CT6PHwhKdtQCxCS0pmA8IPqCMUOyvkhfF7+qP92ayHcKBJxM/873TrsRK2o0pEQKrAD02ml2HUqJib7+Ip/R5pYrflwtYUPhWE7npVjXi/P/CxYATtgAx0sz4T+gvx2KZQDi26fvNmwY7xsRqoH8A5piqHC3JXDPpS+5K8LIba5+JTOPU+dQH0QkjcXkAsamAyXq6cROHjQGrA8HAvWPs1Sgz/AQtQFmtFO0f+XAZspmjl3ETg3XEWYNMI3vQIAfBlfTOmhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.12) smtp.rcpttodomain=infradead.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g3rguBylLklod6O4BskoEO+/VMrCquf3NdJarAFv8Eo=; b=Dr5B7sEpyBalIjNx3cd+ebB6i9DElIMprAsm8eSorWpoCUG1I8RiBE6Jtxs6NaIhDRDJem4+kk4hSBf+DV72rxF6QxfCBVrkPwaOvo6rbeBRphChjPTX1mQjbvhsoRsUNaHW71xB/RippA4eUaHcYxIMjfMvSk4KikSt6RTusXE= Received: from MN0P223CA0006.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:52b::6) by SN7PR12MB7273.namprd12.prod.outlook.com (2603:10b6:806:2ac::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.23; Fri, 22 Nov 2024 08:46:30 +0000 Received: from BN1PEPF00004689.namprd05.prod.outlook.com (2603:10b6:208:52b:cafe::f) by MN0P223CA0006.outlook.office365.com (2603:10b6:208:52b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.15 via Frontend Transport; Fri, 22 Nov 2024 08:46:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.12) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.12 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.12; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.12) by BN1PEPF00004689.mail.protection.outlook.com (10.167.243.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8182.16 via Frontend Transport; Fri, 22 Nov 2024 08:46:29 +0000 Received: from tapi.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 22 Nov 2024 02:46:21 -0600 From: Swapnil Sapkal To: , , , , , CC: , , , , , , , , , , , , , , , , , , , , , Swapnil Sapkal , James Clark Subject: [PATCH v2 2/6] perf sched stats: Add record and rawdump support Date: Fri, 22 Nov 2024 08:44:48 +0000 Message-ID: <20241122084452.1064968-3-swapnil.sapkal@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241122084452.1064968-1-swapnil.sapkal@amd.com> References: <20241122084452.1064968-1-swapnil.sapkal@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004689:EE_|SN7PR12MB7273:EE_ X-MS-Office365-Filtering-Correlation-Id: e3a3c04b-b003-49c9-ffa5-08dd0ad2288d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?V4EdPGhgmUO7qH543vLYraV+ajDfFxKDbtPs/bXg0TiF8UW8BVtqaGeCmgl8?= =?us-ascii?Q?5tqyTb8BvrEeIG7GVVHzjX4DoCe/tTAZy+Q+1JpefQdLIf4IJtj6VtLxfb4V?= =?us-ascii?Q?N4xq1PVdjmkxz/sadokX4SkexVQg3rkG2l4+oqngddYR32IGLC+cvAtn+SZP?= =?us-ascii?Q?USmWqPht0ihAvRq41Gdn3Kxp/AOQAg5dsOvDET2AitHdBtG2AhdAqLMHjipq?= =?us-ascii?Q?1ET3osxXVGCzd6tiZ9hYzSXxMOThO593pvmGwZ2cfotq/OVFK8ksnkuAS0se?= =?us-ascii?Q?FDI6jEXpd3nBW1fkzZ0X2gZcw9cmY9pVfvpG5NTNaUuajhyBto/vtImOTePP?= =?us-ascii?Q?tYXWTmkNYIzZSb3XHo+7CeCk9PrHlX0KsQaAuuMvCz3BTHw57rpIMM9sJVEY?= =?us-ascii?Q?LuKPq5kS0u92LtWPvMjoQylEnEPnfs/3XQVtjQ0aKq2O9y6mb7GZ/ilYNIsj?= =?us-ascii?Q?U0VwRDHzBPXxP2N0g6eA6P3SmpiRsdlnWwI9WjhoAnTaTxim5riaqTL1Jv5O?= =?us-ascii?Q?igDuBqHojG02ctHteunJzNW3j532wAeBRIwUmNE9VEEZnuEOc6iKSZnA4Wxv?= =?us-ascii?Q?sUovKJfwyInvz5ESKzPgeqUvVaYBlXIEmLEF6oE48ZAP00netHMBXYwf/lLg?= =?us-ascii?Q?zgIyNpBUikohur6tXrmBP8dwdEiA4rNvOWVw0EoC83Zbexbpfzqe1zBWIsGM?= =?us-ascii?Q?zDZp8+m8NCtIx7kNM6rOMaTmRjxDyEbFN+8rs8i0WGhFNLhxOFq0ELH0lOD1?= =?us-ascii?Q?f7LWPvUqneq2K/Zp+Z6bd4aZ0dm+S+3JQhvuOeDmP4GSLH9PlurSfxalGahe?= =?us-ascii?Q?Gr3OfxTY1/m44rIQhKHfSKzKxxLi+8yS296BMNBtk4qETtywc5ctEkfQXKP+?= =?us-ascii?Q?TacVmOixt19JnZgKejMJT5AMLKtQGkujQr/Jm9Jxsc3uKt1qoQ56OOK4ra2Q?= =?us-ascii?Q?PdN4k5gfre9icOtPg+z/+DegMr1tWpqv+mSv/l0P5dbrtWT94+vUuTFlnMoU?= =?us-ascii?Q?iyMxvrL5wx2razauOKS7/MYxx1r1qL0L0pmndxmMWEECrLY7Pu4Vk62uCXIe?= =?us-ascii?Q?dX1U5bKyfypco4fhvKJQYvUXehZNiEnarCdt01fs0OFxbh/OLKf1n1z4I33F?= =?us-ascii?Q?HE3PRtU5UCNQNV2PpkH8Je0wlgjAfMGlRLlCbVpkChsI5a9wniNm8ZGWJLbK?= =?us-ascii?Q?jhVJkD+Ri6iceClhDoRgysPKkachR2Z2aP8X4keV0ty6ODqyLlk5ttXSk9z2?= =?us-ascii?Q?aRgokGoMZlYLtuFVVDVhAMTvtWggQcoOtDZvWNmFk/EjdMU6Kv/ebdUIg+8d?= =?us-ascii?Q?3N6FE9Jkup8QdM4vVAgAwyzDJJ4JVXoBLlxd8WgPwz8kTgwWLi8Jaais1rLF?= =?us-ascii?Q?yPVj2eYXKv2WkeiyJ/s4ZvvTZa51S4xy8KDzts8QgkJXnYOyeg=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.12;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:atlvpn-bp.amd.com;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2024 08:46:29.5501 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3a3c04b-b003-49c9-ffa5-08dd0ad2288d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.12];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00004689.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7273 Content-Type: text/plain; charset="utf-8" Define new, perf tool only, sample types and their layouts. Add logic to parse /proc/schedstat, convert it to perf sample format and save samples to perf.data file with `perf sched stats record` command. Also add logic to read perf.data file, interpret schedstat samples and print rawdump of samples with `perf script -D`. Note that, /proc/schedstat file output is standardized with version number. The patch supports v15 but older or newer version can be added easily. Co-developed-by: Ravi Bangoria Signed-off-by: Ravi Bangoria Tested-by: James Clark Signed-off-by: Swapnil Sapkal --- tools/lib/perf/Documentation/libperf.txt | 2 + tools/lib/perf/Makefile | 2 +- tools/lib/perf/include/perf/event.h | 42 ++++ tools/lib/perf/include/perf/schedstat-v15.h | 52 ++++ tools/perf/builtin-inject.c | 2 + tools/perf/builtin-sched.c | 226 +++++++++++++++++- tools/perf/util/event.c | 98 ++++++++ tools/perf/util/event.h | 2 + tools/perf/util/session.c | 20 ++ tools/perf/util/synthetic-events.c | 250 ++++++++++++++++++++ tools/perf/util/synthetic-events.h | 3 + tools/perf/util/tool.c | 20 ++ tools/perf/util/tool.h | 4 +- 13 files changed, 720 insertions(+), 3 deletions(-) create mode 100644 tools/lib/perf/include/perf/schedstat-v15.h diff --git a/tools/lib/perf/Documentation/libperf.txt b/tools/lib/perf/Docu= mentation/libperf.txt index fcfb9499ef9c..39c78682ad2e 100644 --- a/tools/lib/perf/Documentation/libperf.txt +++ b/tools/lib/perf/Documentation/libperf.txt @@ -211,6 +211,8 @@ SYNOPSIS struct perf_record_time_conv; struct perf_record_header_feature; struct perf_record_compressed; + struct perf_record_schedstat_cpu; + struct perf_record_schedstat_domain; -- =20 DESCRIPTION diff --git a/tools/lib/perf/Makefile b/tools/lib/perf/Makefile index 3a9b2140aa04..43a8642e4bab 100644 --- a/tools/lib/perf/Makefile +++ b/tools/lib/perf/Makefile @@ -187,7 +187,7 @@ install_lib: libs $(call do_install_mkdir,$(libdir_SQ)); \ cp -fpR $(LIBPERF_ALL) $(DESTDIR)$(libdir_SQ) =20 -HDRS :=3D bpf_perf.h core.h cpumap.h threadmap.h evlist.h evsel.h event.h = mmap.h +HDRS :=3D bpf_perf.h core.h cpumap.h threadmap.h evlist.h evsel.h event.h = mmap.h schedstat-v15.h INTERNAL_HDRS :=3D cpumap.h evlist.h evsel.h lib.h mmap.h rc_check.h threa= dmap.h xyarray.h =20 INSTALL_HDRS_PFX :=3D $(DESTDIR)$(prefix)/include/perf diff --git a/tools/lib/perf/include/perf/event.h b/tools/lib/perf/include/p= erf/event.h index 37bb7771d914..189106874063 100644 --- a/tools/lib/perf/include/perf/event.h +++ b/tools/lib/perf/include/perf/event.h @@ -457,6 +457,44 @@ struct perf_record_compressed { char data[]; }; =20 +struct perf_record_schedstat_cpu_v15 { +#define CPU_FIELD(_type, _name, _ver) _type _name +#include "schedstat-v15.h" +#undef CPU_FIELD +}; + +struct perf_record_schedstat_cpu { + struct perf_event_header header; + __u64 timestamp; + union { + struct perf_record_schedstat_cpu_v15 v15; + }; + __u32 cpu; + __u16 version; +}; + +struct perf_record_schedstat_domain_v15 { +#define DOMAIN_FIELD(_type, _name, _ver) _type _name +#include "schedstat-v15.h" +#undef DOMAIN_FIELD +}; + +#define DOMAIN_NAME_LEN 16 + +struct perf_record_schedstat_domain { + struct perf_event_header header; + __u16 version; + __u64 timestamp; + __u32 cpu; + __u16 domain; + char name[DOMAIN_NAME_LEN]; + union { + struct perf_record_schedstat_domain_v15 v15; + }; + __u16 nr_cpus; + __u8 cpu_mask[]; +}; + enum perf_user_event_type { /* above any possible kernel type */ PERF_RECORD_USER_TYPE_START =3D 64, PERF_RECORD_HEADER_ATTR =3D 64, @@ -478,6 +516,8 @@ enum perf_user_event_type { /* above any possible kerne= l type */ PERF_RECORD_HEADER_FEATURE =3D 80, PERF_RECORD_COMPRESSED =3D 81, PERF_RECORD_FINISHED_INIT =3D 82, + PERF_RECORD_SCHEDSTAT_CPU =3D 83, + PERF_RECORD_SCHEDSTAT_DOMAIN =3D 84, PERF_RECORD_HEADER_MAX }; =20 @@ -518,6 +558,8 @@ union perf_event { struct perf_record_time_conv time_conv; struct perf_record_header_feature feat; struct perf_record_compressed pack; + struct perf_record_schedstat_cpu schedstat_cpu; + struct perf_record_schedstat_domain schedstat_domain; }; =20 #endif /* __LIBPERF_EVENT_H */ diff --git a/tools/lib/perf/include/perf/schedstat-v15.h b/tools/lib/perf/i= nclude/perf/schedstat-v15.h new file mode 100644 index 000000000000..43f8060c5337 --- /dev/null +++ b/tools/lib/perf/include/perf/schedstat-v15.h @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifdef CPU_FIELD +CPU_FIELD(__u32, yld_count, v15); +CPU_FIELD(__u32, array_exp, v15); +CPU_FIELD(__u32, sched_count, v15); +CPU_FIELD(__u32, sched_goidle, v15); +CPU_FIELD(__u32, ttwu_count, v15); +CPU_FIELD(__u32, ttwu_local, v15); +CPU_FIELD(__u64, rq_cpu_time, v15); +CPU_FIELD(__u64, run_delay, v15); +CPU_FIELD(__u64, pcount, v15); +#endif + +#ifdef DOMAIN_FIELD +DOMAIN_FIELD(__u32, idle_lb_count, v15); +DOMAIN_FIELD(__u32, idle_lb_balanced, v15); +DOMAIN_FIELD(__u32, idle_lb_failed, v15); +DOMAIN_FIELD(__u32, idle_lb_imbalance, v15); +DOMAIN_FIELD(__u32, idle_lb_gained, v15); +DOMAIN_FIELD(__u32, idle_lb_hot_gained, v15); +DOMAIN_FIELD(__u32, idle_lb_nobusyq, v15); +DOMAIN_FIELD(__u32, idle_lb_nobusyg, v15); +DOMAIN_FIELD(__u32, busy_lb_count, v15); +DOMAIN_FIELD(__u32, busy_lb_balanced, v15); +DOMAIN_FIELD(__u32, busy_lb_failed, v15); +DOMAIN_FIELD(__u32, busy_lb_imbalance, v15); +DOMAIN_FIELD(__u32, busy_lb_gained, v15); +DOMAIN_FIELD(__u32, busy_lb_hot_gained, v15); +DOMAIN_FIELD(__u32, busy_lb_nobusyq, v15); +DOMAIN_FIELD(__u32, busy_lb_nobusyg, v15); +DOMAIN_FIELD(__u32, newidle_lb_count, v15); +DOMAIN_FIELD(__u32, newidle_lb_balanced, v15); +DOMAIN_FIELD(__u32, newidle_lb_failed, v15); +DOMAIN_FIELD(__u32, newidle_lb_imbalance, v15); +DOMAIN_FIELD(__u32, newidle_lb_gained, v15); +DOMAIN_FIELD(__u32, newidle_lb_hot_gained, v15); +DOMAIN_FIELD(__u32, newidle_lb_nobusyq, v15); +DOMAIN_FIELD(__u32, newidle_lb_nobusyg, v15); +DOMAIN_FIELD(__u32, alb_count, v15); +DOMAIN_FIELD(__u32, alb_failed, v15); +DOMAIN_FIELD(__u32, alb_pushed, v15); +DOMAIN_FIELD(__u32, sbe_count, v15); +DOMAIN_FIELD(__u32, sbe_balanced, v15); +DOMAIN_FIELD(__u32, sbe_pushed, v15); +DOMAIN_FIELD(__u32, sbf_count, v15); +DOMAIN_FIELD(__u32, sbf_balanced, v15); +DOMAIN_FIELD(__u32, sbf_pushed, v15); +DOMAIN_FIELD(__u32, ttwu_wake_remote, v15); +DOMAIN_FIELD(__u32, ttwu_move_affine, v15); +DOMAIN_FIELD(__u32, ttwu_move_balance, v15); +#endif diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index d6989195a061..b6eca6e92390 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -2530,6 +2530,8 @@ int cmd_inject(int argc, const char **argv) inject.tool.finished_init =3D perf_event__repipe_op2_synth; inject.tool.compressed =3D perf_event__repipe_op4_synth; inject.tool.auxtrace =3D perf_event__repipe_auxtrace; + inject.tool.schedstat_cpu =3D perf_event__repipe_op2_synth; + inject.tool.schedstat_domain =3D perf_event__repipe_op2_synth; inject.tool.dont_split_sample_group =3D true; inject.session =3D __perf_session__new(&data, &inject.tool, /*trace_event_repipe=3D*/inject.output.is_pipe); diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 5981cc51abc8..7dfce34748e4 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -27,6 +27,8 @@ #include "util/debug.h" #include "util/event.h" #include "util/util.h" +#include "util/synthetic-events.h" +#include "util/target.h" =20 #include #include @@ -54,6 +56,7 @@ #define MAX_PRIO 140 =20 static const char *cpu_list; +static struct perf_cpu_map *user_requested_cpus; static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS); =20 struct sched_atom; @@ -237,6 +240,9 @@ struct perf_sched { volatile bool thread_funcs_exit; const char *prio_str; DECLARE_BITMAP(prio_bitmap, MAX_PRIO); + + struct perf_session *session; + struct perf_data *data; }; =20 /* per thread run time data */ @@ -3660,6 +3666,199 @@ static void setup_sorting(struct perf_sched *sched,= const struct option *options sort_dimension__add("pid", &sched->cmp_pid); } =20 +static int process_synthesized_schedstat_event(const struct perf_tool *too= l, + union perf_event *event, + struct perf_sample *sample __maybe_unused, + struct machine *machine __maybe_unused) +{ + struct perf_sched *sched =3D container_of(tool, struct perf_sched, tool); + + if (perf_data__write(sched->data, event, event->header.size) <=3D 0) { + pr_err("failed to write perf data, error: %m\n"); + return -1; + } + + sched->session->header.data_size +=3D event->header.size; + return 0; +} + +static void sighandler(int sig __maybe_unused) +{ +} + +static int enable_sched_schedstats(int *reset) +{ + char path[PATH_MAX]; + FILE *fp; + char ch; + + snprintf(path, PATH_MAX, "%s/sys/kernel/sched_schedstats", procfs__mountp= oint()); + fp =3D fopen(path, "w+"); + if (!fp) { + pr_err("Failed to open %s\n", path); + return -1; + } + + ch =3D getc(fp); + if (ch =3D=3D '0') { + *reset =3D 1; + rewind(fp); + putc('1', fp); + fclose(fp); + } + return 0; +} + +static int disable_sched_schedstat(void) +{ + char path[PATH_MAX]; + FILE *fp; + + snprintf(path, PATH_MAX, "%s/sys/kernel/sched_schedstats", procfs__mountp= oint()); + fp =3D fopen(path, "w"); + if (!fp) { + pr_err("Failed to open %s\n", path); + return -1; + } + + putc('0', fp); + fclose(fp); + return 0; +} + +/* perf.data or any other output file name used by stats subcommand (only)= . */ +const char *output_name; + +static int perf_sched__schedstat_record(struct perf_sched *sched, + int argc, const char **argv) +{ + struct perf_session *session; + struct evlist *evlist; + struct target *target; + int reset =3D 0; + int err =3D 0; + int fd; + struct perf_data data =3D { + .path =3D output_name, + .mode =3D PERF_DATA_MODE_WRITE, + }; + + signal(SIGINT, sighandler); + signal(SIGCHLD, sighandler); + signal(SIGTERM, sighandler); + + evlist =3D evlist__new(); + if (!evlist) + return -ENOMEM; + + session =3D perf_session__new(&data, &sched->tool); + if (IS_ERR(session)) { + pr_err("Perf session creation failed.\n"); + return PTR_ERR(session); + } + + session->evlist =3D evlist; + + sched->session =3D session; + sched->data =3D &data; + + fd =3D perf_data__fd(&data); + + /* + * Capture all important metadata about the system. Although they are + * not used by `perf sched stats` tool directly, they provide useful + * information about profiled environment. + */ + perf_header__set_feat(&session->header, HEADER_HOSTNAME); + perf_header__set_feat(&session->header, HEADER_OSRELEASE); + perf_header__set_feat(&session->header, HEADER_VERSION); + perf_header__set_feat(&session->header, HEADER_ARCH); + perf_header__set_feat(&session->header, HEADER_NRCPUS); + perf_header__set_feat(&session->header, HEADER_CPUDESC); + perf_header__set_feat(&session->header, HEADER_CPUID); + perf_header__set_feat(&session->header, HEADER_TOTAL_MEM); + perf_header__set_feat(&session->header, HEADER_CMDLINE); + perf_header__set_feat(&session->header, HEADER_CPU_TOPOLOGY); + perf_header__set_feat(&session->header, HEADER_NUMA_TOPOLOGY); + perf_header__set_feat(&session->header, HEADER_CACHE); + perf_header__set_feat(&session->header, HEADER_MEM_TOPOLOGY); + perf_header__set_feat(&session->header, HEADER_CPU_PMU_CAPS); + perf_header__set_feat(&session->header, HEADER_HYBRID_TOPOLOGY); + perf_header__set_feat(&session->header, HEADER_PMU_CAPS); + + err =3D perf_session__write_header(session, evlist, fd, false); + if (err < 0) + goto out; + + /* + * `perf sched stats` does not support workload profiling (-p pid) + * since /proc/schedstat file contains cpu specific data only. Hence, a + * profile target is either set of cpus or systemwide, never a process. + * Note that, although `-- ` is supported, profile data are + * still cpu/systemwide. + */ + target =3D zalloc(sizeof(struct target)); + if (cpu_list) + target->cpu_list =3D cpu_list; + else + target->system_wide =3D true; + + if (argc) { + err =3D evlist__prepare_workload(evlist, target, argv, false, NULL); + if (err) + goto out_target; + } + + if (cpu_list) { + user_requested_cpus =3D perf_cpu_map__new(cpu_list); + if (!user_requested_cpus) + goto out_target; + } + + err =3D perf_event__synthesize_schedstat(&(sched->tool), + process_synthesized_schedstat_event, + user_requested_cpus); + if (err < 0) + goto out_target; + + err =3D enable_sched_schedstats(&reset); + if (err < 0) + goto out_target; + + if (argc) + evlist__start_workload(evlist); + + /* wait for signal */ + pause(); + + if (reset) { + err =3D disable_sched_schedstat(); + if (err < 0) + goto out_target; + } + + err =3D perf_event__synthesize_schedstat(&(sched->tool), + process_synthesized_schedstat_event, + user_requested_cpus); + if (err < 0) + goto out_target; + + err =3D perf_session__write_header(session, evlist, fd, true); + +out_target: + free(target); +out: + if (!err) + fprintf(stderr, "[ perf sched stats: Wrote samples to %s ]\n", data.path= ); + else + fprintf(stderr, "[ perf sched stats: Failed !! ]\n"); + + close(fd); + perf_session__delete(session); + + return err; +} + static bool schedstat_events_exposed(void) { /* @@ -3835,6 +4034,12 @@ int cmd_sched(int argc, const char **argv) "analyze events only for given task priority(ies)"), OPT_PARENT(sched_options) }; + const struct option stats_options[] =3D { + OPT_STRING('o', "output", &output_name, "file", + "`stats record` with output filename"), + OPT_STRING('C', "cpu", &cpu_list, "cpu", "list of cpus to profile"), + OPT_END() + }; =20 const char * const latency_usage[] =3D { "perf sched latency []", @@ -3852,9 +4057,13 @@ int cmd_sched(int argc, const char **argv) "perf sched timehist []", NULL }; + const char *stats_usage[] =3D { + "perf sched stats {record} []", + NULL + }; const char *const sched_subcommands[] =3D { "record", "latency", "map", "replay", "script", - "timehist", NULL }; + "timehist", "stats", NULL }; const char *sched_usage[] =3D { NULL, NULL @@ -3950,6 +4159,21 @@ int cmd_sched(int argc, const char **argv) return ret; =20 return perf_sched__timehist(&sched); + } else if (!strcmp(argv[0], "stats")) { + const char *const stats_subcommands[] =3D {"record", NULL}; + + argc =3D parse_options_subcommand(argc, argv, stats_options, + stats_subcommands, + stats_usage, + PARSE_OPT_STOP_AT_NON_OPTION); + + if (argv[0] && !strcmp(argv[0], "record")) { + if (argc) + argc =3D parse_options(argc, argv, stats_options, + stats_usage, 0); + return perf_sched__schedstat_record(&sched, argc, argv); + } + usage_with_options(stats_usage, stats_options); } else { usage_with_options(sched_usage, sched_options); } diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index aac96d5d1917..0f863d38abe2 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -77,6 +77,8 @@ static const char *perf_event__names[] =3D { [PERF_RECORD_HEADER_FEATURE] =3D "FEATURE", [PERF_RECORD_COMPRESSED] =3D "COMPRESSED", [PERF_RECORD_FINISHED_INIT] =3D "FINISHED_INIT", + [PERF_RECORD_SCHEDSTAT_CPU] =3D "SCHEDSTAT_CPU", + [PERF_RECORD_SCHEDSTAT_DOMAIN] =3D "SCHEDSTAT_DOMAIN", }; =20 const char *perf_event__name(unsigned int id) @@ -550,6 +552,102 @@ size_t perf_event__fprintf_text_poke(union perf_event= *event, struct machine *ma return ret; } =20 +size_t perf_event__fprintf_schedstat_cpu(union perf_event *event, FILE *fp) +{ + struct perf_record_schedstat_cpu *cs =3D &event->schedstat_cpu; + __u16 version =3D cs->version; + size_t size =3D 0; + + size =3D fprintf(fp, "\ncpu%u ", cs->cpu); + +#define CPU_FIELD(_type, _name, _ver) \ + size +=3D fprintf(fp, "%" PRIu64 " ", (unsigned long)cs->_ver._name) + + if (version =3D=3D 15) { +#include + return size; + } +#undef CPU_FIELD + + return fprintf(fp, "Unsupported /proc/schedstat version %d.\n", + event->schedstat_cpu.version); +} + +size_t perf_event__fprintf_schedstat_domain(union perf_event *event, FILE = *fp) +{ + struct perf_record_schedstat_domain *ds =3D &event->schedstat_domain; + __u16 version =3D ds->version; + size_t cpu_mask_len_2; + size_t cpu_mask_len; + size_t size =3D 0; + char *cpu_mask; + int idx; + int i, j; + bool low; + + if (ds->name[0]) + size =3D fprintf(fp, "\ndomain%u:%s ", ds->domain, ds->name); + else + size =3D fprintf(fp, "\ndomain%u ", ds->domain); + + cpu_mask_len =3D ((ds->nr_cpus + 3) >> 2); + cpu_mask_len_2 =3D cpu_mask_len + ((cpu_mask_len - 1) / 8); + + cpu_mask =3D zalloc(cpu_mask_len_2 + 1); + if (!cpu_mask) + return fprintf(fp, "Cannot allocate memory for cpumask\n"); + + idx =3D ((ds->nr_cpus + 7) >> 3) - 1; + + i =3D cpu_mask_len_2 - 1; + + low =3D true; + j =3D 1; + while (i >=3D 0) { + __u8 m; + + if (low) + m =3D ds->cpu_mask[idx] & 0xf; + else + m =3D (ds->cpu_mask[idx] & 0xf0) >> 4; + + if (m >=3D 0 && m <=3D 9) + m +=3D '0'; + else if (m >=3D 0xa && m <=3D 0xf) + m =3D m + 'a' - 10; + else if (m >=3D 0xA && m <=3D 0xF) + m =3D m + 'A' - 10; + + cpu_mask[i] =3D m; + + if (j =3D=3D 8 && i !=3D 0) { + cpu_mask[i - 1] =3D ','; + j =3D 0; + i--; + } + + if (!low) + idx--; + low =3D !low; + i--; + j++; + } + size +=3D fprintf(fp, "%s ", cpu_mask); + free(cpu_mask); + +#define DOMAIN_FIELD(_type, _name, _ver) \ + size +=3D fprintf(fp, "%" PRIu64 " ", (unsigned long)ds->_ver._name) + + if (version =3D=3D 15) { +#include + return size; + } +#undef DOMAIN_FIELD + + return fprintf(fp, "Unsupported /proc/schedstat version %d.\n", + event->schedstat_domain.version); +} + size_t perf_event__fprintf(union perf_event *event, struct machine *machin= e, FILE *fp) { size_t ret =3D fprintf(fp, "PERF_RECORD_%s", diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index f8742e6230a5..96e7cd1d282d 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -360,6 +360,8 @@ size_t perf_event__fprintf_cgroup(union perf_event *eve= nt, FILE *fp); size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp); size_t perf_event__fprintf_bpf(union perf_event *event, FILE *fp); size_t perf_event__fprintf_text_poke(union perf_event *event, struct machi= ne *machine,FILE *fp); +size_t perf_event__fprintf_schedstat_cpu(union perf_event *event, FILE *fp= ); +size_t perf_event__fprintf_schedstat_domain(union perf_event *event, FILE = *fp); size_t perf_event__fprintf(union perf_event *event, struct machine *machin= e, FILE *fp); =20 int kallsyms__get_function_start(const char *kallsyms_filename, diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index dbaf07bf6c5f..a929a63e1827 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -691,6 +691,20 @@ static void perf_event__time_conv_swap(union perf_even= t *event, } } =20 +static void +perf_event__schedstat_cpu_swap(union perf_event *event __maybe_unused, + bool sample_id_all __maybe_unused) +{ + /* FIXME */ +} + +static void +perf_event__schedstat_domain_swap(union perf_event *event __maybe_unused, + bool sample_id_all __maybe_unused) +{ + /* FIXME */ +} + typedef void (*perf_event__swap_op)(union perf_event *event, bool sample_id_all); =20 @@ -729,6 +743,8 @@ static perf_event__swap_op perf_event__swap_ops[] =3D { [PERF_RECORD_STAT_ROUND] =3D perf_event__stat_round_swap, [PERF_RECORD_EVENT_UPDATE] =3D perf_event__event_update_swap, [PERF_RECORD_TIME_CONV] =3D perf_event__time_conv_swap, + [PERF_RECORD_SCHEDSTAT_CPU] =3D perf_event__schedstat_cpu_swap, + [PERF_RECORD_SCHEDSTAT_DOMAIN] =3D perf_event__schedstat_domain_swap, [PERF_RECORD_HEADER_MAX] =3D NULL, }; =20 @@ -1444,6 +1460,10 @@ static s64 perf_session__process_user_event(struct p= erf_session *session, return err; case PERF_RECORD_FINISHED_INIT: return tool->finished_init(session, event); + case PERF_RECORD_SCHEDSTAT_CPU: + return tool->schedstat_cpu(session, event); + case PERF_RECORD_SCHEDSTAT_DOMAIN: + return tool->schedstat_domain(session, event); default: return -EINVAL; } diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index a58444c4aed1..b2f9ddba8a54 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -2507,3 +2507,253 @@ int parse_synth_opt(char *synth) =20 return ret; } + +static union perf_event *__synthesize_schedstat_cpu(struct io *io, __u16 v= ersion, + __u64 *cpu, __u64 timestamp) +{ + struct perf_record_schedstat_cpu *cs; + union perf_event *event; + size_t size; + char ch; + + size =3D sizeof(struct perf_record_schedstat_cpu); + size =3D PERF_ALIGN(size, sizeof(u64)); + event =3D zalloc(size); + + if (!event) + return NULL; + + cs =3D &event->schedstat_cpu; + cs->header.type =3D PERF_RECORD_SCHEDSTAT_CPU; + cs->header.size =3D size; + cs->timestamp =3D timestamp; + + if (io__get_char(io) !=3D 'p' || io__get_char(io) !=3D 'u') + goto out_cpu; + + if (io__get_dec(io, (__u64 *)cpu) !=3D ' ') + goto out_cpu; + +#define CPU_FIELD(_type, _name, _ver) \ + do { \ + __u64 _tmp; \ + ch =3D io__get_dec(io, &_tmp); \ + if (ch !=3D ' ' && ch !=3D '\n') \ + goto out_cpu; \ + cs->_ver._name =3D _tmp; \ + } while (0) + + if (version =3D=3D 15) { +#include + } +#undef CPU_FIELD + + cs->cpu =3D *cpu; + cs->version =3D version; + + return event; +out_cpu: + free(event); + return NULL; +} + +static size_t schedstat_sanitize_cpumask(char *cpu_mask, size_t cpu_mask_l= en) +{ + char *dst =3D cpu_mask; + char *src =3D cpu_mask; + int i =3D 0; + + for ( ; src < cpu_mask + cpu_mask_len; dst++, src++) { + while (*src =3D=3D ',') + src++; + + *dst =3D *src; + } + + for ( ; dst < src; dst++, i++) + *dst =3D '\0'; + + return cpu_mask_len - i; +} + +static union perf_event *__synthesize_schedstat_domain(struct io *io, __u1= 6 version, + __u64 cpu, __u64 timestamp) +{ + struct perf_env env =3D { .total_mem =3D 0, }; + int nr_cpus_avail =3D perf_env__nr_cpus_avail(&env); + struct perf_record_schedstat_domain *ds; + union perf_event *event; + size_t d_name_len =3D 0; + char *d_name =3D NULL; + size_t cpu_mask_len =3D 0; + char *cpu_mask =3D NULL; + __u64 d_num; + size_t size; + int i =3D 0; + bool low; + char ch; + int idx; + + if (io__get_char(io) !=3D 'o' || io__get_char(io) !=3D 'm' || io__get_cha= r(io) !=3D 'a' || + io__get_char(io) !=3D 'i' || io__get_char(io) !=3D 'n') + return NULL; + + ch =3D io__get_dec(io, &d_num); + if (ch =3D=3D ':') { + if (io__getdelim(io, &d_name, &d_name_len, ' ') < 0 || !d_name_len) + return NULL; + d_name[d_name_len - 1] =3D '\0'; + d_name_len--; + } else if (ch !=3D ' ') { + return NULL; + } + + if (io__getdelim(io, &cpu_mask, &cpu_mask_len, ' ') < 0 || !cpu_mask_len) + goto out; + + cpu_mask[cpu_mask_len - 1] =3D '\0'; + cpu_mask_len--; + cpu_mask_len =3D schedstat_sanitize_cpumask(cpu_mask, cpu_mask_len); + + size =3D sizeof(struct perf_record_schedstat_domain) + ((nr_cpus_avail + = 7) >> 3); + size =3D PERF_ALIGN(size, sizeof(u64)); + event =3D zalloc(size); + + if (!event) + goto out_cpu_mask; + + ds =3D &event->schedstat_domain; + ds->header.type =3D PERF_RECORD_SCHEDSTAT_DOMAIN; + ds->header.size =3D size; + ds->version =3D version; + ds->timestamp =3D timestamp; + if (d_name) + strncpy(ds->name, d_name, DOMAIN_NAME_LEN - 1); + ds->domain =3D d_num; + ds->nr_cpus =3D nr_cpus_avail; + + idx =3D ((nr_cpus_avail + 7) >> 3) - 1; + low =3D true; + for (i =3D cpu_mask_len - 1; i >=3D 0 && idx >=3D 0; i--) { + char mask =3D cpu_mask[i]; + + if (mask >=3D '0' && mask <=3D '9') + mask -=3D '0'; + else if (mask >=3D 'a' && mask <=3D 'f') + mask =3D mask - 'a' + 10; + else if (mask >=3D 'A' && mask <=3D 'F') + mask =3D mask - 'A' + 10; + + if (low) { + ds->cpu_mask[idx] =3D mask; + } else { + ds->cpu_mask[idx] |=3D (mask << 4); + idx--; + } + low =3D !low; + } + + free(d_name); + free(cpu_mask); + +#define DOMAIN_FIELD(_type, _name, _ver) \ + do { \ + __u64 _tmp; \ + ch =3D io__get_dec(io, &_tmp); \ + if (ch !=3D ' ' && ch !=3D '\n') \ + goto out_domain; \ + ds->_ver._name =3D _tmp; \ + } while (0) + + if (version =3D=3D 15) { +#include + } +#undef DOMAIN_FIELD + + ds->cpu =3D cpu; + return event; + +out_domain: + free(event); +out_cpu_mask: + free(cpu_mask); +out: + free(d_name); + return NULL; +} + +int perf_event__synthesize_schedstat(const struct perf_tool *tool, + perf_event__handler_t process, + struct perf_cpu_map *user_requested_cpus) +{ + char *line =3D NULL, path[PATH_MAX]; + union perf_event *event =3D NULL; + size_t line_len =3D 0; + char bf[BUFSIZ]; + __u64 timestamp; + __u64 cpu =3D -1; + __u16 version; + struct io io; + int ret =3D -1; + char ch; + + snprintf(path, PATH_MAX, "%s/schedstat", procfs__mountpoint()); + io.fd =3D open(path, O_RDONLY, 0); + if (io.fd < 0) { + pr_err("Failed to open %s. Possibly CONFIG_SCHEDSTAT is disabled.\n", pa= th); + return -1; + } + io__init(&io, io.fd, bf, sizeof(bf)); + + if (io__getline(&io, &line, &line_len) < 0 || !line_len) + goto out; + + if (!strcmp(line, "version 15\n")) { + version =3D 15; + } else { + pr_err("Unsupported %s version: %s", path, line + 8); + goto out_free_line; + } + + if (io__getline(&io, &line, &line_len) < 0 || !line_len) + goto out_free_line; + timestamp =3D atol(line + 10); + + /* + * FIXME: Can be optimized a bit by not synthesizing domain samples + * for filtered out cpus. + */ + for (ch =3D io__get_char(&io); !io.eof; ch =3D io__get_char(&io)) { + struct perf_cpu this_cpu; + + if (ch =3D=3D 'c') { + event =3D __synthesize_schedstat_cpu(&io, version, + &cpu, timestamp); + } else if (ch =3D=3D 'd') { + event =3D __synthesize_schedstat_domain(&io, version, + cpu, timestamp); + } + if (!event) + goto out_free_line; + + this_cpu.cpu =3D cpu; + + if (user_requested_cpus && !perf_cpu_map__has(user_requested_cpus, this_= cpu)) + continue; + + if (process(tool, event, NULL, NULL) < 0) { + free(event); + goto out_free_line; + } + + free(event); + } + + ret =3D 0; + +out_free_line: + free(line); +out: + close(io.fd); + return ret; +} diff --git a/tools/perf/util/synthetic-events.h b/tools/perf/util/synthetic= -events.h index b9c936b5cfeb..eab914c238df 100644 --- a/tools/perf/util/synthetic-events.h +++ b/tools/perf/util/synthetic-events.h @@ -141,4 +141,7 @@ int perf_event__synthesize_for_pipe(const struct perf_t= ool *tool, struct perf_data *data, perf_event__handler_t process); =20 +int perf_event__synthesize_schedstat(const struct perf_tool *tool, + perf_event__handler_t process, + struct perf_cpu_map *user_requested_cpu); #endif // __PERF_SYNTHETIC_EVENTS_H diff --git a/tools/perf/util/tool.c b/tools/perf/util/tool.c index 3b7f390f26eb..9f81d720735f 100644 --- a/tools/perf/util/tool.c +++ b/tools/perf/util/tool.c @@ -230,6 +230,24 @@ static int perf_session__process_compressed_event_stub= (struct perf_session *sess return 0; } =20 +static int process_schedstat_cpu_stub(struct perf_session *perf_session __= maybe_unused, + union perf_event *event) +{ + if (dump_trace) + perf_event__fprintf_schedstat_cpu(event, stdout); + dump_printf(": unhandled!\n"); + return 0; +} + +static int process_schedstat_domain_stub(struct perf_session *perf_session= __maybe_unused, + union perf_event *event) +{ + if (dump_trace) + perf_event__fprintf_schedstat_domain(event, stdout); + dump_printf(": unhandled!\n"); + return 0; +} + void perf_tool__init(struct perf_tool *tool, bool ordered_events) { tool->ordered_events =3D ordered_events; @@ -286,6 +304,8 @@ void perf_tool__init(struct perf_tool *tool, bool order= ed_events) tool->compressed =3D perf_session__process_compressed_event_stub; #endif tool->finished_init =3D process_event_op2_stub; + tool->schedstat_cpu =3D process_schedstat_cpu_stub; + tool->schedstat_domain =3D process_schedstat_domain_stub; } =20 bool perf_tool__compressed_is_stub(const struct perf_tool *tool) diff --git a/tools/perf/util/tool.h b/tools/perf/util/tool.h index db1c7642b0d1..d289a5396b01 100644 --- a/tools/perf/util/tool.h +++ b/tools/perf/util/tool.h @@ -77,7 +77,9 @@ struct perf_tool { stat, stat_round, feature, - finished_init; + finished_init, + schedstat_cpu, + schedstat_domain; event_op4 compressed; event_op3 auxtrace; bool ordered_events; --=20 2.43.0