From patchwork Mon Jun 5 18:01:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 103422 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2870449vqr; Mon, 5 Jun 2023 11:17:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5HfhZMqiCq0ILYkTd8vGCAzAvO5+uJejgqUKwoaNg0TrqvZBR20P9CmjaeIybTV3UycUkK X-Received: by 2002:a17:903:22cc:b0:1ae:40ed:4b8 with SMTP id y12-20020a17090322cc00b001ae40ed04b8mr4636759plg.22.1685989052142; Mon, 05 Jun 2023 11:17:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685989052; cv=none; d=google.com; s=arc-20160816; b=D2wPwd+j+u1DIOddjEO3QdM8z83cJ4q+wo8TBpKkfNfW7pARsiT626/Y+jmVdad9hd zunwD5qDJ3++EgFQG8/bIHuCjA7i1P5I3dJu+QE1fCOC2YsCY+jT9hyvJKLBLu2wFYcg FGXI8UXuIKIvGajh2534V7AbIJI4zX09O1MSXQ8oSIHDSd1SCr8dvMGaJQXVK481JqLZ J92hTofPGJVhqJScAbOhBf6HSJN7V+3zE9xPTxCM0hh9bwBXSaFuIbM7kiUZg8Hy5Tte nz2TGiC9q7YJTGjjrXz6tI6lkfcaW0ixz5Uy3HFyKrezrlynSXQRwUCcKSzxZsfew8ka Zm3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MdOE+CD9qWYivIOcwTTG/+NLPklDHnEV0XWopmBOvgM=; b=XQmZqs4do3WX2cJjlXR0fH6Pkc0f8Zxvj3L2xVzz+7Ne4rVex1Vm4nP8+k+6TW5PeZ GXVFCsADRTk6DD2kRFCYndi23Q9OvsrwXdAGPEEdSEJyWF+Ngi11sWvsLhJAj1yTI21+ d0tbJGLjorC+AGejn0Oe2sRxlIOxcZK4DxBt2RldRa7dPgkSthCGwIdYHkB35B+lOaHw AyLAsKRsxm5b55Tcakn/SUaLYwkolIXNingq7AtYIZITdY1bGUzdMrrs3DRbDoM88+Qa deO9LshPiyY2bEi6wLpJT12F1NF5u8ezr684cYuy9my6Jg+LqdjSCWO1LscbJOgCJswi EXDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DwGyKYH6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y19-20020a170902ed5300b001b06fa47450si5646615plb.531.2023.06.05.11.17.17; Mon, 05 Jun 2023 11:17:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DwGyKYH6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235354AbjFESDi (ORCPT + 99 others); Mon, 5 Jun 2023 14:03:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235515AbjFESD0 (ORCPT ); Mon, 5 Jun 2023 14:03:26 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85944BE; Mon, 5 Jun 2023 11:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685988175; x=1717524175; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Rg5CeMkdCjcl7CC3dcDGwqnZfSwe5+lQhCDWVmpL8Hc=; b=DwGyKYH6Vy71mbszExA2ObLCYgP5M3BYwH+NN5hqHnIhjfHLxo/0XtFq OQ3H3EE3M7x0ATwy+PCAYAkOBWtwOQTQe5QC2zq4FaPTT2oo2ChoiSklA Ji1sCU719kM8IMEk1X7y9krYOujwFsOzT6XbFWpv/LQQLkcCbwtHOurnQ e2F1JiaJDtvx6nMcbWKcj7XhQ9JMYytFzajB6O3Vp7IoyA0g1EjKAGInV IyGcAiQ6d0wO3e9CfwCUTt6+FC7W4/PGCHUNlLSD94NvnO8qDvcZQ5hFn 2AuQ/zvIPQdJodMKNfKBv6Rm8c2xe+h+YC3AAPBAwvD3OUzGNBSmrJt9g g==; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="442815156" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="442815156" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 11:02:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="821274156" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="821274156" Received: from gfittedx-mobl.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.47.115]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 11:02:46 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Reinette Chatre , Shuah Khan , Shaopeng Tan , Fenghua Yu , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v3 10/19] selftests/resctrl: Express span internally in bytes Date: Mon, 5 Jun 2023 21:01:36 +0300 Message-Id: <20230605180145.112924-11-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230605180145.112924-1-ilpo.jarvinen@linux.intel.com> References: <20230605180145.112924-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767887656096221225?= X-GMAIL-MSGID: =?utf-8?q?1767887656096221225?= MBA and MBM tests to use megabytes to represent span. CMT test uses bytes. The difference requires run_benchmark() to size the buffer differently based on the test name, which in turn requires passing the test name into run_benchmark(). Convert MBA and MBM tests to use internally bytes like CMT test to remove the internal inconsistency between the tests. Remove the test dependent buffer sizing from run_benchmark(). This change eliminates one of the reasons why the test name has to be passed around but there are still other users too so the test name passing cannot yet be removed. Co-developed-by: Fenghua Yu Signed-off-by: Fenghua Yu Signed-off-by: Ilpo Järvinen --- tools/testing/selftests/resctrl/mbm_test.c | 2 +- tools/testing/selftests/resctrl/resctrl_tests.c | 2 +- tools/testing/selftests/resctrl/resctrlfs.c | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/resctrl/mbm_test.c b/tools/testing/selftests/resctrl/mbm_test.c index fd116158d008..2d58d4b8a918 100644 --- a/tools/testing/selftests/resctrl/mbm_test.c +++ b/tools/testing/selftests/resctrl/mbm_test.c @@ -40,7 +40,7 @@ show_bw_info(unsigned long *bw_imc, unsigned long *bw_resc, size_t span) ksft_print_msg("%s Check MBM diff within %d%%\n", ret ? "Fail:" : "Pass:", MAX_DIFF_PERCENT); ksft_print_msg("avg_diff_per: %d%%\n", avg_diff_per); - ksft_print_msg("Span (MB): %zu\n", span); + ksft_print_msg("Span (MB): %zu\n", span / MB); ksft_print_msg("avg_bw_imc: %lu\n", avg_bw_imc); ksft_print_msg("avg_bw_resc: %lu\n", avg_bw_resc); diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c index 1c1fbcfcd086..0fe83264e925 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -185,8 +185,8 @@ int main(int argc, char **argv) char benchmark_cmd_area[BENCHMARK_ARGS][BENCHMARK_ARG_SIZE]; int c, cpu_no = 1, argc_new = argc, i, no_of_bits = 0; int ben_ind, ben_count, tests = 0; + size_t span = 250 * MB; bool cat_test = true; - size_t span = 250; for (i = 0; i < argc; i++) { if (strcmp(argv[i], "-b") == 0) { diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c index 8be5b745226d..847e0a80c6cd 100644 --- a/tools/testing/selftests/resctrl/resctrlfs.c +++ b/tools/testing/selftests/resctrl/resctrlfs.c @@ -298,9 +298,9 @@ int taskset_benchmark(pid_t bm_pid, int cpu_no) void run_benchmark(int signum, siginfo_t *info, void *ucontext) { int operation, ret, malloc_and_init_memory, memflush; - size_t span, buffer_span; char **benchmark_cmd; char resctrl_val[64]; + size_t span; FILE *fp; benchmark_cmd = info->si_ptr; @@ -321,12 +321,7 @@ void run_benchmark(int signum, siginfo_t *info, void *ucontext) operation = atoi(benchmark_cmd[4]); sprintf(resctrl_val, "%s", benchmark_cmd[5]); - if (strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) - buffer_span = span * MB; - else - buffer_span = span; - - if (run_fill_buf(buffer_span, malloc_and_init_memory, memflush, + if (run_fill_buf(span, malloc_and_init_memory, memflush, operation, resctrl_val)) fprintf(stderr, "Error in running fill buffer\n"); } else {