From: Fenghua Yu <fenghua.yu@intel.com>
To: "Shuah Khan" <shuah@kernel.org>,
"Reinette Chatre" <reinette.chatre@intel.com>,
"Tony Luck" <tony.luck@intel.com>,
"Babu Moger" <babu.moger@amd.com>,
"James Morse" <james.morse@arm.com>,
"Borislav Petkov" <bp@alien8.de>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ravi V Shankar" <ravi.v.shankar@intel.com>
Cc: "linux-kselftest" <linux-kselftest@vger.kernel.org>,
"linux-kernel" <linux-kernel@vger.kernel.org>,
Fenghua Yu <fenghua.yu@intel.com>
Subject: [PATCH v3 18/21] selftests/resctrl: Fix incorrect parsing of iMC counters
Date: Tue, 20 Oct 2020 23:51:23 +0000 [thread overview]
Message-ID: <20201020235126.1871815-19-fenghua.yu@intel.com> (raw)
In-Reply-To: <20201020235126.1871815-1-fenghua.yu@intel.com>
iMC (Integrated Memory Controller) counters are usually at
"/sys/bus/event_source/devices/" and are named as "uncore_imc_<n>".
num_of_imcs() function tries to count number of such iMC counters so that
it could appropriately initialize required number of perf_attr structures
that could be used to read these iMC counters.
num_of_imcs() function assumes that all the directories under this path
that start with "uncore_imc" are iMC counters. But, on some systems there
could be directories named as "uncore_imc_free_running" which aren't iMC
counters. Trying to read from such directories will result in "not found
file" errors and MBM/MBA tests will fail.
Hence, fix the logic in num_of_imcs() such that it looks at the first
character after "uncore_imc_" to check if it's a numerical digit or not. If
it's a digit then the directory represents an iMC counter, else, skip the
directory.
Fixes: 7f4d257e3a2a ("selftests/resctrl: Add callback to start a benchmark")
Reported-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
---
tools/testing/selftests/resctrl/resctrl_val.c | 22 +++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c
index 270cd95e0026..88f9b641d753 100644
--- a/tools/testing/selftests/resctrl/resctrl_val.c
+++ b/tools/testing/selftests/resctrl/resctrl_val.c
@@ -221,8 +221,8 @@ static int read_from_imc_dir(char *imc_dir, int count)
*/
static int num_of_imcs(void)
{
+ char imc_dir[512], *temp;
unsigned int count = 0;
- char imc_dir[512];
struct dirent *ep;
int ret;
DIR *dp;
@@ -230,7 +230,25 @@ static int num_of_imcs(void)
dp = opendir(DYN_PMU_PATH);
if (dp) {
while ((ep = readdir(dp))) {
- if (strstr(ep->d_name, UNCORE_IMC)) {
+ temp = strstr(ep->d_name, UNCORE_IMC);
+ if (!temp)
+ continue;
+
+ /*
+ * imc counters are named as "uncore_imc_<n>", hence
+ * increment the pointer to point to <n>. Note that
+ * sizeof(UNCORE_IMC) would count for null character as
+ * well and hence the last underscore character in
+ * uncore_imc'_' need not be counted.
+ */
+ temp = temp + sizeof(UNCORE_IMC);
+
+ /*
+ * Some directories under "DYN_PMU_PATH" could have
+ * names like "uncore_imc_free_running", hence, check if
+ * first character is a numerical digit or not.
+ */
+ if (temp[0] >= '0' && temp[0] <= '9') {
sprintf(imc_dir, "%s/%s/", DYN_PMU_PATH,
ep->d_name);
ret = read_from_imc_dir(imc_dir, count);
--
2.29.0
next prev parent reply other threads:[~2020-10-20 23:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 23:51 [PATCH v3 00/21] Miscellaneous fixes for resctrl selftests Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 01/21] selftests/resctrl: Rename CQM test as CMT test Fenghua Yu
2020-10-27 20:55 ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 02/21] selftests/resctrl: Fix typo Fenghua Yu
2020-10-27 20:56 ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 03/21] selftests/resctrl: Fix typo in help text Fenghua Yu
2020-10-27 20:58 ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 04/21] selftests/resctrl: Declare global variables as extern Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 05/21] selftests/resctrl: Return if resctrl file system is not supported Fenghua Yu
2020-10-27 21:34 ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 06/21] selftests/resctrl: Check for resctrl mount point only if resctrl FS is supported Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 07/21] selftests/resctrl: Use resctrl/info for feature detection Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 08/21] selftests/resctrl: Ensure sibling CPU is not same as original CPU Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 09/21] selftests/resctrl: Fix missing options "-n" and "-p" Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 10/21] selftests/resctrl: Fix MBA/MBM results reporting format Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 11/21] selftests/resctrl: Abort running tests if not root user Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 12/21] selftests/resctrl: Enable gcc checks to detect buffer overflows Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 13/21] selftests/resctrl: Don't hard code value of "no_of_bits" variable Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 14/21] selftests/resctrl: Modularize resctrl test suite main() function Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 15/21] selftests/resctrl: Skip the test if requested resctrl feature is not supported Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 16/21] selftests/resctrl: Umount resctrl FS only if mounted Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 17/21] selftests/resctrl: Unmount resctrl FS after running all tests Fenghua Yu
2020-10-20 23:51 ` Fenghua Yu [this message]
2020-10-20 23:51 ` [PATCH v3 19/21] selftests/resctrl: Fix checking for < 0 for unsigned values Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 20/21] selftests/resctrl: Fix unnecessary usage of global variables Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 21/21] selftests/resctrl: Don't use global variable for capacity bitmask (CBM) Fenghua Yu
2020-10-28 0:46 ` [PATCH v3 00/21] Miscellaneous fixes for resctrl selftests Shuah Khan
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=20201020235126.1871815-19-fenghua.yu@intel.com \
--to=fenghua.yu@intel.com \
--cc=babu.moger@amd.com \
--cc=bp@alien8.de \
--cc=james.morse@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=ravi.v.shankar@intel.com \
--cc=reinette.chatre@intel.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.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;
as well as URLs for NNTP newsgroup(s).