From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-kselftest@vger.kernel.org,
"Reinette Chatre" <reinette.chatre@intel.com>,
"Shuah Khan" <shuah@kernel.org>,
"Shaopeng Tan" <tan.shaopeng@jp.fujitsu.com>,
"Maciej Wieczór-Retman" <maciej.wieczor-retman@intel.com>,
"Fenghua Yu" <fenghua.yu@intel.com>
Cc: linux-kernel@vger.kernel.org,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH 20/24] selftests/resctrl: Add helper to convert L2/3 to integer
Date: Tue, 24 Oct 2023 12:26:30 +0300 [thread overview]
Message-ID: <20231024092634.7122-21-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20231024092634.7122-1-ilpo.jarvinen@linux.intel.com>
"L2"/"L3" conversion to integer in embedded into get_cache_size()
which prevents reuse.
Create a helper for the cache string to integer conversion to make
it reusable.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
tools/testing/selftests/resctrl/resctrlfs.c | 28 +++++++++++++++------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c
index 7d72bea3ed58..b98d88f7cbc4 100644
--- a/tools/testing/selftests/resctrl/resctrlfs.c
+++ b/tools/testing/selftests/resctrl/resctrlfs.c
@@ -94,6 +94,23 @@ int umount_resctrlfs(void)
return 0;
}
+/*
+ * get_cache_level - Convert cache level from string to integer
+ * @cache_type: Cache level as string
+ *
+ * Return: cache level as integer or -1 if @cache_type is invalid.
+ */
+static int get_cache_level(const char *cache_type)
+{
+ if (!strcmp(cache_type, "L3"))
+ return 3;
+ if (!strcmp(cache_type, "L2"))
+ return 2;
+
+ perror("Invalid cache level");
+ return -1;
+}
+
/*
* get_resource_id - Get socket number/l3 id for a specified CPU
* @cpu_no: CPU number
@@ -144,14 +161,9 @@ int get_cache_size(int cpu_no, const char *cache_type, unsigned long *cache_size
int length, i, cache_num;
FILE *fp;
- if (!strcmp(cache_type, "L3")) {
- cache_num = 3;
- } else if (!strcmp(cache_type, "L2")) {
- cache_num = 2;
- } else {
- perror("Invalid cache level");
- return -1;
- }
+ cache_num = get_cache_level(cache_type);
+ if (cache_num < 0)
+ return cache_num;
sprintf(cache_path, "/sys/bus/cpu/devices/cpu%d/cache/index%d/size",
cpu_no, cache_num);
--
2.30.2
next prev parent reply other threads:[~2023-10-24 9:31 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 9:26 [PATCH 00/24] selftests/resctrl: CAT test improvements & generalized test framework Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 01/24] selftests/resctrl: Split fill_buf to allow tests finer-grained control Ilpo Järvinen
2023-10-27 11:24 ` Maciej Wieczór-Retman
2023-11-02 17:46 ` Reinette Chatre
2023-10-24 9:26 ` [PATCH 02/24] selftests/resctrl: Refactor fill_buf functions Ilpo Järvinen
2023-10-27 11:32 ` Maciej Wieczór-Retman
2023-10-27 11:41 ` Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 03/24] selftests/resctrl: Refactor get_cbm_mask() Ilpo Järvinen
2023-10-27 11:39 ` Maciej Wieczór-Retman
2023-11-02 17:47 ` Reinette Chatre
2023-11-03 12:09 ` Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 04/24] selftests/resctrl: Mark get_cache_size() cache_type const Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 05/24] selftests/resctrl: Create cache_size() helper Ilpo Järvinen
2023-11-02 17:47 ` Reinette Chatre
2023-11-03 8:53 ` Ilpo Järvinen
2023-11-03 22:49 ` Reinette Chatre
2023-10-24 9:26 ` [PATCH 06/24] selftests/resctrl: Exclude shareable bits from schemata in CAT test Ilpo Järvinen
2023-11-02 17:48 ` Reinette Chatre
2023-10-24 9:26 ` [PATCH 07/24] selftests/resctrl: Split measure_cache_vals() function Ilpo Järvinen
2023-11-02 17:48 ` Reinette Chatre
2023-10-24 9:26 ` [PATCH 08/24] selftests/resctrl: Split show_cache_info() to test specific and generic parts Ilpo Järvinen
2023-11-02 17:48 ` Reinette Chatre
2023-10-24 9:26 ` [PATCH 09/24] selftests/resctrl: Remove unnecessary __u64 -> unsigned long conversion Ilpo Järvinen
2023-11-02 17:48 ` Reinette Chatre
2023-11-03 9:19 ` Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 10/24] selftests/resctrl: Remove nested calls in perf event handling Ilpo Järvinen
2023-11-02 17:49 ` Reinette Chatre
2023-11-03 9:45 ` Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 11/24] selftests/resctrl: Consolidate naming of perf event related things Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 12/24] selftests/resctrl: Improve perf init Ilpo Järvinen
2023-10-27 11:45 ` Maciej Wieczór-Retman
2023-10-24 9:26 ` [PATCH 13/24] selftests/resctrl: Convert perf related globals to locals Ilpo Järvinen
2023-10-27 11:47 ` Maciej Wieczór-Retman
2023-10-24 9:26 ` [PATCH 14/24] selftests/resctrl: Move cat_val() to cat_test.c and rename to cat_test() Ilpo Järvinen
2023-10-27 11:51 ` Maciej Wieczór-Retman
2023-10-27 12:18 ` Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 15/24] selftests/resctrl: Read in less obvious order to defeat prefetch optimizations Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 16/24] selftests/resctrl: Rewrite Cache Allocation Technology (CAT) test Ilpo Järvinen
2023-10-27 12:05 ` Maciej Wieczór-Retman
[not found] ` <fb5e1a50-ba7-1ee8-8bf2-bb8b64b27b1@linux.intel.com>
2023-10-31 7:24 ` Maciej Wieczór-Retman
2023-11-02 17:51 ` Reinette Chatre
2023-11-03 10:57 ` Ilpo Järvinen
2023-11-03 22:50 ` Reinette Chatre
2023-10-24 9:26 ` [PATCH 17/24] selftests/resctrl: Create struct for input parameter Ilpo Järvinen
2023-10-27 12:07 ` Maciej Wieczór-Retman
2023-11-02 17:51 ` Reinette Chatre
2023-11-03 11:24 ` Ilpo Järvinen
2023-11-03 22:50 ` Reinette Chatre
2023-11-06 9:06 ` Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 18/24] selftests/resctrl: Introduce generalized test framework Ilpo Järvinen
2023-11-02 17:52 ` Reinette Chatre
2023-11-03 9:54 ` Ilpo Järvinen
2023-11-03 22:50 ` Reinette Chatre
2023-10-24 9:26 ` [PATCH 19/24] selftests/resctrl: Pass write_schemata() resource instead of test name Ilpo Järvinen
2023-10-24 9:26 ` Ilpo Järvinen [this message]
2023-10-27 12:09 ` [PATCH 20/24] selftests/resctrl: Add helper to convert L2/3 to integer Maciej Wieczór-Retman
2023-10-24 9:26 ` [PATCH 21/24] selftests/resctrl: Get resource id from cache id Ilpo Järvinen
[not found] ` <cb2ctfignowlom7lb2t5zhdgtm4s2jlzlvtumlnvxecwwtjk34@ysgepmgkv6bb>
[not found] ` <ab4c6aa5-ea49-363a-ff7b-2215665f185d@linux.intel.com>
2023-10-31 7:58 ` Maciej Wieczór-Retman
2023-10-24 9:26 ` [PATCH 22/24] selftests/resctrl: Add test groups and name L3 CAT test L3_CAT Ilpo Järvinen
2023-10-24 9:26 ` [PATCH 23/24] selftests/resctrl: Add L2 CAT test Ilpo Järvinen
2023-11-02 17:57 ` Reinette Chatre
2023-11-03 10:39 ` Ilpo Järvinen
2023-11-03 22:53 ` Reinette Chatre
2023-11-06 9:53 ` Ilpo Järvinen
2023-11-06 17:03 ` Reinette Chatre
2023-11-06 21:22 ` Reinette Chatre
2023-11-07 9:33 ` Ilpo Järvinen
2023-11-08 16:31 ` Reinette Chatre
2023-10-24 9:26 ` [PATCH 24/24] selftests/resctrl: Ignore failures from L2 CAT test with <= 2 bits Ilpo Järvinen
2023-11-02 17:57 ` Reinette Chatre
2023-11-03 10:24 ` Ilpo Järvinen
2023-11-03 22:53 ` Reinette Chatre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231024092634.7122-21-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=maciej.wieczor-retman@intel.com \
--cc=reinette.chatre@intel.com \
--cc=shuah@kernel.org \
--cc=tan.shaopeng@jp.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox