[v4,16/29] selftests/resctrl: Improve perf init

Message ID	20231215150515.36983-17-ilpo.jarvinen@linux.intel.com
State	Accepted
Commit	038ce802e248a985150156da84bc3f118236b898
Headers	show Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) (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 36EED3EA67; Fri, 15 Dec 2023 15:07:56 +0000 (UTC) From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com> To: linux-kselftest@vger.kernel.org, Reinette Chatre <reinette.chatre@intel.com>, Shuah Khan <shuah@kernel.org>, Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>, =?utf-8?q?Maciej_Wiecz=C3=B3r-R?= =?utf-8?q?etman?= <maciej.wieczor-retman@intel.com>, Fenghua Yu <fenghua.yu@intel.com> Cc: linux-kernel@vger.kernel.org, =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com> Subject: [PATCH v4 16/29] selftests/resctrl: Improve perf init Date: Fri, 15 Dec 2023 17:05:02 +0200 Message-Id: <20231215150515.36983-17-ilpo.jarvinen@linux.intel.com> In-Reply-To: <20231215150515.36983-1-ilpo.jarvinen@linux.intel.com> References: <20231215150515.36983-1-ilpo.jarvinen@linux.intel.com> Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Series	selftests/resctrl: CAT test improvements & generalized test framework \| expand [v4,00/29] selftests/resctrl: CAT test improvements & generalized test framework [v4,01/29] selftests/resctrl: Convert perror() to ksft_perror() or ksft_print_msg() [v4,02/29] selftests/resctrl: Return -1 instead of errno on error [v4,03/29] selftests/resctrl: Don't use ctrlc_handler() outside signal handling [v4,04/29] selftests/resctrl: Change function comments to say < 0 on error [v4,05/29] selftests/resctrl: Split fill_buf to allow tests finer-grained control [v4,06/29] selftests/resctrl: Refactor fill_buf functions [v4,07/29] selftests/resctrl: Refactor get_cbm_mask() and rename to get_full_cbm() [v4,08/29] selftests/resctrl: Mark get_cache_size() cache_type const [v4,09/29] selftests/resctrl: Create cache_portion_size() helper [v4,10/29] selftests/resctrl: Exclude shareable bits from schemata in CAT test [v4,11/29] selftests/resctrl: Split measure_cache_vals() [v4,12/29] selftests/resctrl: Split show_cache_info() to test specific and generic parts [v4,13/29] selftests/resctrl: Remove unnecessary __u64 -> unsigned long conversion [v4,14/29] selftests/resctrl: Remove nested calls in perf event handling [v4,15/29] selftests/resctrl: Consolidate naming of perf event related things [v4,16/29] selftests/resctrl: Improve perf init [v4,17/29] selftests/resctrl: Convert perf related globals to locals [v4,18/29] selftests/resctrl: Move cat_val() to cat_test.c and rename to cat_test() [v4,19/29] selftests/resctrl: Open perf fd before start & add error handling [v4,20/29] selftests/resctrl: Replace file write with volatile variable [v4,21/29] selftests/resctrl: Read in less obvious order to defeat prefetch optimizations [v4,22/29] selftests/resctrl: Rewrite Cache Allocation Technology (CAT) test [v4,23/29] selftests/resctrl: Restore the CPU affinity after CAT test [v4,24/29] selftests/resctrl: Create struct for input parameters [v4,25/29] selftests/resctrl: Introduce generalized test framework [v4,26/29] selftests/resctrl: Pass write_schemata() resource instead of test name [v4,27/29] selftests/resctrl: Add helper to convert L2/3 to integer [v4,28/29] selftests/resctrl: Rename resource ID to domain ID [v4,29/29] selftests/resctrl: Get domain id from cache id

Message ID

20231215150515.36983-17-ilpo.jarvinen@linux.intel.com

State

Accepted

Commit

038ce802e248a985150156da84bc3f118236b898

Headers

From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
To: linux-kselftest@vger.kernel.org,
 Reinette Chatre <reinette.chatre@intel.com>, Shuah Khan <shuah@kernel.org>,
 Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>, =?utf-8?q?Maciej_Wiecz=C3=B3r-R?=
	=?utf-8?q?etman?= <maciej.wieczor-retman@intel.com>,
 Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-kernel@vger.kernel.org,
 =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v4 16/29] selftests/resctrl: Improve perf init
Date: Fri, 15 Dec 2023 17:05:02 +0200
Message-Id: <20231215150515.36983-17-ilpo.jarvinen@linux.intel.com>
In-Reply-To: <20231215150515.36983-1-ilpo.jarvinen@linux.intel.com>
References: <20231215150515.36983-1-ilpo.jarvinen@linux.intel.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Series

selftests/resctrl: CAT test improvements & generalized test framework | expand

Commit Message

Ilpo Järvinen Dec. 15, 2023, 3:05 p.m. UTC

struct perf_event_attr initialization is spread into
perf_event_initialize() and perf_event_attr_initialize() and setting
->config is hardcoded by the deepest level.

perf_event_attr init belongs to perf_event_attr_initialize() so move it
entirely there. Rename the other function
perf_event_initialized_read_format().

Call each init function directly from the test as they will take
different parameters (especially true after the perf related global
variables are moved to local variables).

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
---
 tools/testing/selftests/resctrl/cache.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selftests/resctrl/cache.c
index 7f45c4957f81..58ee6f6b0edf 100644
--- a/tools/testing/selftests/resctrl/cache.c
+++ b/tools/testing/selftests/resctrl/cache.c
@@ -15,8 +15,9 @@  static struct perf_event_read pe_read;
 static int pe_fd;
 char llc_occup_path[1024];
 
-static void perf_event_attr_initialize(void)
+static void perf_event_attr_initialize(__u64 config)
 {
+	memset(&pea_llc_miss, 0, sizeof(struct perf_event_attr));
 	pea_llc_miss.type = PERF_TYPE_HARDWARE;
 	pea_llc_miss.size = sizeof(struct perf_event_attr);
 	pea_llc_miss.read_format = PERF_FORMAT_GROUP;
@@ -27,6 +28,7 @@  static void perf_event_attr_initialize(void)
 	pea_llc_miss.inherit = 1;
 	pea_llc_miss.exclude_guest = 1;
 	pea_llc_miss.disabled = 1;
+	pea_llc_miss.config = config;
 }
 
 /* Start counters to log values */
@@ -36,16 +38,9 @@  static void perf_event_reset_enable(void)
 	ioctl(pe_fd, PERF_EVENT_IOC_ENABLE, 0);
 }
 
-static void perf_event_initialize(void)
+static void perf_event_initialize_read_format(void)
 {
-	memset(&pea_llc_miss, 0, sizeof(struct perf_event_attr));
 	memset(&pe_read, 0, sizeof(struct perf_event_read));
-
-	/* Initialize perf_event_attr structures for HW_CACHE_MISSES */
-	perf_event_attr_initialize();
-
-	pea_llc_miss.config = PERF_COUNT_HW_CACHE_MISSES;
-
 	pe_read.nr = 1;
 }
 
@@ -204,7 +199,8 @@  int cat_val(struct resctrl_val_param *param, size_t span)
 	if (ret)
 		return ret;
 
-	perf_event_initialize();
+	perf_event_attr_initialize(PERF_COUNT_HW_CACHE_MISSES);
+	perf_event_initialize_read_format();
 
 	/* Test runs until the callback setup() tells the test to stop. */
 	while (1) {

[v4,16/29] selftests/resctrl: Improve perf init

Commit Message

Patch