From nobody Thu Dec 18 18:19:13 2025 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 CB3E4C54E76 for ; Mon, 20 Nov 2023 11:16:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233183AbjKTLQN (ORCPT ); Mon, 20 Nov 2023 06:16:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233431AbjKTLPl (ORCPT ); Mon, 20 Nov 2023 06:15:41 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3DCF1AD; Mon, 20 Nov 2023 03:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700478935; x=1732014935; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tVN/FhwY6NyA0nXfkYCvWVI9YZaBRRB4ulMKfSyM56g=; b=OzNnbW3A7f78BjWGZgZmIXVoA/ZyE7nlZUPNaBjmd8+t2VdwOAUxKK1M 5ienRbiL+U2BSC6uHrB7kQmz7mnZes+heRPmXWShg7poNOOhYFeeoUxMq ZQWdGg0OlD8Abywsc+vOtbFiYArILck9PXIdxLiLUEbUfbp9FYFhDgW3V AUKfxFq10Xjqbsm9RGzjlPy+pkA+F53VdyL/E6UVpHHAMLbZIQMOVHLk7 4E+2iiTYCFk3YPLGdnLDO4/gEVYM0esWQuaMEFKZ2pz8Hf4wPuod60CrB aGHIYtxCLghWFFww3OqE8gt/MT9x6yFMvM1Jfp2PvokRJf4akYndhEQnt Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10899"; a="13151924" X-IronPort-AV: E=Sophos;i="6.04,213,1695711600"; d="scan'208";a="13151924" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 03:15:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10899"; a="832238252" X-IronPort-AV: E=Sophos;i="6.04,213,1695711600"; d="scan'208";a="832238252" Received: from sc9itsct4906.amr.corp.intel.com (HELO localhost) ([10.249.46.107]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 03:15:30 -0800 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Reinette Chatre , Shuah Khan , Shaopeng Tan , =?UTF-8?q?Maciej=20Wiecz=C3=B3r-Retman?= , Fenghua Yu Cc: linux-kernel@vger.kernel.org, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH v2 12/26] selftests/resctrl: Consolidate naming of perf event related things Date: Mon, 20 Nov 2023 13:13:26 +0200 Message-Id: <20231120111340.7805-13-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231120111340.7805-1-ilpo.jarvinen@linux.intel.com> References: <20231120111340.7805-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Naming for perf event related functions, types, and variables is currently inconsistent. Make struct read_format and all functions related to perf events start with "perf_". Adjust variable names towards the same direction but use shorter names for variables where appropriate (pe prefix). Signed-off-by: Ilpo J=C3=A4rvinen Reviewed-by: Reinette Chatre --- tools/testing/selftests/resctrl/cache.c | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selfte= sts/resctrl/cache.c index aea4f54d32bd..52d37d1c380f 100644 --- a/tools/testing/selftests/resctrl/cache.c +++ b/tools/testing/selftests/resctrl/cache.c @@ -3,7 +3,7 @@ #include #include "resctrl.h" =20 -struct read_format { +struct perf_event_read { __u64 nr; /* The number of events */ struct { __u64 value; /* The value of the event */ @@ -11,11 +11,11 @@ struct read_format { }; =20 static struct perf_event_attr pea_llc_miss; -static struct read_format rf_cqm; -static int fd_lm; +static struct perf_event_read pe_read; +static int pe_fd; char llc_occup_path[1024]; =20 -static void initialize_perf_event_attr(void) +static void perf_event_attr_initialize(void) { pea_llc_miss.type =3D PERF_TYPE_HARDWARE; pea_llc_miss.size =3D sizeof(struct perf_event_attr); @@ -30,34 +30,34 @@ static void initialize_perf_event_attr(void) } =20 /* Start counters to log values */ -static void ioctl_perf_event_ioc_reset_enable(void) +static void perf_event_reset_enable(void) { - ioctl(fd_lm, PERF_EVENT_IOC_RESET, 0); - ioctl(fd_lm, PERF_EVENT_IOC_ENABLE, 0); + ioctl(pe_fd, PERF_EVENT_IOC_RESET, 0); + ioctl(pe_fd, PERF_EVENT_IOC_ENABLE, 0); } =20 -static void initialize_llc_perf(void) +static void perf_event_initialize(void) { memset(&pea_llc_miss, 0, sizeof(struct perf_event_attr)); - memset(&rf_cqm, 0, sizeof(struct read_format)); + memset(&pe_read, 0, sizeof(struct perf_event_read)); =20 /* Initialize perf_event_attr structures for HW_CACHE_MISSES */ - initialize_perf_event_attr(); + perf_event_attr_initialize(); =20 pea_llc_miss.config =3D PERF_COUNT_HW_CACHE_MISSES; =20 - rf_cqm.nr =3D 1; + pe_read.nr =3D 1; } =20 -static int reset_enable_llc_perf(pid_t pid, int cpu_no) +static int perf_open(pid_t pid, int cpu_no) { - fd_lm =3D perf_event_open(&pea_llc_miss, pid, cpu_no, -1, PERF_FLAG_FD_CL= OEXEC); - if (fd_lm =3D=3D -1) { + pe_fd =3D perf_event_open(&pea_llc_miss, pid, cpu_no, -1, PERF_FLAG_FD_CL= OEXEC); + if (pe_fd =3D=3D -1) { perror("Error opening leader"); return -1; } =20 - ioctl_perf_event_ioc_reset_enable(); + perf_event_reset_enable(); =20 return 0; } @@ -141,15 +141,15 @@ static int perf_event_measure(const char *filename, i= nt bm_pid) int ret; =20 /* Stop counters after one span to get miss rate */ - ioctl(fd_lm, PERF_EVENT_IOC_DISABLE, 0); + ioctl(pe_fd, PERF_EVENT_IOC_DISABLE, 0); =20 - ret =3D read(fd_lm, &rf_cqm, sizeof(struct read_format)); + ret =3D read(pe_fd, &pe_read, sizeof(struct perf_event_read)); if (ret =3D=3D -1) { perror("Could not get perf value"); return -1; } =20 - return print_results_cache(filename, bm_pid, rf_cqm.values[0].value); + return print_results_cache(filename, bm_pid, pe_read.values[0].value); } =20 /* @@ -205,7 +205,7 @@ int cat_val(struct resctrl_val_param *param, size_t spa= n) if (ret) return ret; =20 - initialize_llc_perf(); + perf_event_initialize(); =20 /* Test runs until the callback setup() tells the test to stop. */ while (1) { @@ -216,7 +216,7 @@ int cat_val(struct resctrl_val_param *param, size_t spa= n) } if (ret < 0) break; - ret =3D reset_enable_llc_perf(bm_pid, param->cpu_no); + ret =3D perf_open(bm_pid, param->cpu_no); if (ret) break; =20 @@ -235,7 +235,7 @@ int cat_val(struct resctrl_val_param *param, size_t spa= n) return ret; =20 pe_close: - close(fd_lm); + close(pe_fd); return ret; } =20 --=20 2.30.2