From nobody Fri Dec 19 04:07:42 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