[v2,13/26] selftests/resctrl: Improve perf init

Message ID	20231120111340.7805-14-ilpo.jarvinen@linux.intel.com (mailing list archive)
State	Accepted
Commit	038ce802e248a985150156da84bc3f118236b898
Headers	show Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ZwLjWhsS" 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 v2 13/26] selftests/resctrl: Improve perf init Date: Mon, 20 Nov 2023 13:13:27 +0200 Message-Id: <20231120111340.7805-14-ilpo.jarvinen@linux.intel.com> In-Reply-To: <20231120111340.7805-1-ilpo.jarvinen@linux.intel.com> References: <20231120111340.7805-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 [v2,00/26] selftests/resctrl: CAT test improvements & generalized test framework [v2,01/26] selftests/resctrl: Don't use ctrlc_handler() outside signal handling [v2,02/26] selftests/resctrl: Split fill_buf to allow tests finer-grained control [v2,03/26] selftests/resctrl: Refactor fill_buf functions [v2,04/26] selftests/resctrl: Refactor get_cbm_mask() and rename to get_full_cbm() [v2,05/26] selftests/resctrl: Mark get_cache_size() cache_type const [v2,06/26] selftests/resctrl: Create cache_portion_size() helper [v2,07/26] selftests/resctrl: Exclude shareable bits from schemata in CAT test [v2,08/26] selftests/resctrl: Split measure_cache_vals() [v2,09/26] selftests/resctrl: Split show_cache_info() to test specific and generic parts [v2,10/26] selftests/resctrl: Remove unnecessary __u64 -> unsigned long conversion [v2,11/26] selftests/resctrl: Remove nested calls in perf event handling [v2,12/26] selftests/resctrl: Consolidate naming of perf event related things [v2,13/26] selftests/resctrl: Improve perf init [v2,14/26] selftests/resctrl: Convert perf related globals to locals [v2,15/26] selftests/resctrl: Move cat_val() to cat_test.c and rename to cat_test() [v2,16/26] selftests/resctrl: Open perf fd before start & add error handling [v2,17/26] selftests/resctrl: Replace file write with volatile variable [v2,18/26] selftests/resctrl: Read in less obvious order to defeat prefetch optimizations [v2,19/26] selftests/resctrl: Rewrite Cache Allocation Technology (CAT) test [v2,20/26] selftests/resctrl: Create struct for input parameters [v2,21/26] selftests/resctrl: Introduce generalized test framework [v2,22/26] selftests/resctrl: Pass write_schemata() resource instead of test name [v2,23/26] selftests/resctrl: Add helper to convert L2/3 to integer [v2,24/26] selftests/resctrl: Rename resource ID to domain ID [v2,25/26] selftests/resctrl: Get domain id from cache id [v2,26/26] selftests/resctrl: Add test groups and name L3 CAT test L3_CAT

Message ID

20231120111340.7805-14-ilpo.jarvinen@linux.intel.com (mailing list archive)

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 v2 13/26] selftests/resctrl: Improve perf init
Date: Mon, 20 Nov 2023 13:13:27 +0200
Message-Id: <20231120111340.7805-14-ilpo.jarvinen@linux.intel.com>
In-Reply-To: <20231120111340.7805-1-ilpo.jarvinen@linux.intel.com>
References: <20231120111340.7805-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 Nov. 20, 2023, 11:13 a.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>
---
 tools/testing/selftests/resctrl/cache.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

Comments

Reinette Chatre Nov. 28, 2023, 10:15 p.m. UTC | #1

Hi Ilpo,

On 11/20/2023 3:13 AM, Ilpo Järvinen wrote:
> 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>

Reinette

diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selftests/resctrl/cache.c
index 52d37d1c380f..315f30f23371 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;
 }
 
@@ -205,7 +200,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) {

[v2,13/26] selftests/resctrl: Improve perf init

Commit Message

Comments

Patch