From nobody Thu Dec 18 19:25:23 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 D91A4E784B0 for ; Mon, 2 Oct 2023 09:48:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236248AbjJBJsl (ORCPT ); Mon, 2 Oct 2023 05:48:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236246AbjJBJsi (ORCPT ); Mon, 2 Oct 2023 05:48:38 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3AA5BD; Mon, 2 Oct 2023 02:48:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696240114; x=1727776114; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8pmtfWXMI20eJN8ahNBeDBXwc3u2yQV2h67SqlOWlpQ=; b=GM98pN79RLVzYkQeYQe5HRrIA0yGrz13YMwe1IX6ODD0xCuyfrOb1MBs Ow/pOfF6ObmgzF2phOpifosbbKgpg2uVuQQgqyhg+m+oH1f3pnABsil10 CSr0A12ZGeBFoO/P7Bv3bvGTb94vjLNU+jvQZCPvjqQjwOBGxlTHiu1Xg IpOWdqQ0Q6oYA0KNPOnhk3fMwO8Po1wT8v05vgowvUR0dO4bMiM/z4RaA /Nop38L5A0QehXrYf0ft5NN/jGhuZWOeyKNhQR0IXLnlCMPF/oFMxTccc fVG/urisyefso4Vo1/yRkzZ1SgNJEbzrlSvL8Vpf3gP3XxJY0lRTOdsio Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="382517286" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="382517286" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:48:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="1081593242" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="1081593242" Received: from aanantha-mobl.gar.corp.intel.com (HELO localhost) ([10.251.221.191]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:48:30 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Shuah Khan , Reinette Chatre , =?UTF-8?q?Maciej=20Wiecz=C3=B3r-Retman?= , Shaopeng Tan Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH v4 1/7] selftests/resctrl: Fix uninitialized .sa_flags Date: Mon, 2 Oct 2023 12:48:07 +0300 Message-Id: <20231002094813.6633-2-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231002094813.6633-1-ilpo.jarvinen@linux.intel.com> References: <20231002094813.6633-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 signal_handler_unregister() calls sigaction() with uninitializing sa_flags in the struct sigaction. Make sure sa_flags is always initialized in signal_handler_unregister() by initializing the struct sigaction when declaring it. Also add the initialization to signal_handler_register() even if there are no know bugs in there because correctness is then obvious from the code itself. Fixes: 73c55fa5ab55 ("selftests/resctrl: Commonize the signal handler regis= ter/unregister for all tests") Suggested-by: Reinette Chatre Signed-off-by: Ilpo J=C3=A4rvinen Cc: Reviewed-by: Reinette Chatre --- tools/testing/selftests/resctrl/resctrl_val.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/= selftests/resctrl/resctrl_val.c index 51963a6f2186..01bbe11a8983 100644 --- a/tools/testing/selftests/resctrl/resctrl_val.c +++ b/tools/testing/selftests/resctrl/resctrl_val.c @@ -482,7 +482,7 @@ void ctrlc_handler(int signum, siginfo_t *info, void *p= tr) */ int signal_handler_register(void) { - struct sigaction sigact; + struct sigaction sigact =3D {}; int ret =3D 0; =20 sigact.sa_sigaction =3D ctrlc_handler; @@ -504,7 +504,7 @@ int signal_handler_register(void) */ void signal_handler_unregister(void) { - struct sigaction sigact; + struct sigaction sigact =3D {}; =20 sigact.sa_handler =3D SIG_DFL; sigemptyset(&sigact.sa_mask); --=20 2.30.2 From nobody Thu Dec 18 19:25:23 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 63437E784AF for ; Mon, 2 Oct 2023 09:48:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236264AbjJBJsx (ORCPT ); Mon, 2 Oct 2023 05:48:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236234AbjJBJss (ORCPT ); Mon, 2 Oct 2023 05:48:48 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72022E3; Mon, 2 Oct 2023 02:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696240125; x=1727776125; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V6NGUFOV4/L30qAqYGMzkQyhi7PS4nNcDwt0pLhNUu4=; b=C38ZoD63PuAPSykCbApLtdtziGUcm2PfHMge1LTvGx/iSij7E2EZ+y0p 94sGrUAq3D7rrv+UDt1jq5tfTfSvQdnfWBLa0E5cgrfFddhrNZqaD5FCj 9ZI9nUR93jzNgZgOp73cMY+YkNpuMJnW9svNlTOX5HOOSip5M40Z6Wbp2 c1V4ji2+DTtH79COLy/aIObeGeXoUdRKiAIHJXgO9bT6bzTzh26mFoDIk jBqNbm+h5ZB5+kI14IJ9V+QA6dUi+2SNlH9Buzo2GxzSnzvnvWqj8UXHR RnvGeDw/aXm6EiZ5sx6jOL9MqhiRBdNML21I1tHzM6b/o1ulPVcBdwf2k Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="413523721" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="413523721" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:48:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="874301922" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="874301922" Received: from aanantha-mobl.gar.corp.intel.com (HELO localhost) ([10.251.221.191]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:48:41 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Shuah Khan , Reinette Chatre , =?UTF-8?q?Maciej=20Wiecz=C3=B3r-Retman?= , Shaopeng Tan Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH v4 2/7] selftests/resctrl: Extend signal handler coverage to unmount on receiving signal Date: Mon, 2 Oct 2023 12:48:08 +0300 Message-Id: <20231002094813.6633-3-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231002094813.6633-1-ilpo.jarvinen@linux.intel.com> References: <20231002094813.6633-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 Unmounting resctrl FS has been moved into the per test functions in resctrl_tests.c by commit caddc0fbe495 ("selftests/resctrl: Move resctrl FS mount/umount to higher level"). In case a signal (SIGINT, SIGTERM, or SIGHUP) is received, the running selftest is aborted by ctrlc_handler() which then unmounts resctrl fs before exiting. The current section between signal_handler_register() and signal_handler_unregister(), however, does not cover the entire duration when resctrl FS is mounted. Move signal_handler_register() and signal_handler_unregister() calls from per test files into resctrl_tests.c to properly unmount resctrl fs. In order to not add signal_handler_register()/unregister() n times, create helpers test_prepare() and test_cleanup(). Do not call ksft_exit_fail_msg() in test_prepare() but only in the per test function to keep the control flow cleaner without adding calls to exit() deep into the call chain. Adjust child process kill() call in ctrlc_handler() to only be invoked if the child was already forked. Fixes: caddc0fbe495 ("selftests/resctrl: Move resctrl FS mount/umount to hi= gher level") Signed-off-by: Ilpo J=C3=A4rvinen Tested-by: Shaopeng Tan Reviewed-by: Shaopeng Tan Reviewed-by: Reinette Chatre Cc: --- tools/testing/selftests/resctrl/cat_test.c | 8 --- .../testing/selftests/resctrl/resctrl_tests.c | 69 ++++++++++++------- tools/testing/selftests/resctrl/resctrl_val.c | 22 +++--- 3 files changed, 55 insertions(+), 44 deletions(-) diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/sel= ftests/resctrl/cat_test.c index 97b87285ab2a..224ba8544d8a 100644 --- a/tools/testing/selftests/resctrl/cat_test.c +++ b/tools/testing/selftests/resctrl/cat_test.c @@ -167,12 +167,6 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_t= ype) strcpy(param.filename, RESULT_FILE_NAME1); param.num_of_runs =3D 0; param.cpu_no =3D sibling_cpu_no; - } else { - ret =3D signal_handler_register(); - if (ret) { - kill(bm_pid, SIGKILL); - goto out; - } } =20 remove(param.filename); @@ -209,10 +203,8 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_t= ype) } close(pipefd[0]); kill(bm_pid, SIGKILL); - signal_handler_unregister(); } =20 -out: cat_test_cleanup(); =20 return ret; diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testin= g/selftests/resctrl/resctrl_tests.c index 823672a20a43..495aeee5b734 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -67,21 +67,45 @@ void tests_cleanup(void) cat_test_cleanup(); } =20 -static void run_mbm_test(const char * const *benchmark_cmd, int cpu_no) +static int test_prepare(void) { int res; =20 - ksft_print_msg("Starting MBM BW change ...\n"); + res =3D signal_handler_register(); + if (res) { + ksft_print_msg("Failed to register signal handler\n"); + return res; + } =20 res =3D mount_resctrlfs(); if (res) { - ksft_exit_fail_msg("Failed to mount resctrl FS\n"); + signal_handler_unregister(); + ksft_print_msg("Failed to mount resctrl FS\n"); + return res; + } + return 0; +} + +static void test_cleanup(void) +{ + umount_resctrlfs(); + signal_handler_unregister(); +} + +static void run_mbm_test(const char * const *benchmark_cmd, int cpu_no) +{ + int res; + + ksft_print_msg("Starting MBM BW change ...\n"); + + if (test_prepare()) { + ksft_exit_fail_msg("Abnormal failure when preparing for the test\n"); return; } =20 if (!validate_resctrl_feature_request(MBM_STR) || (get_vendor() !=3D ARCH= _INTEL)) { ksft_test_result_skip("Hardware does not support MBM or MBM is disabled\= n"); - goto umount; + goto cleanup; } =20 res =3D mbm_bw_change(cpu_no, benchmark_cmd); @@ -89,8 +113,8 @@ static void run_mbm_test(const char * const *benchmark_c= md, int cpu_no) if ((get_vendor() =3D=3D ARCH_INTEL) && res) ksft_print_msg("Intel MBM may be inaccurate when Sub-NUMA Clustering is = enabled. Check BIOS configuration.\n"); =20 -umount: - umount_resctrlfs(); +cleanup: + test_cleanup(); } =20 static void run_mba_test(const char * const *benchmark_cmd, int cpu_no) @@ -99,22 +123,21 @@ static void run_mba_test(const char * const *benchmark= _cmd, int cpu_no) =20 ksft_print_msg("Starting MBA Schemata change ...\n"); =20 - res =3D mount_resctrlfs(); - if (res) { - ksft_exit_fail_msg("Failed to mount resctrl FS\n"); + if (test_prepare()) { + ksft_exit_fail_msg("Abnormal failure when preparing for the test\n"); return; } =20 if (!validate_resctrl_feature_request(MBA_STR) || (get_vendor() !=3D ARCH= _INTEL)) { ksft_test_result_skip("Hardware does not support MBA or MBA is disabled\= n"); - goto umount; + goto cleanup; } =20 res =3D mba_schemata_change(cpu_no, benchmark_cmd); ksft_test_result(!res, "MBA: schemata change\n"); =20 -umount: - umount_resctrlfs(); +cleanup: + test_cleanup(); } =20 static void run_cmt_test(const char * const *benchmark_cmd, int cpu_no) @@ -123,15 +146,14 @@ static void run_cmt_test(const char * const *benchmar= k_cmd, int cpu_no) =20 ksft_print_msg("Starting CMT test ...\n"); =20 - res =3D mount_resctrlfs(); - if (res) { - ksft_exit_fail_msg("Failed to mount resctrl FS\n"); + if (test_prepare()) { + ksft_exit_fail_msg("Abnormal failure when preparing for the test\n"); return; } =20 if (!validate_resctrl_feature_request(CMT_STR)) { ksft_test_result_skip("Hardware does not support CMT or CMT is disabled\= n"); - goto umount; + goto cleanup; } =20 res =3D cmt_resctrl_val(cpu_no, 5, benchmark_cmd); @@ -139,8 +161,8 @@ static void run_cmt_test(const char * const *benchmark_= cmd, int cpu_no) if ((get_vendor() =3D=3D ARCH_INTEL) && res) ksft_print_msg("Intel CMT may be inaccurate when Sub-NUMA Clustering is = enabled. Check BIOS configuration.\n"); =20 -umount: - umount_resctrlfs(); +cleanup: + test_cleanup(); } =20 static void run_cat_test(int cpu_no, int no_of_bits) @@ -149,22 +171,21 @@ static void run_cat_test(int cpu_no, int no_of_bits) =20 ksft_print_msg("Starting CAT test ...\n"); =20 - res =3D mount_resctrlfs(); - if (res) { - ksft_exit_fail_msg("Failed to mount resctrl FS\n"); + if (test_prepare()) { + ksft_exit_fail_msg("Abnormal failure when preparing for the test\n"); return; } =20 if (!validate_resctrl_feature_request(CAT_STR)) { ksft_test_result_skip("Hardware does not support CAT or CAT is disabled\= n"); - goto umount; + goto cleanup; } =20 res =3D cat_perf_miss_val(cpu_no, no_of_bits, "L3"); ksft_test_result(!res, "CAT: test\n"); =20 -umount: - umount_resctrlfs(); +cleanup: + test_cleanup(); } =20 int main(int argc, char **argv) diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/= selftests/resctrl/resctrl_val.c index 01bbe11a8983..b8ca6fa40b3b 100644 --- a/tools/testing/selftests/resctrl/resctrl_val.c +++ b/tools/testing/selftests/resctrl/resctrl_val.c @@ -468,7 +468,9 @@ pid_t bm_pid, ppid; =20 void ctrlc_handler(int signum, siginfo_t *info, void *ptr) { - kill(bm_pid, SIGKILL); + /* Only kill child after bm_pid is set after fork() */ + if (bm_pid) + kill(bm_pid, SIGKILL); umount_resctrlfs(); tests_cleanup(); ksft_print_msg("Ending\n\n"); @@ -485,6 +487,8 @@ int signal_handler_register(void) struct sigaction sigact =3D {}; int ret =3D 0; =20 + bm_pid =3D 0; + sigact.sa_sigaction =3D ctrlc_handler; sigemptyset(&sigact.sa_mask); sigact.sa_flags =3D SA_SIGINFO; @@ -706,10 +710,6 @@ int resctrl_val(const char * const *benchmark_cmd, str= uct resctrl_val_param *par =20 ksft_print_msg("Benchmark PID: %d\n", bm_pid); =20 - ret =3D signal_handler_register(); - if (ret) - goto out; - /* * The cast removes constness but nothing mutates benchmark_cmd within * the context of this process. At the receiving process, it becomes @@ -721,19 +721,19 @@ int resctrl_val(const char * const *benchmark_cmd, st= ruct resctrl_val_param *par /* Taskset benchmark to specified cpu */ ret =3D taskset_benchmark(bm_pid, param->cpu_no); if (ret) - goto unregister; + goto out; =20 /* Write benchmark to specified control&monitoring grp in resctrl FS */ ret =3D write_bm_pid_to_resctrl(bm_pid, param->ctrlgrp, param->mongrp, resctrl_val); if (ret) - goto unregister; + goto out; =20 if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR)) || !strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) { ret =3D initialize_mem_bw_imc(); if (ret) - goto unregister; + goto out; =20 initialize_mem_bw_resctrl(param->ctrlgrp, param->mongrp, param->cpu_no, resctrl_val); @@ -748,7 +748,7 @@ int resctrl_val(const char * const *benchmark_cmd, stru= ct resctrl_val_param *par sizeof(pipe_message)) { perror("# failed reading message from child process"); close(pipefd[0]); - goto unregister; + goto out; } } close(pipefd[0]); @@ -757,7 +757,7 @@ int resctrl_val(const char * const *benchmark_cmd, stru= ct resctrl_val_param *par if (sigqueue(bm_pid, SIGUSR1, value) =3D=3D -1) { perror("# sigqueue SIGUSR1 to child"); ret =3D errno; - goto unregister; + goto out; } =20 /* Give benchmark enough time to fully run */ @@ -786,8 +786,6 @@ int resctrl_val(const char * const *benchmark_cmd, stru= ct resctrl_val_param *par } } =20 -unregister: - signal_handler_unregister(); out: kill(bm_pid, SIGKILL); =20 --=20 2.30.2 From nobody Thu Dec 18 19:25:23 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 2928FE784B2 for ; Mon, 2 Oct 2023 09:49:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236227AbjJBJtF (ORCPT ); Mon, 2 Oct 2023 05:49:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236253AbjJBJtD (ORCPT ); Mon, 2 Oct 2023 05:49:03 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2394C6; Mon, 2 Oct 2023 02:48:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696240134; x=1727776134; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ou58BhmUDES8CEg+FgG6IR/42js/OkGnyYaFV5Nw5Zo=; b=WWRJc0Jlj358T6MEDfzSdSIWRIAyXfBANa4vgIcuAY8aVcGTp5zsL2Jv WInJHuA7TqHnbTxEjIki/SdaJ/5b/OIlwxzKxRSYt2dCrz/Fzfg7fj6vV yfUcas5gGpcUYt8ojcMGV5IeXfmx7wXFz0zyEfUe/B/cqhhy+D6MCSiKd FUVHcKqRPuVHOJZykHCAYMuWTgAguwviPTKAObGBSoxdUnn3/nYbtCOd4 VY5UGS+TRm4IhQv+XEttlhlw/QTHUkeL6397hNC05vhN0TL/kHvpcvJyy dgwEgQpvA1UyxFqtvieen3xIlSOUwwG1rB+Wv/I17HrTez/gi0Ibo7rOQ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="381495396" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="381495396" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:48:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="820840345" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="820840345" Received: from aanantha-mobl.gar.corp.intel.com (HELO localhost) ([10.251.221.191]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:48:50 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Shuah Khan , Reinette Chatre , =?UTF-8?q?Maciej=20Wiecz=C3=B3r-Retman?= , Shaopeng Tan Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH v4 3/7] selftests/resctrl: Remove duplicate feature check from CMT test Date: Mon, 2 Oct 2023 12:48:09 +0300 Message-Id: <20231002094813.6633-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231002094813.6633-1-ilpo.jarvinen@linux.intel.com> References: <20231002094813.6633-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 The test runner run_cmt_test() in resctrl_tests.c checks for CMT feature and does not run cmt_resctrl_val() if CMT is not supported. Then cmt_resctrl_val() also check is CMT is supported. Remove the duplicated feature check for CMT from cmt_resctrl_val(). Signed-off-by: Ilpo J=C3=A4rvinen Tested-by: Shaopeng Tan Reviewed-by: Reinette Chatre Reviewed-by: Shaopeng Tan Cc: --- tools/testing/selftests/resctrl/cmt_test.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/testing/selftests/resctrl/cmt_test.c b/tools/testing/sel= ftests/resctrl/cmt_test.c index cf2f5e92dea6..50bdbce9fba9 100644 --- a/tools/testing/selftests/resctrl/cmt_test.c +++ b/tools/testing/selftests/resctrl/cmt_test.c @@ -80,9 +80,6 @@ int cmt_resctrl_val(int cpu_no, int n, const char * const= *benchmark_cmd) size_t span; int ret, i; =20 - if (!validate_resctrl_feature_request(CMT_STR)) - return -1; - ret =3D get_cbm_mask("L3", cbm_mask); if (ret) return ret; --=20 2.30.2 From nobody Thu Dec 18 19:25:23 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 E86BDE784B2 for ; Mon, 2 Oct 2023 09:49:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236260AbjJBJtL (ORCPT ); Mon, 2 Oct 2023 05:49:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236208AbjJBJtG (ORCPT ); Mon, 2 Oct 2023 05:49:06 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB0808E; Mon, 2 Oct 2023 02:49:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696240143; x=1727776143; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h2w4jLDwnHjcUapV1jkntv5pgIa6zmfErB3TZ/IGgk8=; b=dvpec/0Hl2zo6uRGNXfo2EJOZpQCk1NpFhuG/O+7kFxR+p3D+bgPI/G2 yyLRU63/rmyjEwlOWmO3A7pTYMQScDllXrb3c8ikYqlPl8fFyToyqn27n 9LBibQQ2l7zu+jaAKMPJRhDJZ4ytK+wjsBB/CmYWqUUitOjDyfohx+aqI e1klEH1Xg3LueA29bm19oWYVU0rMne3K9iGUxCUnVdonUutgY+RPrQiz9 2Q5Ug6KgRNpoaZ5XGq7+xLHU0cOemf16mNUEPpQs+RfB/UJh9X6MyT0KM Vq2jlDyo58c6A9zpRg4PefyJH6QontK1yMZoP06oAlOYHCN91Fcc1HgOB g==; X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="381495416" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="381495416" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:49:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="820840348" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="820840348" Received: from aanantha-mobl.gar.corp.intel.com (HELO localhost) ([10.251.221.191]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:48:59 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Shuah Khan , Reinette Chatre , =?UTF-8?q?Maciej=20Wiecz=C3=B3r-Retman?= , Shaopeng Tan Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH v4 4/7] selftests/resctrl: Move _GNU_SOURCE define into Makefile Date: Mon, 2 Oct 2023 12:48:10 +0300 Message-Id: <20231002094813.6633-5-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231002094813.6633-1-ilpo.jarvinen@linux.intel.com> References: <20231002094813.6633-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 _GNU_SOURCE is defined in resctrl.h. Defining _GNU_SOURCE has a large impact on what gets defined when including headers either before or after it. This can result in compile failures if .c file decides to include a standard header file before resctrl.h. It is safer to define _GNU_SOURCE in Makefile so it is always defined regardless of in which order includes are done. Signed-off-by: Ilpo J=C3=A4rvinen Tested-by: Shaopeng Tan Reviewed-by: Reinette Chatre Reviewed-by: Shaopeng Tan Cc: --- tools/testing/selftests/resctrl/Makefile | 2 +- tools/testing/selftests/resctrl/resctrl.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/resctrl/Makefile b/tools/testing/selft= ests/resctrl/Makefile index 5073dbc96125..2deac2031de9 100644 --- a/tools/testing/selftests/resctrl/Makefile +++ b/tools/testing/selftests/resctrl/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 =20 -CFLAGS =3D -g -Wall -O2 -D_FORTIFY_SOURCE=3D2 +CFLAGS =3D -g -Wall -O2 -D_FORTIFY_SOURCE=3D2 -D_GNU_SOURCE CFLAGS +=3D $(KHDR_INCLUDES) =20 TEST_GEN_PROGS :=3D resctrl_tests diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/self= tests/resctrl/resctrl.h index dd07463cdf48..d9b5df95849d 100644 --- a/tools/testing/selftests/resctrl/resctrl.h +++ b/tools/testing/selftests/resctrl/resctrl.h @@ -1,5 +1,4 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#define _GNU_SOURCE #ifndef RESCTRL_H #define RESCTRL_H #include --=20 2.30.2 From nobody Thu Dec 18 19:25:23 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 1811EE784B0 for ; Mon, 2 Oct 2023 09:49:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236257AbjJBJt1 (ORCPT ); Mon, 2 Oct 2023 05:49:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236112AbjJBJt0 (ORCPT ); Mon, 2 Oct 2023 05:49:26 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10D8591; Mon, 2 Oct 2023 02:49:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696240163; x=1727776163; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gtwyZgytTIaaChtlJoTwXsMFAKDmK3uaauBiKS3o2Es=; b=gugDNUAXOEb2meHw1eB3tCY5DIHVVxgFuUGF8tRBfWqfuHAJqtNod31w nb5bhg+DUQJmrSb2b7vxhPIhgMImo2d49LOHpLGm/N5uqS15UBSEMT5n7 NZ7u+Xh0J8rGwIKm+DjcSKFhWm0tPopBciKea+GkOKR54PlHep7LADAwn c/mZcQb7+kQvLl+bZCK7GcF951r+R7Nht8A6UwL1gE6Eyql9t6sdOJdnb h32UftlYLpcsFvELYeISB1tpxeK97qau90ECYN3V3ZnSfnH5Nadk5i8Vv bV6wpUr33GBCdbVa71iywqMfQ5T9uIreey90BqhlIpOYZoGH7Bv2o7ODw A==; X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="372960649" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="372960649" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:49:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="754005522" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="754005522" Received: from aanantha-mobl.gar.corp.intel.com (HELO localhost) ([10.251.221.191]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:49:18 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Shuah Khan , Reinette Chatre , =?UTF-8?q?Maciej=20Wiecz=C3=B3r-Retman?= , Shaopeng Tan Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH v4 5/7] selftests/resctrl: Refactor feature check to use resource and feature name Date: Mon, 2 Oct 2023 12:48:11 +0300 Message-Id: <20231002094813.6633-6-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231002094813.6633-1-ilpo.jarvinen@linux.intel.com> References: <20231002094813.6633-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 Feature check in validate_resctrl_feature_request() takes in the test name string and maps that to what to check per test. Pass resource and feature names to validate_resctrl_feature_request() directly rather than deriving them from the test name inside the function which makes the feature check easier to extend for new test cases. Use !! in the return statement to make the boolean conversion more obvious even if it is not strictly necessary from correctness point of view (to avoid it looking like the function is returning a freed pointer). Signed-off-by: Ilpo J=C3=A4rvinen Tested-by: Shaopeng Tan Reviewed-by: Reinette Chatre Reviewed-by: Shaopeng Tan Cc: # selftests/resctrl: Remove duplicate feature = check from CMT test Cc: # selftests/resctrl: Move _GNU_SOURCE define i= nto Makefile --- tools/testing/selftests/resctrl/resctrl.h | 6 +- .../testing/selftests/resctrl/resctrl_tests.c | 10 +-- tools/testing/selftests/resctrl/resctrlfs.c | 69 ++++++++----------- 3 files changed, 34 insertions(+), 51 deletions(-) diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/self= tests/resctrl/resctrl.h index d9b5df95849d..8578a8b4e145 100644 --- a/tools/testing/selftests/resctrl/resctrl.h +++ b/tools/testing/selftests/resctrl/resctrl.h @@ -27,10 +27,6 @@ #define RESCTRL_PATH "/sys/fs/resctrl" #define PHYS_ID_PATH "/sys/devices/system/cpu/cpu" #define INFO_PATH "/sys/fs/resctrl/info" -#define L3_PATH "/sys/fs/resctrl/info/L3" -#define MB_PATH "/sys/fs/resctrl/info/MB" -#define L3_MON_PATH "/sys/fs/resctrl/info/L3_MON" -#define L3_MON_FEATURES_PATH "/sys/fs/resctrl/info/L3_MON/mon_features" =20 #define ARCH_INTEL 1 #define ARCH_AMD 2 @@ -87,7 +83,7 @@ int get_resource_id(int cpu_no, int *resource_id); int mount_resctrlfs(void); int umount_resctrlfs(void); int validate_bw_report_request(char *bw_report); -bool validate_resctrl_feature_request(const char *resctrl_val); +bool validate_resctrl_feature_request(const char *resource, const char *fe= ature); char *fgrep(FILE *inf, const char *str); int taskset_benchmark(pid_t bm_pid, int cpu_no); void run_benchmark(int signum, siginfo_t *info, void *ucontext); diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testin= g/selftests/resctrl/resctrl_tests.c index 495aeee5b734..a19dcc3f8fb0 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -103,7 +103,9 @@ static void run_mbm_test(const char * const *benchmark_= cmd, int cpu_no) return; } =20 - if (!validate_resctrl_feature_request(MBM_STR) || (get_vendor() !=3D ARCH= _INTEL)) { + if (!validate_resctrl_feature_request("L3_MON", "mbm_total_bytes") || + !validate_resctrl_feature_request("L3_MON", "mbm_local_bytes") || + (get_vendor() !=3D ARCH_INTEL)) { ksft_test_result_skip("Hardware does not support MBM or MBM is disabled\= n"); goto cleanup; } @@ -128,7 +130,7 @@ static void run_mba_test(const char * const *benchmark_= cmd, int cpu_no) return; } =20 - if (!validate_resctrl_feature_request(MBA_STR) || (get_vendor() !=3D ARCH= _INTEL)) { + if (!validate_resctrl_feature_request("MB", NULL) || (get_vendor() !=3D A= RCH_INTEL)) { ksft_test_result_skip("Hardware does not support MBA or MBA is disabled\= n"); goto cleanup; } @@ -151,7 +153,7 @@ static void run_cmt_test(const char * const *benchmark_= cmd, int cpu_no) return; } =20 - if (!validate_resctrl_feature_request(CMT_STR)) { + if (!validate_resctrl_feature_request("L3_MON", "llc_occupancy")) { ksft_test_result_skip("Hardware does not support CMT or CMT is disabled\= n"); goto cleanup; } @@ -176,7 +178,7 @@ static void run_cat_test(int cpu_no, int no_of_bits) return; } =20 - if (!validate_resctrl_feature_request(CAT_STR)) { + if (!validate_resctrl_feature_request("L3", NULL)) { ksft_test_result_skip("Hardware does not support CAT or CAT is disabled\= n"); goto cleanup; } diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/se= lftests/resctrl/resctrlfs.c index bd36ee206602..3a8111362d26 100644 --- a/tools/testing/selftests/resctrl/resctrlfs.c +++ b/tools/testing/selftests/resctrl/resctrlfs.c @@ -8,6 +8,8 @@ * Sai Praneeth Prakhya , * Fenghua Yu */ +#include + #include "resctrl.h" =20 static int find_resctrl_mount(char *buffer) @@ -604,63 +606,46 @@ char *fgrep(FILE *inf, const char *str) =20 /* * validate_resctrl_feature_request - Check if requested feature is valid. - * @resctrl_val: Requested feature + * @resource: Required resource (e.g., MB, L3, L2, L3_MON, etc.) + * @feature: Required monitor feature (in mon_features file). Can only be + * set for L3_MON. Must be NULL for all other resources. * - * Return: True if the feature is supported, else false. False is also - * returned if resctrl FS is not mounted. + * Return: True if the resource/feature is supported, else false. False is + * also returned if resctrl FS is not mounted. */ -bool validate_resctrl_feature_request(const char *resctrl_val) +bool validate_resctrl_feature_request(const char *resource, const char *fe= ature) { + char res_path[PATH_MAX]; struct stat statbuf; - bool found =3D false; char *res; FILE *inf; int ret; =20 - if (!resctrl_val) + if (!resource) return false; =20 ret =3D find_resctrl_mount(NULL); if (ret) return false; =20 - if (!strncmp(resctrl_val, CAT_STR, sizeof(CAT_STR))) { - if (!stat(L3_PATH, &statbuf)) - return true; - } else if (!strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) { - if (!stat(MB_PATH, &statbuf)) - return true; - } else if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR)) || - !strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) { - if (!stat(L3_MON_PATH, &statbuf)) { - inf =3D fopen(L3_MON_FEATURES_PATH, "r"); - if (!inf) - return false; - - if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) { - res =3D fgrep(inf, "llc_occupancy"); - if (res) { - found =3D true; - free(res); - } - } - - if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR))) { - res =3D fgrep(inf, "mbm_total_bytes"); - if (res) { - free(res); - res =3D fgrep(inf, "mbm_local_bytes"); - if (res) { - found =3D true; - free(res); - } - } - } - fclose(inf); - } - } + snprintf(res_path, sizeof(res_path), "%s/%s", INFO_PATH, resource); + + if (stat(res_path, &statbuf)) + return false; + + if (!feature) + return true; + + snprintf(res_path, sizeof(res_path), "%s/%s/mon_features", INFO_PATH, res= ource); + inf =3D fopen(res_path, "r"); + if (!inf) + return false; + + res =3D fgrep(inf, feature); + free(res); + fclose(inf); =20 - return found; + return !!res; } =20 int filter_dmesg(void) --=20 2.30.2 From nobody Thu Dec 18 19:25:23 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 48FFFE784B0 for ; Mon, 2 Oct 2023 09:49:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236268AbjJBJtg (ORCPT ); Mon, 2 Oct 2023 05:49:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236263AbjJBJte (ORCPT ); Mon, 2 Oct 2023 05:49:34 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15B02AC; Mon, 2 Oct 2023 02:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696240172; x=1727776172; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=74ZZ/564V4oDiXOyHfqgSxaGtj8l14K+TxF0BdYOyXM=; b=Rw4xOaGsK3ECrjctpWCSRWGZe849jkgHcFD1YdvgNJD1HXAXmM/hcD7L 5ok8f7r/uhJpE4Z/AeVLhi0jYN3LfC1ezK4Yd6Y23a+Zd2TGxLS9Q72bJ fnDRI3LsMG6Qx699qEwxkOe577iglHcxM2SS4XwLQSe7IFwIeTGO6f+Lf Q8QeAPQMS2bOXCH+s1mV2r6iAHkZ6nG5/Tuf8VU1WWLeQbGVfA0RqXi3P o7Wc7lDMIUOpFHrGcNJqDLpMzD1+sTytLuPMcIt25U6MeyJqbwjP1JOoK Sza0tjYIgmZtDokhUQJjweKmXkdBi6So4HyCk8BdVPBPc8pDNQYN9KKZn w==; X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="381495440" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="381495440" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:49:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="866456931" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="866456931" Received: from aanantha-mobl.gar.corp.intel.com (HELO localhost) ([10.251.221.191]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:49:28 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Shuah Khan , Reinette Chatre , =?UTF-8?q?Maciej=20Wiecz=C3=B3r-Retman?= , Shaopeng Tan Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH v4 6/7] selftests/resctrl: Fix feature checks Date: Mon, 2 Oct 2023 12:48:12 +0300 Message-Id: <20231002094813.6633-7-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231002094813.6633-1-ilpo.jarvinen@linux.intel.com> References: <20231002094813.6633-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 The MBA and CMT tests expect support of other features to be able to run. When platform only supports MBA but not MBM, MBA test will fail with: Failed to open total bw file: No such file or directory When platform only supports CMT but not CAT, CMT test will fail with: Failed to open bit mask file '/sys/fs/resctrl/info/L3/cbm_mask': No such fi= le or directory It leads to the test reporting test fail (even if no test was run at all). Extend feature checks to cover these two conditions to show these tests were skipped rather than failed. Fixes: ee0415681eb6 ("selftests/resctrl: Use resctrl/info for feature detec= tion") Signed-off-by: Ilpo J=C3=A4rvinen Tested-by: Shaopeng Tan Reviewed-by: Reinette Chatre Reviewed-by: Shaopeng Tan Cc: # selftests/resctrl: Refactor feature check to= use resource and feature name --- tools/testing/selftests/resctrl/resctrl_tests.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testin= g/selftests/resctrl/resctrl_tests.c index a19dcc3f8fb0..2bbe3045a018 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -130,7 +130,9 @@ static void run_mba_test(const char * const *benchmark_= cmd, int cpu_no) return; } =20 - if (!validate_resctrl_feature_request("MB", NULL) || (get_vendor() !=3D A= RCH_INTEL)) { + if (!validate_resctrl_feature_request("MB", NULL) || + !validate_resctrl_feature_request("L3_MON", "mbm_local_bytes") || + (get_vendor() !=3D ARCH_INTEL)) { ksft_test_result_skip("Hardware does not support MBA or MBA is disabled\= n"); goto cleanup; } @@ -153,7 +155,8 @@ static void run_cmt_test(const char * const *benchmark_= cmd, int cpu_no) return; } =20 - if (!validate_resctrl_feature_request("L3_MON", "llc_occupancy")) { + if (!validate_resctrl_feature_request("L3_MON", "llc_occupancy") || + !validate_resctrl_feature_request("L3", NULL)) { ksft_test_result_skip("Hardware does not support CMT or CMT is disabled\= n"); goto cleanup; } --=20 2.30.2 From nobody Thu Dec 18 19:25:23 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 934EDE7849A for ; Mon, 2 Oct 2023 09:49:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236232AbjJBJtx (ORCPT ); Mon, 2 Oct 2023 05:49:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236287AbjJBJtr (ORCPT ); Mon, 2 Oct 2023 05:49:47 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED42A10D; Mon, 2 Oct 2023 02:49:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696240182; x=1727776182; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sp0x4fJkDtvf5U3jrcchNzXDHSx4PqVE55/imOH1bT4=; b=Axn64ntUCu4JVs+35v0jPCkV9PCp/IMBvVVNZMqj2bspTzNFG7lgwe1O Wm6809huDVD4r6nmOmFpOjRHAK0EbTzEWDlMGoDrglhB7NGp6TSc2JJtq NEOw2urCrUBWVbKlxKiSZChD/qCKPP7XlbJdlJ0UL6yERIbddBr+KUOER 2M22wj0mbHkJqmsD5hQhUXmtRBZn5hB7S6BD3i/phk3vN/wmN2l7W5Hqb 0FJJ6JglCB61zc5rX129ki9AJzNYAFSUTaeDBrJaY0BR0vqERqUKufHQh i6R8/Qc12xx4OpxfUQSruPFrUr30fCuxEntCWlsloodcsFZOd9n4/wR14 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="372960722" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="372960722" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:49:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="754005604" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="754005604" Received: from aanantha-mobl.gar.corp.intel.com (HELO localhost) ([10.251.221.191]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:49:37 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Shuah Khan , Reinette Chatre , =?UTF-8?q?Maciej=20Wiecz=C3=B3r-Retman?= , Shaopeng Tan Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH v4 7/7] selftests/resctrl: Reduce failures due to outliers in MBA/MBM tests Date: Mon, 2 Oct 2023 12:48:13 +0300 Message-Id: <20231002094813.6633-8-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231002094813.6633-1-ilpo.jarvinen@linux.intel.com> References: <20231002094813.6633-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 The initial value of 5% chosen for the maximum allowed percentage difference between resctrl mbm value and IMC mbm value in commit 06bd03a57f8c ("selftests/resctrl: Fix MBA/MBM results reporting format") was "randomly chosen value" (as admitted by the changelog). When running tests in our lab across a large number platforms, 5% difference upper bound for success seems a bit on the low side for the MBA and MBM tests. Some platforms produce outliers that are slightly above that, typically 6-7%, which leads MBA/MBM test frequently failing. Replace the "randomly chosen value" with a success bound that is based on those measurements across large number of platforms by relaxing the MBA/MBM success bound to 8%. The relaxed bound removes the failures due the frequent outliers. Fixes: 06bd03a57f8c ("selftests/resctrl: Fix MBA/MBM results reporting form= at") Signed-off-by: Ilpo J=C3=A4rvinen Tested-by: Shaopeng Tan Reviewed-by: Reinette Chatre Reviewed-by: Shaopeng Tan Cc: --- tools/testing/selftests/resctrl/mba_test.c | 2 +- tools/testing/selftests/resctrl/mbm_test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/resctrl/mba_test.c b/tools/testing/sel= ftests/resctrl/mba_test.c index cf8284dadcb2..d3bf4368341e 100644 --- a/tools/testing/selftests/resctrl/mba_test.c +++ b/tools/testing/selftests/resctrl/mba_test.c @@ -12,7 +12,7 @@ =20 #define RESULT_FILE_NAME "result_mba" #define NUM_OF_RUNS 5 -#define MAX_DIFF_PERCENT 5 +#define MAX_DIFF_PERCENT 8 #define ALLOCATION_MAX 100 #define ALLOCATION_MIN 10 #define ALLOCATION_STEP 10 diff --git a/tools/testing/selftests/resctrl/mbm_test.c b/tools/testing/sel= ftests/resctrl/mbm_test.c index 1ae131a2e246..d3c0d30c676a 100644 --- a/tools/testing/selftests/resctrl/mbm_test.c +++ b/tools/testing/selftests/resctrl/mbm_test.c @@ -11,7 +11,7 @@ #include "resctrl.h" =20 #define RESULT_FILE_NAME "result_mbm" -#define MAX_DIFF_PERCENT 5 +#define MAX_DIFF_PERCENT 8 #define NUM_OF_RUNS 5 =20 static int --=20 2.30.2