From nobody Tue Dec 16 16:40:43 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 885BBEE4993 for ; Wed, 23 Aug 2023 13:18:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235786AbjHWNSS (ORCPT ); Wed, 23 Aug 2023 09:18:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235741AbjHWNSF (ORCPT ); Wed, 23 Aug 2023 09:18:05 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5273E5E; Wed, 23 Aug 2023 06:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692796656; x=1724332656; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KMijV8Ga6o2RveX6LIZwrfl8ghjMTaukomesaDR4jL4=; b=PFvpqEpV1UtTs74TB5rZuWWyNztXDvoq2uz3sTtq4l1SDppGy+k2+gFe A96rDWdr0SE9VvIbi2wxozpMr7q9wO1uwvnIHAgun7Ia6qdn+uQeJseaw 4zSUyjEMQJVMFCAzwt9gGqTh+bivbdqD8YfCreNKrXN72peb1MuJLhMWw qcvH6u6L+cJSzyslXL5mDtgb0vFXVF5mUlmDxW9FpwIOSX545KeOJH1yR /EWxW51Lc2sgO4t/OVSi6gjyI2ob2rvKsXhDFYS79IMwvoAAjuDZ65wg0 Y4KDUC0ewyI12bttCY88x+Wz4PsUwzI6w66TGpp3/bugIkqHCvO3sGr8B Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10811"; a="373043992" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="373043992" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2023 06:16:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10811"; a="713572786" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="713572786" Received: from amangalo-mobl4.ger.corp.intel.com (HELO ijarvine-mobl2.ger.corp.intel.com) ([10.252.55.236]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2023 06:16:20 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: Reinette Chatre , Shuah Khan , linux-kselftest@vger.kernel.org, Shuah Khan , Maciej Wieczor-Retman Cc: Fenghua Yu , Babu Moger , LKML , Shaopeng Tan , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH v3 3/7] selftests/resctrl: Remove bw_report and bm_type from main() Date: Wed, 23 Aug 2023 16:15:52 +0300 Message-Id: <20230823131556.27617-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230823131556.27617-1-ilpo.jarvinen@linux.intel.com> References: <20230823131556.27617-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 bw_report is always set to "reads" and bm_type is set to "fill_buf" but is never used. Set bw_report directly to "reads" in MBA/MBM test and remove bm_type. Signed-off-by: Ilpo J=C3=A4rvinen Reviewed-by: Reinette Chatre --- tools/testing/selftests/resctrl/mba_test.c | 4 ++-- tools/testing/selftests/resctrl/mbm_test.c | 4 ++-- tools/testing/selftests/resctrl/resctrl.h | 4 ++-- .../testing/selftests/resctrl/resctrl_tests.c | 18 +++++++----------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/resctrl/mba_test.c b/tools/testing/sel= ftests/resctrl/mba_test.c index 4d2f145804b8..094424d835d0 100644 --- a/tools/testing/selftests/resctrl/mba_test.c +++ b/tools/testing/selftests/resctrl/mba_test.c @@ -141,7 +141,7 @@ void mba_test_cleanup(void) remove(RESULT_FILE_NAME); } =20 -int mba_schemata_change(int cpu_no, char *bw_report, char **benchmark_cmd) +int mba_schemata_change(int cpu_no, char **benchmark_cmd) { struct resctrl_val_param param =3D { .resctrl_val =3D MBA_STR, @@ -149,7 +149,7 @@ int mba_schemata_change(int cpu_no, char *bw_report, ch= ar **benchmark_cmd) .mongrp =3D "m1", .cpu_no =3D cpu_no, .filename =3D RESULT_FILE_NAME, - .bw_report =3D bw_report, + .bw_report =3D "reads", .setup =3D mba_setup }; int ret; diff --git a/tools/testing/selftests/resctrl/mbm_test.c b/tools/testing/sel= ftests/resctrl/mbm_test.c index c7de6f5977f6..3e4a800e0e40 100644 --- a/tools/testing/selftests/resctrl/mbm_test.c +++ b/tools/testing/selftests/resctrl/mbm_test.c @@ -109,7 +109,7 @@ void mbm_test_cleanup(void) remove(RESULT_FILE_NAME); } =20 -int mbm_bw_change(size_t span, int cpu_no, char *bw_report, char **benchma= rk_cmd) +int mbm_bw_change(size_t span, int cpu_no, char **benchmark_cmd) { struct resctrl_val_param param =3D { .resctrl_val =3D MBM_STR, @@ -118,7 +118,7 @@ int mbm_bw_change(size_t span, int cpu_no, char *bw_rep= ort, char **benchmark_cmd .span =3D span, .cpu_no =3D cpu_no, .filename =3D RESULT_FILE_NAME, - .bw_report =3D bw_report, + .bw_report =3D "reads", .setup =3D mbm_setup }; int ret; diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/self= tests/resctrl/resctrl.h index 838d1a438f33..f3446ac664c2 100644 --- a/tools/testing/selftests/resctrl/resctrl.h +++ b/tools/testing/selftests/resctrl/resctrl.h @@ -98,10 +98,10 @@ int perf_event_open(struct perf_event_attr *hw_event, p= id_t pid, int cpu, int group_fd, unsigned long flags); int run_fill_buf(size_t span, int memflush, int op, bool once); int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param); -int mbm_bw_change(size_t span, int cpu_no, char *bw_report, char **benchma= rk_cmd); +int mbm_bw_change(size_t span, int cpu_no, char **benchmark_cmd); void tests_cleanup(void); void mbm_test_cleanup(void); -int mba_schemata_change(int cpu_no, char *bw_report, char **benchmark_cmd); +int mba_schemata_change(int cpu_no, char **benchmark_cmd); void mba_test_cleanup(void); int get_cbm_mask(char *cache_type, char *cbm_mask); int get_cache_size(int cpu_no, char *cache_type, unsigned long *cache_size= ); diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testin= g/selftests/resctrl/resctrl_tests.c index de99923fa2e0..af0d32abf08e 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -70,8 +70,7 @@ void tests_cleanup(void) cat_test_cleanup(); } =20 -static void run_mbm_test(char **benchmark_cmd, size_t span, - int cpu_no, char *bw_report) +static void run_mbm_test(char **benchmark_cmd, size_t span, int cpu_no) { int res; =20 @@ -88,7 +87,7 @@ static void run_mbm_test(char **benchmark_cmd, size_t spa= n, goto umount; } =20 - res =3D mbm_bw_change(span, cpu_no, bw_report, benchmark_cmd); + res =3D mbm_bw_change(span, cpu_no, benchmark_cmd); ksft_test_result(!res, "MBM: bw change\n"); 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"); @@ -97,7 +96,7 @@ static void run_mbm_test(char **benchmark_cmd, size_t spa= n, umount_resctrlfs(); } =20 -static void run_mba_test(char **benchmark_cmd, int cpu_no, char *bw_report) +static void run_mba_test(char **benchmark_cmd, int cpu_no) { int res; =20 @@ -114,7 +113,7 @@ static void run_mba_test(char **benchmark_cmd, int cpu_= no, char *bw_report) goto umount; } =20 - res =3D mba_schemata_change(cpu_no, bw_report, benchmark_cmd); + res =3D mba_schemata_change(cpu_no, benchmark_cmd); ksft_test_result(!res, "MBA: schemata change\n"); =20 umount: @@ -174,9 +173,9 @@ static void run_cat_test(int cpu_no, int no_of_bits) int main(int argc, char **argv) { bool has_ben =3D false, mbm_test =3D true, mba_test =3D true, cmt_test = =3D true; - char *benchmark_cmd[BENCHMARK_ARGS], bw_report[64], bm_type[64]; char benchmark_cmd_area[BENCHMARK_ARGS][BENCHMARK_ARG_SIZE]; int c, cpu_no =3D 1, argc_new =3D argc, i, no_of_bits =3D 0; + char *benchmark_cmd[BENCHMARK_ARGS]; int ben_ind, ben_count, tests =3D 0; size_t span =3D 250 * MB; bool cat_test =3D true; @@ -279,9 +278,6 @@ int main(int argc, char **argv) benchmark_cmd[5] =3D NULL; } =20 - sprintf(bw_report, "reads"); - sprintf(bm_type, "fill_buf"); - if (!check_resctrlfs_support()) return ksft_exit_skip("resctrl FS does not exist. Enable X86_CPU_RESCTRL= config option.\n"); =20 @@ -293,10 +289,10 @@ int main(int argc, char **argv) ksft_set_plan(tests ? : 4); =20 if (mbm_test) - run_mbm_test(benchmark_cmd, span, cpu_no, bw_report); + run_mbm_test(benchmark_cmd, span, cpu_no); =20 if (mba_test) - run_mba_test(benchmark_cmd, cpu_no, bw_report); + run_mba_test(benchmark_cmd, cpu_no); =20 if (cmt_test) run_cmt_test(benchmark_cmd, cpu_no); --=20 2.30.2