Add verbose mode to the proc tests to print debugging information.
Usage: proc-pid-vm -v
Signed-off-by: Suren Baghdasaryan <sur...@google.com>
---
tools/testing/selftests/proc/proc-pid-vm.c | 154 +++++++++++++++++++--
1 file changed, 141 insertions(+), 13 deletions(-)
diff --git a/tools/testing/selftests/proc/proc-pid-vm.c
b/tools/testing/selftests/proc/proc-pid-vm.c
index b582f40851fb..97017f48cd70 100644
--- a/tools/testing/selftests/proc/proc-pid-vm.c
+++ b/tools/testing/selftests/proc/proc-pid-vm.c
@@ -73,6 +73,7 @@ static void make_private_tmp(void)
}
static unsigned long test_duration_sec = 5UL;
+static bool verbose;
static int page_size;
static pid_t pid = -1;
static void ate(void)
@@ -452,6 +453,99 @@ static void stop_vma_modifier(struct vma_modifier_info
*mod_info)
signal_state(mod_info, SETUP_MODIFY_MAPS);
}
+static void print_first_lines(char *text, int nr)
+{
+ const char *end = text;
+
+ while (nr && (end = strchr(end, '\n')) != NULL) {
+ nr--;
+ end++;
+ }
+
+ if (end) {
+ int offs = end - text;
+
+ text[offs] = '\0';
+ printf(text);
+ text[offs] = '\n';
+ printf("\n");
+ } else {
+ printf(text);
+ }
+}
+
+static void print_last_lines(char *text, int nr)
+{
+ const char *start = text + strlen(text);
+
+ nr++; /* to ignore the last newline */
+ while (nr) {
+ while (start > text && *start != '\n')
+ start--;
+ nr--;
+ start--;
+ }
+ printf(start);
+}
+
+static void print_boundaries(const char *title,
+ struct page_content *page1,
+ struct page_content *page2)
+{
+ if (!verbose)
+ return;
+
+ printf("%s", title);
+ /* Print 3 boundary lines from each page */
+ print_last_lines(page1->data, 3);
+ printf("-----------------page boundary-----------------\n");
+ print_first_lines(page2->data, 3);
+}
+
+static bool print_boundaries_on(bool condition, const char *title,
+ struct page_content *page1,
+ struct page_content *page2)
+{
+ if (verbose && condition)
+ print_boundaries(title, page1, page2);
+
+ return condition;
+}
+
+static void report_test_start(const char *name)
+{
+ if (verbose)
+ printf("==== %s ====\n", name);
+}
+
+static struct timespec print_ts;
+
+static void start_test_loop(struct timespec *ts)
+{
+ if (verbose)
+ print_ts.tv_sec = ts->tv_sec;
+}
+
+static void end_test_iteration(struct timespec *ts)
+{
+ if (!verbose)
+ return;
+
+ /* Update every second */
+ if (print_ts.tv_sec == ts->tv_sec)
+ return;
+
+ printf(".");
+ fflush(stdout);
+ print_ts.tv_sec = ts->tv_sec;
+}
+
+static void end_test_loop(void)
+{
+ if (verbose)
+ printf("\n");
+}
+
static void capture_mod_pattern(int maps_fd,
struct vma_modifier_info *mod_info,
struct page_content *page1,
@@ -463,18 +557,24 @@ static void capture_mod_pattern(int maps_fd,
struct line_content *restored_last_line,
struct line_content *restored_first_line)
{
+ print_boundaries("Before modification", page1, page2);
+
signal_state(mod_info, SETUP_MODIFY_MAPS);
wait_for_state(mod_info, SETUP_MAPS_MODIFIED);
/* Copy last line of the first page and first line of the last page */
read_boundary_lines(maps_fd, page1, page2, mod_last_line,
mod_first_line);
+ print_boundaries("After modification", page1, page2);
+
signal_state(mod_info, SETUP_RESTORE_MAPS);
wait_for_state(mod_info, SETUP_MAPS_RESTORED);
/* Copy last line of the first page and first line of the last page */
read_boundary_lines(maps_fd, page1, page2, restored_last_line,
restored_first_line);
+ print_boundaries("After restore", page1, page2);
+
mod_info->vma_mod_check(mod_last_line, mod_first_line,
restored_last_line, restored_first_line);
@@ -546,6 +646,7 @@ static void test_maps_tearing_from_split(int maps_fd,
mod_info->vma_restore = merge_vma;
mod_info->vma_mod_check = check_split_result;
+ report_test_start("Tearing from split");
capture_mod_pattern(maps_fd, mod_info, page1, page2, last_line,
first_line,
&split_last_line, &split_first_line,
&restored_last_line, &restored_first_line);
@@ -558,6 +659,7 @@ static void test_maps_tearing_from_split(int maps_fd,
struct timespec start_ts, end_ts;
clock_gettime(CLOCK_MONOTONIC_COARSE, &start_ts);
+ start_test_loop(&start_ts);
do {
bool last_line_changed;
bool first_line_changed;
@@ -577,12 +679,17 @@ static void test_maps_tearing_from_split(int maps_fd,
* In that case new first line will be the same as the
* last restored line.
*/
- assert(!strcmp(new_first_line.text,
split_first_line.text) ||
- !strcmp(new_first_line.text,
restored_last_line.text));
+ assert(!print_boundaries_on(
+ strcmp(new_first_line.text,
split_first_line.text) &&
+ strcmp(new_first_line.text,
restored_last_line.text),
+ "Split result invalid", page1, page2));
+
} else {
/* The vmas should be consistent with merge results */
- assert(!strcmp(new_last_line.text,
restored_last_line.text) &&
- !strcmp(new_first_line.text,
restored_first_line.text));
+ assert(!print_boundaries_on(
+ strcmp(new_last_line.text,
restored_last_line.text) ||
+ strcmp(new_first_line.text,
restored_first_line.text),
+ "Merge result invalid", page1, page2));
}
/*
* First and last lines should change in unison. If the last
@@ -607,7 +714,9 @@ static void test_maps_tearing_from_split(int maps_fd,
vma_end == split_first_line.end_addr));
clock_gettime(CLOCK_MONOTONIC_COARSE, &end_ts);
+ end_test_iteration(&end_ts);
} while (end_ts.tv_sec - start_ts.tv_sec < test_duration_sec);
+ end_test_loop();
/* Signal the modifyer thread to stop and wait until it exits */
signal_state(mod_info, TEST_DONE);
@@ -654,6 +763,7 @@ static void test_maps_tearing_from_resize(int maps_fd,
mod_info->vma_restore = expand_vma;
mod_info->vma_mod_check = check_shrink_result;
+ report_test_start("Tearing from resize");
capture_mod_pattern(maps_fd, mod_info, page1, page2, last_line,
first_line,
&shrunk_last_line, &shrunk_first_line,
&restored_last_line, &restored_first_line);
@@ -666,6 +776,7 @@ static void test_maps_tearing_from_resize(int maps_fd,
struct timespec start_ts, end_ts;
clock_gettime(CLOCK_MONOTONIC_COARSE, &start_ts);
+ start_test_loop(&start_ts);
do {
unsigned long vma_start;
unsigned long vma_end;
@@ -682,12 +793,16 @@ static void test_maps_tearing_from_resize(int maps_fd,
* again. In that case new first line will be the same
* as the last restored line.
*/
- assert(!strcmp(new_first_line.text,
shrunk_first_line.text) ||
- !strcmp(new_first_line.text,
restored_last_line.text));
+ assert(!print_boundaries_on(
+ strcmp(new_first_line.text,
shrunk_first_line.text) &&
+ strcmp(new_first_line.text,
restored_last_line.text),
+ "Shrink result invalid", page1, page2));
} else {
/* The vmas should be consistent with the
original/resored state */
- assert(!strcmp(new_last_line.text,
restored_last_line.text) &&
- !strcmp(new_first_line.text,
restored_first_line.text));
+ assert(!print_boundaries_on(
+ strcmp(new_last_line.text,
restored_last_line.text) ||
+ strcmp(new_first_line.text,
restored_first_line.text),
+ "Expand result invalid", page1, page2));
}
/* Check if PROCMAP_QUERY ioclt() finds the right VMA */
@@ -701,7 +816,9 @@ static void test_maps_tearing_from_resize(int maps_fd,
vma_end - vma_start == page_size));
clock_gettime(CLOCK_MONOTONIC_COARSE, &end_ts);
+ end_test_iteration(&end_ts);
} while (end_ts.tv_sec - start_ts.tv_sec < test_duration_sec);
+ end_test_loop();
/* Signal the modifyer thread to stop and wait until it exits */
signal_state(mod_info, TEST_DONE);
@@ -757,6 +874,7 @@ static void test_maps_tearing_from_remap(int maps_fd,
mod_info->vma_restore = patch_vma;
mod_info->vma_mod_check = check_remap_result;
+ report_test_start("Tearing from remap");
capture_mod_pattern(maps_fd, mod_info, page1, page2, last_line,
first_line,
&remapped_last_line, &remapped_first_line,
&restored_last_line, &restored_first_line);
@@ -769,6 +887,7 @@ static void test_maps_tearing_from_remap(int maps_fd,
struct timespec start_ts, end_ts;
clock_gettime(CLOCK_MONOTONIC_COARSE, &start_ts);
+ start_test_loop(&start_ts);
do {
unsigned long vma_start;
unsigned long vma_end;
@@ -785,12 +904,16 @@ static void test_maps_tearing_from_remap(int maps_fd,
* again. In that case new first line will be the same
* as the last restored line.
*/
- assert(!strcmp(new_first_line.text,
remapped_first_line.text) ||
- !strcmp(new_first_line.text,
restored_last_line.text));
+ assert(!print_boundaries_on(
+ strcmp(new_first_line.text,
remapped_first_line.text) &&
+ strcmp(new_first_line.text,
restored_last_line.text),
+ "Remap result invalid", page1, page2));
} else {
/* The vmas should be consistent with the
original/resored state */
- assert(!strcmp(new_last_line.text,
restored_last_line.text) &&
- !strcmp(new_first_line.text,
restored_first_line.text));
+ assert(!print_boundaries_on(
+ strcmp(new_last_line.text,
restored_last_line.text) ||
+ strcmp(new_first_line.text,
restored_first_line.text),
+ "Remap restore result invalid", page1,
page2));
}
/* Check if PROCMAP_QUERY ioclt() finds the right VMA */
@@ -806,7 +929,9 @@ static void test_maps_tearing_from_remap(int maps_fd,
vma_end - vma_start == page_size));
clock_gettime(CLOCK_MONOTONIC_COARSE, &end_ts);
+ end_test_iteration(&end_ts);
} while (end_ts.tv_sec - start_ts.tv_sec < test_duration_sec);
+ end_test_loop();
/* Signal the modifyer thread to stop and wait until it exits */
signal_state(mod_info, TEST_DONE);
@@ -927,6 +1052,7 @@ int usage(void)
{
fprintf(stderr, "Userland /proc/pid/{s}maps test cases\n");
fprintf(stderr, " -d: Duration for time-consuming tests\n");
+ fprintf(stderr, " -v: Verbose mode\n");
fprintf(stderr, " -h: Help screen\n");
exit(-1);
}
@@ -937,9 +1063,11 @@ int main(int argc, char **argv)
int exec_fd;
int opt;
- while ((opt = getopt(argc, argv, "d:h")) != -1) {
+ while ((opt = getopt(argc, argv, "d:vh")) != -1) {
if (opt == 'd')
test_duration_sec = strtoul(optarg, NULL, 0);
+ else if (opt == 'v')
+ verbose = true;
else if (opt == 'h')
usage();
}
--
2.49.0.1266.g31b7d2e469-goog
