From nobody Thu Dec 18 18:19:11 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 619AEC197A0 for ; Mon, 20 Nov 2023 11:16:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233475AbjKTLQs (ORCPT ); Mon, 20 Nov 2023 06:16:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233414AbjKTLQW (ORCPT ); Mon, 20 Nov 2023 06:16:22 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 357BDF0; Mon, 20 Nov 2023 03:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700478954; x=1732014954; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JIK+mdvMArs3b8Ye6AV2SW1acpHy/jZ32p5myVsq20A=; b=Ihk1/DyQMHFtfp1SQxth4nDFXJHGSmONGq500bFdAlaqt9CKBGvv6wEV Cd2ju3ZOZIw+JLuTAjWeiIADElFhPTmiHOO8Zu8x+YEWMaoORQOWw/ATX zdqmyaZ31DTLMlan5f4VcWPVZUzE2bv6t43+ZJA4TFXlAYFpyFo+idUY9 K9pnnL9MgFqWTuTNY3nd9J8kTGWnSKiokfVTwBWVLKLkwlfLJNqLa6Cye ft/7fPA2MVyw/M0X6Y1q3/bIfneH5XoqgvhdZ9QhlOCKyjaolRou+1/RY XJDqa+iL4/9bkgeFITTrbrW9GQPTt73JX/ghsEbD+wwR1CBUFaDzw04v8 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10899"; a="13151955" X-IronPort-AV: E=Sophos;i="6.04,213,1695711600"; d="scan'208";a="13151955" 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:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10899"; a="832238371" X-IronPort-AV: E=Sophos;i="6.04,213,1695711600"; d="scan'208";a="832238371" 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:47 -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 14/26] selftests/resctrl: Convert perf related globals to locals Date: Mon, 20 Nov 2023 13:13:28 +0200 Message-Id: <20231120111340.7805-15-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 Perf related variables pea_llc_miss, pe_read, and pe_fd are globals in cache.c. Convert them to locals for better scoping and make pea_llc_miss simpler by renaming it to pea. Make close(pe_fd) handling easier to understand by doing it inside cat_val(). Make also sizeof()s use safer way to determine the right struct. Signed-off-by: Ilpo J=C3=A4rvinen Reviewed-by: Reinette Chatre --- tools/testing/selftests/resctrl/cache.c | 72 ++++++++++++++----------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selfte= sts/resctrl/cache.c index 315f30f23371..a69e7151db94 100644 --- a/tools/testing/selftests/resctrl/cache.c +++ b/tools/testing/selftests/resctrl/cache.c @@ -10,51 +10,50 @@ struct perf_event_read { } values[2]; }; =20 -static struct perf_event_attr pea_llc_miss; -static struct perf_event_read pe_read; -static int pe_fd; char llc_occup_path[1024]; =20 -static void perf_event_attr_initialize(__u64 config) +static void perf_event_attr_initialize(struct perf_event_attr *pea, __u64 = config) { - memset(&pea_llc_miss, 0, sizeof(struct perf_event_attr)); - pea_llc_miss.type =3D PERF_TYPE_HARDWARE; - pea_llc_miss.size =3D sizeof(struct perf_event_attr); - pea_llc_miss.read_format =3D PERF_FORMAT_GROUP; - pea_llc_miss.exclude_kernel =3D 1; - pea_llc_miss.exclude_hv =3D 1; - pea_llc_miss.exclude_idle =3D 1; - pea_llc_miss.exclude_callchain_kernel =3D 1; - pea_llc_miss.inherit =3D 1; - pea_llc_miss.exclude_guest =3D 1; - pea_llc_miss.disabled =3D 1; - pea_llc_miss.config =3D config; + memset(pea, 0, sizeof(*pea)); + pea->type =3D PERF_TYPE_HARDWARE; + pea->size =3D sizeof(*pea); + pea->read_format =3D PERF_FORMAT_GROUP; + pea->exclude_kernel =3D 1; + pea->exclude_hv =3D 1; + pea->exclude_idle =3D 1; + pea->exclude_callchain_kernel =3D 1; + pea->inherit =3D 1; + pea->exclude_guest =3D 1; + pea->disabled =3D 1; + pea->config =3D config; } =20 /* Start counters to log values */ -static void perf_event_reset_enable(void) +static void perf_event_reset_enable(int pe_fd) { ioctl(pe_fd, PERF_EVENT_IOC_RESET, 0); ioctl(pe_fd, PERF_EVENT_IOC_ENABLE, 0); } =20 -static void perf_event_initialize_read_format(void) +static void perf_event_initialize_read_format(struct perf_event_read *pe_r= ead) { - memset(&pe_read, 0, sizeof(struct perf_event_read)); - pe_read.nr =3D 1; + memset(pe_read, 0, sizeof(*pe_read)); + pe_read->nr =3D 1; } =20 -static int perf_open(pid_t pid, int cpu_no) +static int perf_open(struct perf_event_attr *pea, pid_t pid, int cpu_no) { - pe_fd =3D perf_event_open(&pea_llc_miss, pid, cpu_no, -1, PERF_FLAG_FD_CL= OEXEC); + int pe_fd; + + pe_fd =3D perf_event_open(pea, pid, cpu_no, -1, PERF_FLAG_FD_CLOEXEC); if (pe_fd =3D=3D -1) { perror("Error opening leader"); return -1; } =20 - perf_event_reset_enable(); + perf_event_reset_enable(pe_fd); =20 - return 0; + return pe_fd; } =20 /* @@ -131,20 +130,21 @@ static int print_results_cache(const char *filename, = int bm_pid, __u64 llc_value * * Return: =3D0 on success. <0 on failure. */ -static int perf_event_measure(const char *filename, int bm_pid) +static int perf_event_measure(int pe_fd, struct perf_event_read *pe_read, + const char *filename, int bm_pid) { int ret; =20 /* Stop counters after one span to get miss rate */ ioctl(pe_fd, PERF_EVENT_IOC_DISABLE, 0); =20 - ret =3D read(pe_fd, &pe_read, sizeof(struct perf_event_read)); + ret =3D read(pe_fd, pe_read, sizeof(*pe_read)); if (ret =3D=3D -1) { perror("Could not get perf value"); return -1; } =20 - return print_results_cache(filename, bm_pid, pe_read.values[0].value); + return print_results_cache(filename, bm_pid, pe_read->values[0].value); } =20 /* @@ -182,7 +182,10 @@ int cat_val(struct resctrl_val_param *param, size_t sp= an) { int memflush =3D 1, operation =3D 0, ret =3D 0; char *resctrl_val =3D param->resctrl_val; + struct perf_event_read pe_read; + struct perf_event_attr pea; pid_t bm_pid; + int pe_fd; =20 if (strcmp(param->filename, "") =3D=3D 0) sprintf(param->filename, "stdio"); @@ -200,8 +203,8 @@ int cat_val(struct resctrl_val_param *param, size_t spa= n) if (ret) return ret; =20 - perf_event_attr_initialize(PERF_COUNT_HW_CACHE_MISSES); - perf_event_initialize_read_format(); + perf_event_attr_initialize(&pea, PERF_COUNT_HW_CACHE_MISSES); + perf_event_initialize_read_format(&pe_read); =20 /* Test runs until the callback setup() tells the test to stop. */ while (1) { @@ -212,9 +215,12 @@ int cat_val(struct resctrl_val_param *param, size_t sp= an) } if (ret < 0) break; - ret =3D perf_open(bm_pid, param->cpu_no); - if (ret) + + pe_fd =3D perf_open(&pea, bm_pid, param->cpu_no); + if (pe_fd < 0) { + ret =3D -1; break; + } =20 if (run_fill_buf(span, memflush, operation, true)) { fprintf(stderr, "Error-running fill buffer\n"); @@ -223,9 +229,11 @@ int cat_val(struct resctrl_val_param *param, size_t sp= an) } =20 sleep(1); - ret =3D perf_event_measure(param->filename, bm_pid); + ret =3D perf_event_measure(pe_fd, &pe_read, param->filename, bm_pid); if (ret) goto pe_close; + + close(pe_fd); } =20 return ret; --=20 2.30.2