Skip to content

Commit

Permalink
selftests/powerpc: Add read/write debugfs file, int
Browse files Browse the repository at this point in the history 
Debugfs files are not always integers, so make *_file return/write a
byte buffer, and *_int deal with int values specifically. This increases
consistency with the other file read/write helpers.

Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230203003947.38033-3-bgray@linux.ibm.com
  • Loading branch information
Benjamin Gray authored and Michael Ellerman committed Feb 9, 2023
1 parent a974f0c commit 121d340
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 35 deletions.
6 changes: 4 additions & 2 deletions tools/testing/selftests/powerpc/include/utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ int pick_online_cpu(void);

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_debugfs_file(char *debugfs_file, int *result);
int write_debugfs_file(char *debugfs_file, int result);
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);
int write_debugfs_int(const char *debugfs_file, int result);
int read_sysfs_file(char *debugfs_file, char *result, size_t result_size);
int perf_event_open_counter(unsigned int type,
unsigned long config, int group_fd);
Expand Down
12 changes: 6 additions & 6 deletions tools/testing/selftests/powerpc/security/entry_flush.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ int entry_flush_test(void)
// The PMU event we use only works on Power7 or later
SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_06));

if (read_debugfs_file("powerpc/rfi_flush", &rfi_flush_orig) < 0) {
if (read_debugfs_int("powerpc/rfi_flush", &rfi_flush_orig) < 0) {
perror("Unable to read powerpc/rfi_flush debugfs file");
SKIP_IF(1);
}

if (read_debugfs_file("powerpc/entry_flush", &entry_flush_orig) < 0) {
if (read_debugfs_int("powerpc/entry_flush", &entry_flush_orig) < 0) {
perror("Unable to read powerpc/entry_flush debugfs file");
SKIP_IF(1);
}

if (rfi_flush_orig != 0) {
if (write_debugfs_file("powerpc/rfi_flush", 0) < 0) {
if (write_debugfs_int("powerpc/rfi_flush", 0) < 0) {
perror("error writing to powerpc/rfi_flush debugfs file");
FAIL_IF(1);
}
Expand Down Expand Up @@ -105,7 +105,7 @@ int entry_flush_test(void)

if (entry_flush == entry_flush_orig) {
entry_flush = !entry_flush_orig;
if (write_debugfs_file("powerpc/entry_flush", entry_flush) < 0) {
if (write_debugfs_int("powerpc/entry_flush", entry_flush) < 0) {
perror("error writing to powerpc/entry_flush debugfs file");
return 1;
}
Expand All @@ -120,12 +120,12 @@ int entry_flush_test(void)

set_dscr(0);

if (write_debugfs_file("powerpc/rfi_flush", rfi_flush_orig) < 0) {
if (write_debugfs_int("powerpc/rfi_flush", rfi_flush_orig) < 0) {
perror("unable to restore original value of powerpc/rfi_flush debugfs file");
return 1;
}

if (write_debugfs_file("powerpc/entry_flush", entry_flush_orig) < 0) {
if (write_debugfs_int("powerpc/entry_flush", entry_flush_orig) < 0) {
perror("unable to restore original value of powerpc/entry_flush debugfs file");
return 1;
}
Expand Down
12 changes: 6 additions & 6 deletions tools/testing/selftests/powerpc/security/rfi_flush.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ int rfi_flush_test(void)
// The PMU event we use only works on Power7 or later
SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_06));

if (read_debugfs_file("powerpc/rfi_flush", &rfi_flush_orig) < 0) {
if (read_debugfs_int("powerpc/rfi_flush", &rfi_flush_orig) < 0) {
perror("Unable to read powerpc/rfi_flush debugfs file");
SKIP_IF(1);
}

if (read_debugfs_file("powerpc/entry_flush", &entry_flush_orig) < 0) {
if (read_debugfs_int("powerpc/entry_flush", &entry_flush_orig) < 0) {
have_entry_flush = 0;
} else {
have_entry_flush = 1;

if (entry_flush_orig != 0) {
if (write_debugfs_file("powerpc/entry_flush", 0) < 0) {
if (write_debugfs_int("powerpc/entry_flush", 0) < 0) {
perror("error writing to powerpc/entry_flush debugfs file");
return 1;
}
Expand Down Expand Up @@ -105,7 +105,7 @@ int rfi_flush_test(void)

if (rfi_flush == rfi_flush_orig) {
rfi_flush = !rfi_flush_orig;
if (write_debugfs_file("powerpc/rfi_flush", rfi_flush) < 0) {
if (write_debugfs_int("powerpc/rfi_flush", rfi_flush) < 0) {
perror("error writing to powerpc/rfi_flush debugfs file");
return 1;
}
Expand All @@ -120,13 +120,13 @@ int rfi_flush_test(void)

set_dscr(0);

if (write_debugfs_file("powerpc/rfi_flush", rfi_flush_orig) < 0) {
if (write_debugfs_int("powerpc/rfi_flush", rfi_flush_orig) < 0) {
perror("unable to restore original value of powerpc/rfi_flush debugfs file");
return 1;
}

if (have_entry_flush) {
if (write_debugfs_file("powerpc/entry_flush", entry_flush_orig) < 0) {
if (write_debugfs_int("powerpc/entry_flush", entry_flush_orig) < 0) {
perror("unable to restore original value of powerpc/entry_flush "
"debugfs file");
return 1;
Expand Down
18 changes: 9 additions & 9 deletions tools/testing/selftests/powerpc/security/uaccess_flush.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,30 @@ int uaccess_flush_test(void)
// The PMU event we use only works on Power7 or later
SKIP_IF(!have_hwcap(PPC_FEATURE_ARCH_2_06));

if (read_debugfs_file("powerpc/rfi_flush", &rfi_flush_orig) < 0) {
if (read_debugfs_int("powerpc/rfi_flush", &rfi_flush_orig) < 0) {
perror("Unable to read powerpc/rfi_flush debugfs file");
SKIP_IF(1);
}

if (read_debugfs_file("powerpc/entry_flush", &entry_flush_orig) < 0) {
if (read_debugfs_int("powerpc/entry_flush", &entry_flush_orig) < 0) {
perror("Unable to read powerpc/entry_flush debugfs file");
SKIP_IF(1);
}

if (read_debugfs_file("powerpc/uaccess_flush", &uaccess_flush_orig) < 0) {
if (read_debugfs_int("powerpc/uaccess_flush", &uaccess_flush_orig) < 0) {
perror("Unable to read powerpc/entry_flush debugfs file");
SKIP_IF(1);
}

if (rfi_flush_orig != 0) {
if (write_debugfs_file("powerpc/rfi_flush", 0) < 0) {
if (write_debugfs_int("powerpc/rfi_flush", 0) < 0) {
perror("error writing to powerpc/rfi_flush debugfs file");
FAIL_IF(1);
}
}

if (entry_flush_orig != 0) {
if (write_debugfs_file("powerpc/entry_flush", 0) < 0) {
if (write_debugfs_int("powerpc/entry_flush", 0) < 0) {
perror("error writing to powerpc/entry_flush debugfs file");
FAIL_IF(1);
}
Expand Down Expand Up @@ -119,7 +119,7 @@ int uaccess_flush_test(void)

if (uaccess_flush == uaccess_flush_orig) {
uaccess_flush = !uaccess_flush_orig;
if (write_debugfs_file("powerpc/uaccess_flush", uaccess_flush) < 0) {
if (write_debugfs_int("powerpc/uaccess_flush", uaccess_flush) < 0) {
perror("error writing to powerpc/uaccess_flush debugfs file");
return 1;
}
Expand All @@ -134,17 +134,17 @@ int uaccess_flush_test(void)

set_dscr(0);

if (write_debugfs_file("powerpc/rfi_flush", rfi_flush_orig) < 0) {
if (write_debugfs_int("powerpc/rfi_flush", rfi_flush_orig) < 0) {
perror("unable to restore original value of powerpc/rfi_flush debugfs file");
return 1;
}

if (write_debugfs_file("powerpc/entry_flush", entry_flush_orig) < 0) {
if (write_debugfs_int("powerpc/entry_flush", entry_flush_orig) < 0) {
perror("unable to restore original value of powerpc/entry_flush debugfs file");
return 1;
}

if (write_debugfs_file("powerpc/uaccess_flush", uaccess_flush_orig) < 0) {
if (write_debugfs_int("powerpc/uaccess_flush", uaccess_flush_orig) < 0) {
perror("unable to restore original value of powerpc/uaccess_flush debugfs file");
return 1;
}
Expand Down
34 changes: 22 additions & 12 deletions tools/testing/selftests/powerpc/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,24 @@ int read_auxv(char *buf, ssize_t buf_size)
return 0;
}

int read_debugfs_file(const char *subpath, char *buf, size_t count)
{
char path[PATH_MAX] = "/sys/kernel/debug/";

strncat(path, subpath, sizeof(path) - strlen(path) - 1);

return read_file(path, buf, count, NULL);
}

int write_debugfs_file(const char *subpath, const char *buf, size_t count)
{
char path[PATH_MAX] = "/sys/kernel/debug/";

strncat(path, subpath, sizeof(path) - strlen(path) - 1);

return write_file(path, buf, count);
}

void *find_auxv_entry(int type, char *auxv)
{
ElfW(auxv_t) *p;
Expand Down Expand Up @@ -197,16 +215,12 @@ int read_sysfs_file(char *fpath, char *result, size_t result_size)
return read_file(path, result, result_size, NULL);
}

int read_debugfs_file(char *debugfs_file, int *result)
int read_debugfs_int(const char *debugfs_file, int *result)
{
int err;
char path[PATH_MAX];
char value[16] = {0};

strcpy(path, "/sys/kernel/debug/");
strncat(path, debugfs_file, PATH_MAX - strlen(path) - 1);

err = read_file(path, value, sizeof(value) - 1, NULL);
err = read_debugfs_file(debugfs_file, value, sizeof(value) - 1);
if (err)
return err;

Expand All @@ -215,17 +229,13 @@ int read_debugfs_file(char *debugfs_file, int *result)
return 0;
}

int write_debugfs_file(char *debugfs_file, int result)
int write_debugfs_int(const char *debugfs_file, int result)
{
char path[PATH_MAX];
char value[16];

strcpy(path, "/sys/kernel/debug/");
strncat(path, debugfs_file, PATH_MAX - strlen(path) - 1);

snprintf(value, 16, "%d", result);

return write_file(path, value, strlen(value));
return write_debugfs_file(debugfs_file, value, strlen(value));
}

static long perf_event_open(struct perf_event_attr *hw_event, pid_t pid,
Expand Down

0 comments on commit 121d340

Please sign in to comment.