From: Benjamin Gray <bgray@linux.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Benjamin Gray <bgray@linux.ibm.com>, ajd@linux.ibm.com
Subject: [PATCH v2 6/7] selftests/powerpc: Add {read,write}_{long,ulong}
Date: Wed, 23 Nov 2022 10:11:02 +1100 [thread overview]
Message-ID: <20221122231103.15829-7-bgray@linux.ibm.com> (raw)
In-Reply-To: <20221122231103.15829-1-bgray@linux.ibm.com>
Add helper functions to read and write (unsigned) long values directly
from/to files. One of the kernel interfaces uses hex strings, so we need
to allow passing a base too.
Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
---
tools/testing/selftests/powerpc/dscr/dscr.h | 9 +--
.../selftests/powerpc/dscr/dscr_sysfs_test.c | 12 ++--
.../testing/selftests/powerpc/include/utils.h | 4 ++
tools/testing/selftests/powerpc/pmu/lib.c | 11 +---
tools/testing/selftests/powerpc/utils.c | 62 +++++++++++++++++++
5 files changed, 76 insertions(+), 22 deletions(-)
diff --git a/tools/testing/selftests/powerpc/dscr/dscr.h b/tools/testing/selftests/powerpc/dscr/dscr.h
index 9a69d473ffdf..b5166ddcf26a 100644
--- a/tools/testing/selftests/powerpc/dscr/dscr.h
+++ b/tools/testing/selftests/powerpc/dscr/dscr.h
@@ -65,26 +65,21 @@ inline void set_dscr_usr(unsigned long val)
unsigned long get_default_dscr(void)
{
int err;
- char buf[16] = {0};
unsigned long val;
- if ((err = read_file(DSCR_DEFAULT, buf, sizeof(buf) - 1, NULL))) {
+ if ((err = read_ulong(DSCR_DEFAULT, &val, 16))) {
fprintf(stderr, "get_default_dscr() read failed: %s\n", strerror(err));
exit(1);
}
- sscanf(buf, "%lx", &val);
return val;
}
void set_default_dscr(unsigned long val)
{
int err;
- char buf[16];
- sprintf(buf, "%lx\n", val);
-
- if ((err = write_file(DSCR_DEFAULT, buf, strlen(buf)))) {
+ if ((err = write_ulong(DSCR_DEFAULT, val, 16))) {
fprintf(stderr, "set_default_dscr() write failed: %s\n", strerror(err));
exit(1);
}
diff --git a/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c b/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c
index 310946262a24..3ac176888feb 100644
--- a/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c
+++ b/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c
@@ -12,15 +12,15 @@
static int check_cpu_dscr_default(char *file, unsigned long val)
{
- char buf[10] = {0};
- int rc;
+ unsigned long cpu_dscr;
+ int err;
- if ((rc = read_file(file, buf, sizeof(buf) - 1, NULL)))
- return rc;
+ if ((err = read_ulong(file, &cpu_dscr, 16)))
+ return err;
- if (strtol(buf, NULL, 16) != val) {
+ if (cpu_dscr != val) {
printf("DSCR match failed: %ld (system) %ld (cpu)\n",
- val, strtol(buf, NULL, 16));
+ val, cpu_dscr);
return 1;
}
return 0;
diff --git a/tools/testing/selftests/powerpc/include/utils.h b/tools/testing/selftests/powerpc/include/utils.h
index b82e143a07c6..044b0236df38 100644
--- a/tools/testing/selftests/powerpc/include/utils.h
+++ b/tools/testing/selftests/powerpc/include/utils.h
@@ -40,6 +40,10 @@ int parse_ulong(const char *buffer, size_t count, unsigned long *result, int bas
int read_file(const char *path, char *buf, size_t count, size_t *len);
int write_file(const char *path, const char *buf, size_t count);
+int read_long(const char *path, long *result, int base);
+int write_long(const char *path, long result, int base);
+int read_ulong(const char *path, unsigned long *result, int base);
+int write_ulong(const char *path, unsigned long result, int base);
int read_debugfs_file(const char *debugfs_file, char *buf, size_t count);
int write_debugfs_file(const char *debugfs_file, const char *buf, size_t count);
int read_debugfs_int(const char *debugfs_file, int *result);
diff --git a/tools/testing/selftests/powerpc/pmu/lib.c b/tools/testing/selftests/powerpc/pmu/lib.c
index 771658278f55..55481c5b6995 100644
--- a/tools/testing/selftests/powerpc/pmu/lib.c
+++ b/tools/testing/selftests/powerpc/pmu/lib.c
@@ -192,16 +192,9 @@ bool require_paranoia_below(int level)
{
int err;
long current;
- char buf[16] = {0};
- char *end;
- if ((err = read_file(PARANOID_PATH, buf, sizeof(buf) - 1, NULL))) {
- printf("Couldn't read " PARANOID_PATH "?\n");
- return false;
- }
-
- if ((err = parse_long(buf, sizeof(buf), ¤t, 10))) {
- printf("Couldn't parse " PARANOID_PATH "?\n");
+ if ((err = read_long(PARANOID_PATH, ¤t, 10))) {
+ fprintf(stderr, "Couldn't read " PARANOID_PATH ": %s\n", strerror(err));
return false;
}
diff --git a/tools/testing/selftests/powerpc/utils.c b/tools/testing/selftests/powerpc/utils.c
index 7c7d8aaa69fb..32a96c8967ac 100644
--- a/tools/testing/selftests/powerpc/utils.c
+++ b/tools/testing/selftests/powerpc/utils.c
@@ -162,6 +162,68 @@ define_parse_number(parse_long, long, intmax_t);
define_parse_number(parse_uint, unsigned int, uintmax_t);
define_parse_number(parse_ulong, unsigned long, uintmax_t);
+int read_long(const char *path, long *result, int base)
+{
+ int err;
+ char buffer[32] = {0};
+
+ if ((err = read_file(path, buffer, sizeof(buffer) - 1, NULL)))
+ return err;
+
+ return parse_long(buffer, sizeof(buffer), result, base);
+}
+
+int read_ulong(const char *path, unsigned long *result, int base)
+{
+ int err;
+ char buffer[32] = {0};
+
+ if ((err = read_file(path, buffer, sizeof(buffer) - 1, NULL)))
+ return err;
+
+ return parse_ulong(buffer, sizeof(buffer), result, base);
+}
+
+int write_long(const char *path, long result, int base)
+{
+ int len;
+ char buffer[32];
+
+ /* Decimal only; we don't have a format specifier for signed hex values */
+ if (base != 10)
+ return EINVAL;
+
+ len = snprintf(buffer, sizeof(buffer), "%ld", result);
+ if (len < 0 || len >= sizeof(buffer))
+ return EOVERFLOW;
+
+ return write_file(path, buffer, len);
+}
+
+int write_ulong(const char *path, unsigned long result, int base)
+{
+ int len;
+ char buffer[32];
+ char *fmt;
+
+ switch (base) {
+ case 10:
+ fmt = "%lu";
+ break;
+ case 16:
+ fmt = "%lx";
+ break;
+ default:
+ return EINVAL;
+ }
+
+ len = snprintf(buffer, sizeof(buffer), fmt, result);
+ if (len < 0 || len >= sizeof(buffer))
+ return -1;
+
+ return write_file(path, buffer, len);
+}
+
void *find_auxv_entry(int type, char *auxv)
{
ElfW(auxv_t) *p;
--
2.38.1
next prev parent reply other threads:[~2022-11-22 23:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-22 23:10 [PATCH v2 0/7] Expand selftest utils Benjamin Gray
2022-11-22 23:10 ` [PATCH v2 1/7] selftests/powerpc: Use mfspr/mtspr macros Benjamin Gray
2022-11-25 1:12 ` Andrew Donnellan
2022-11-22 23:10 ` [PATCH v2 2/7] selftests/powerpc: Add ptrace setup_core_pattern() null-terminator Benjamin Gray
2022-11-22 23:10 ` [PATCH v2 3/7] selftests/powerpc: Add generic read/write file util Benjamin Gray
2022-11-22 23:11 ` [PATCH v2 4/7] selftests/powerpc: Add read/write debugfs file, int Benjamin Gray
2022-11-22 23:11 ` [PATCH v2 5/7] selftests/powerpc: Parse long/unsigned long value safely Benjamin Gray
2022-11-22 23:11 ` Benjamin Gray [this message]
2022-11-22 23:11 ` [PATCH v2 7/7] selftests/powerpc: Add automatically allocating read_file Benjamin Gray
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=20221122231103.15829-7-bgray@linux.ibm.com \
--to=bgray@linux.ibm.com \
--cc=ajd@linux.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
/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).