From patchwork Mon Jun 5 18:01:43 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: 103436 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2878522vqr; Mon, 5 Jun 2023 11:32:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4rGGGCLIu97OXRv8D0xlWSUPsdEm/U1WJ5SWlnE3cANPSfWl3wkSoFWtrOgPzopofANrxE X-Received: by 2002:a17:902:bd4c:b0:1ac:63ac:10a7 with SMTP id b12-20020a170902bd4c00b001ac63ac10a7mr2914137plx.68.1685989974746; Mon, 05 Jun 2023 11:32:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685989974; cv=none; d=google.com; s=arc-20160816; b=cCCzL979lpe9HrbTqbw/LtjVAMuyvnPSc+LtOdQcQcYHwefyNee+bcGh8pyS/TglzB UIYNldX2cks3Pnbp+4h9bl910ZURINVL/z4PWl1RJR0wum07y3kH97RH3Gzvb9lPU6pT o/6icMbnBBqwmWzMX1MnKiq83lHDXi8S3PMJWUnkbIzRKrQlDnJ2W3X+ujl2wZ7C2nsN IZW7WGk5dVb0J3447g1wKMZfC6gIBrt3VW1rveRVEAC2M0uDL+8XDifM7kerANmNltXl 3dY5JHm6FzLmxdkNoSQCoFSIS7nPfH/xOzhLwCDdKneK67Iaa/VaUsIdjpHqJXE5IeeJ BIyQ== 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=kuva4r8Gv98cUco/tH7/JGjCJYVXFJD6cCkoPnJN2yQ=; b=cSRc98C8K/uhCHPxYzvcCDu5g/gi3NyCYc74AqnwwTFA5+TEQrZntga23zDWoy0wJL 508oc/Y1KjtOV8AwRHF5fEi2R+fIGXCcGqjUxxag2HbB19qCQ0nYAfhv/GrjdmmXW533 3FScTLpGSoSN+troirJXCiFmGu6JvEhaPCl3+MsMBYOxMmuA6+lfOwdD8K3xIf2ySCPl pPN8snsQHSmbmMbp7wAGUPgbvtQrVLMIO4mKpHdk5tgrJqG5f5+6vycoEzNWWsg1kSKd 9l3MIz18JGhX8DAYF4oWXssKufJtVKpWelYQbhdZPER36rS90MA+REVeN00QCIAznqio DutQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gkUCxu8k; 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 x1-20020a170902a38100b001ac2ff9fbf8si5553475pla.403.2023.06.05.11.32.39; Mon, 05 Jun 2023 11:32:54 -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=gkUCxu8k; 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 S235709AbjFESEt (ORCPT + 99 others); Mon, 5 Jun 2023 14:04:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235581AbjFESES (ORCPT ); Mon, 5 Jun 2023 14:04:18 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5CCCFD; Mon, 5 Jun 2023 11:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685988233; x=1717524233; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WIWnJB3NculwQZQw1FR80Zi4TS+CrST66ZBC+3Ji4ag=; b=gkUCxu8kGHduqpOaksF+INZPWE6qEIiouRjBMDvc6uTUJ+HR+V83xXuL aDD0P9SMuzpsst7y7cOejGpUybdJVA8J8mvaCOV7dDeMcv4xhDKIUzkmi qZwRvJqgfNQg7kLEuDQhqU0ljB5o+PwvOMfRgVfI2hYsKX+fa43Y0jcWk sTV+td5oLlzQK2g3/e/OArhr6E1VLUABZBzFhAD6piOIbREbDYFXgh6zS 6oHkl1ZJs30r0FAyOIAEJy/KKUJ1UBQRPOYgEuLibR5gdgKJQUGpk3vIF IqGeUjvIDucRHho6adf6ChY4xNTlqsJfAH0yMlJafYzWOZj48+T9ITiqB A==; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="442815454" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="442815454" 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:03:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="821274321" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="821274321" 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:03:33 -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 17/19] selftests/resctrl: Move CAT/CMT test global vars to function they are used in Date: Mon, 5 Jun 2023 21:01:43 +0300 Message-Id: <20230605180145.112924-18-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?1767888624043701308?= X-GMAIL-MSGID: =?utf-8?q?1767888624043701308?= CAT and CMT tests have count_of_bits, long_mask, cbm_mask, and cache_size global variables that can be moved into the sole using function. Make the global variables local variables of the relevant function to scope them better. While at it, move cache_size initialization into the declaration line. Signed-off-by: Ilpo Järvinen --- tools/testing/selftests/resctrl/cat_test.c | 11 ++++------- tools/testing/selftests/resctrl/cmt_test.c | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/selftests/resctrl/cat_test.c index 42e35269d8b6..ed6c8e64ad11 100644 --- a/tools/testing/selftests/resctrl/cat_test.c +++ b/tools/testing/selftests/resctrl/cat_test.c @@ -17,11 +17,6 @@ #define MAX_DIFF_PERCENT 4 #define MAX_DIFF 1000000 -static int count_of_bits; -static char cbm_mask[256]; -static unsigned long long_mask; -static unsigned long cache_size; - /* * Change schemata. Write schemata to specified * con_mon grp, mon_grp in resctrl FS. @@ -96,10 +91,12 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type) { unsigned long l_mask, l_mask_1; int ret, pipefd[2], sibling_cpu_no; + unsigned long cache_size = 0; + unsigned long long_mask; + char cbm_mask[256]; + int count_of_bits; char pipe_message; - cache_size = 0; - /* Get default cbm mask for L3/L2 cache */ ret = get_cbm_mask(cache_type, cbm_mask); if (ret) diff --git a/tools/testing/selftests/resctrl/cmt_test.c b/tools/testing/selftests/resctrl/cmt_test.c index 7214aefb55ed..0ac9d6bbd13d 100644 --- a/tools/testing/selftests/resctrl/cmt_test.c +++ b/tools/testing/selftests/resctrl/cmt_test.c @@ -16,11 +16,6 @@ #define MAX_DIFF 2000000 #define MAX_DIFF_PERCENT 15 -static int count_of_bits; -static char cbm_mask[256]; -static unsigned long long_mask; -static unsigned long cache_size; - static int cmt_setup(struct resctrl_val_param *p) { /* Run NUM_OF_RUNS times */ @@ -75,10 +70,12 @@ void cmt_test_cleanup(void) int cmt_resctrl_val(int cpu_no, int n, char **benchmark_cmd) { + unsigned long cache_size = 0; + unsigned long long_mask; + char cbm_mask[256]; + int count_of_bits; int ret; - cache_size = 0; - if (!validate_resctrl_feature_request(CMT_STR)) return -1;