From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD502C5B549 for ; Wed, 4 Jun 2025 23:12:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EEFA6B0153; Wed, 4 Jun 2025 19:12:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 69E556B0156; Wed, 4 Jun 2025 19:12:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 566996B0289; Wed, 4 Jun 2025 19:12:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 2EA766B0153 for ; Wed, 4 Jun 2025 19:12:24 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id DE6E1EE2CA for ; Wed, 4 Jun 2025 23:12:23 +0000 (UTC) X-FDA: 83519268966.01.BD4AD3A Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf30.hostedemail.com (Postfix) with ESMTP id 1B14C80008 for ; Wed, 4 Jun 2025 23:12:21 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="HuLwQ/wp"; spf=pass (imf30.hostedemail.com: domain of 31NJAaAYKCMU352pymrzzrwp.nzxwty58-xxv6lnv.z2r@flex--surenb.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=31NJAaAYKCMU352pymrzzrwp.nzxwty58-xxv6lnv.z2r@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749078742; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=uX7f/oYi039hOEGUuQCFp5nsI+yVset2xzObgJBZfGE=; b=gY3wc8iCgmtYlfA11i7MnpFgfiM9vlabbOvB6axh7wKEjP8tbOWQTHVBp55Z0LQo19Cnet JTg1+VrLj3Wr2SUcKMKe+gRnI1ubwt0yeqX1TN4UVF9ogkO79Qg5ErooYss1TtdZVWsidX YwuLAlT0+MBttuRITJiHSFig+Ei1548= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="HuLwQ/wp"; spf=pass (imf30.hostedemail.com: domain of 31NJAaAYKCMU352pymrzzrwp.nzxwty58-xxv6lnv.z2r@flex--surenb.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=31NJAaAYKCMU352pymrzzrwp.nzxwty58-xxv6lnv.z2r@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749078742; a=rsa-sha256; cv=none; b=fT0tzyQsIjlSpgzMNfyQJfia2zB4pRmcrqn5/R4ZmH9nEgKLRWto5UwGQVJPVWEIA8Zy2z K3hb9XfF3OxizA59c0WgGNlRDzaIhhrD0OAP4SGrRxoQ8WETbdHhlpV70EcEL3rQeWrehU b82SeWCTofYxC6RtoMrUyUmxZEbYR0o= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3113a29e1fdso449320a91.3 for ; Wed, 04 Jun 2025 16:12:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749078741; x=1749683541; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=uX7f/oYi039hOEGUuQCFp5nsI+yVset2xzObgJBZfGE=; b=HuLwQ/wpNS/3O+HKqi0CT3Az+8RxY56Oq/MqsLkeiObngzCGfqXcgm2KaFDiZtSfjo 9GLbEWeXTWUdpxV3w6VOvZEaNqQleOvAJuOBrNxb5UftShiWRSnPz5X7aPcfKHLKPbTR r0yBN6G7T2fDu0WP9ELyTH+cp4T2FAfxScwZJVvEF6Nbotg5P0as3EVBM7IDkkZn41a8 WAFJ/UM1HTiMF3+lrjtTq4/Gb5OEDJ3ElIiL+kq7j+qZdQVmFwB8Mv2k03vDokuip858 IHkrTFrd/HA+BX0AqirjSX1U+0TDiwq+wdD28oo8jZrboA4wnzNdBxTPuCyVk/NuYiyj BIow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749078741; x=1749683541; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uX7f/oYi039hOEGUuQCFp5nsI+yVset2xzObgJBZfGE=; b=LjWNGHZL7waNyglkHatpSisPbFdhQnbPXeTvAAOhfSy/vEetkCssYsEWl8VLHaZqUd v4vkN0+2HTNagJzJSwX3a8OpvfYNOkYRKMTu7sdAf143bfPbyh5PfvlJR6NLRi06lSk3 d1Z1xMXZqPjN4ZPO+NXBEd4BtyFcdbsllWH+oruGWfdbmsrkSaiteNV1FUAaaQR/yxle 6BmF/HknhZkOIXaan5szRTo+Vt9kP41tkVAHiTERg3MEttXbmDfeDza9sUGStB+eq+3D 8f+LGTHxbvO1M5qb8e+u4TiZfD1llQioDAc4NysYTU/Gwa/8aB956T+n8MGRzK9LiIHm yp7Q== X-Forwarded-Encrypted: i=1; AJvYcCUHEA9MZD0Te/MHKtE+Zd19cysH+dXZ564Jm2Rtgd56vvGD1imQiVgMy1Q696YX2J8XBIGaXC05SQ==@kvack.org X-Gm-Message-State: AOJu0YyyKra9yD7BU3Jd+D60ZS9D4ZuvMNgDXIFX7M59AOXzEHZ8h4NK P98QDAUlF1aOZ7XF/hi00a3Eby77FicJR/7HRnuvrJ70d9uy9lGyUl1q8OABneqpQScaqtnvJOw rXq8N+g== X-Google-Smtp-Source: AGHT+IEvOm4giMwyQY/nBon3zP7C1/mYlQqoAkTz9AmnFoIjTjGx4SJrzcD+9iyAMTj1D4aadzcKOMv8LOo= X-Received: from pjbsi6.prod.google.com ([2002:a17:90b:5286:b0:2e0:915d:d594]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:4cc4:b0:313:14b5:2532 with SMTP id 98e67ed59e1d1-31314b5327fmr3503349a91.34.1749078740989; Wed, 04 Jun 2025 16:12:20 -0700 (PDT) Date: Wed, 4 Jun 2025 16:11:49 -0700 In-Reply-To: <20250604231151.799834-1-surenb@google.com> Mime-Version: 1.0 References: <20250604231151.799834-1-surenb@google.com> X-Mailer: git-send-email 2.49.0.1266.g31b7d2e469-goog Message-ID: <20250604231151.799834-6-surenb@google.com> Subject: [PATCH v4 5/7] selftests/proc: add verbose more for tests to facilitate debugging From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, david@redhat.com, vbabka@suse.cz, peterx@redhat.com, jannh@google.com, hannes@cmpxchg.org, mhocko@kernel.org, paulmck@kernel.org, shuah@kernel.org, adobriyan@gmail.com, brauner@kernel.org, josef@toxicpanda.com, yebin10@huawei.com, linux@weissschuh.net, willy@infradead.org, osalvador@suse.de, andrii@kernel.org, ryan.roberts@arm.com, christophe.leroy@csgroup.eu, tjmercier@google.com, kaleshsingh@google.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, surenb@google.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 1B14C80008 X-Stat-Signature: pi8k59i3okxmz7nqr4xfj8r96dkxipq8 X-Rspam-User: X-HE-Tag: 1749078741-876458 X-HE-Meta: U2FsdGVkX1+v1e8KwXpwl3IFC3ouRXULJgbhGM7xsA9dNuaV7E6JX6Yvg6T5CfGKJ99u6kTcnUG9whonFC9zUtmkCU/Gh1uL0Y8HjmF5HUZWlHQPJcizNgrLDYUOlTEuUHA/ov/RD2u7wwYKp3xPcxxz01wPDVtbxY0uhkaueMo1w9QuBZ21FjzZzIFp9FllKIrauTHvUaMyV/a+gNpwb6hoDVrvMNgr717zzs2mvXdBzRTaX8FkVJtcBDso2nANdXBNabkgT8vqoZcO9aFegssjndF/YNQt6DuXDYPswWu///VNLdvrWVIgQJhynSAkd6kapheJvzuQ+utFVq13bstdPBKh2N2ZLC0byAIgDF3lrtJQX+epI3ntuJ4LmV926itfY9UyKIk4hzAr2ApSvLnjrSNj1+r8O4WjW+WbMlGPcWsJSCOxBZRJF6/XrUXwp6zWpzkge4TmmyhbsdCqYVxyumj6xOPuLZ6Tjg5MjbhJDMxEmgiw/vUEYrlfqqoFhx5RF4NUKb2S8djlYCJ1PZ9M8rkykwMMmzljCrqwOAgskTU3e8c7vXEDc20ymFkXw6lv+jP+a/X9v6lgZPV3sPzepEaH5DDikgDsCs2Inw7e4EIrLOcCzWSzZjYCfCUzqqjUaFZZYJlhcLxrWoO8iO5hZKraX3v+TSr0/vtl+jkdHQF6BvPWErVA8hoONaToDObROJ7RIBcTgJhjcuSj6infbAUFEi5cvjoNVUVj9AvrDL+agktU0n8qAXqUtOrZqkU4dIRBU+MvDf8AkcdT/3E1kt211HLYUWRc1aTftMChFmj2V+WIVLw4UJxhjCOT70XdbzF/orYdIZDTvclv86nsXiLqYYeA/ZMvSgEJPuLqTF0bR1NnpBmdr38i74B9CtCo4aemsabWIvfmgkBpFUoi+lMcRArm3Vzbb8TytfR14gXER8zKyjLkslO931PhxOzINRUw4rI1oOVL4KH v9oPYlIJ QxYpekqs+RmFIalCuK586To5K6TR1Oa/NmeJiPKbz7UDiU5jFPexcaFhlZ2NR7e91UCmH988v2M7784nB921+gxEYAzKOo8ca8RcuPSbvK7YiaXX1x/W4DYs790LYj0K/GmtOYviRExUZw79C3oc9s9vElBP8NHmRyC9CZFn93KKzQHgVB0HxpsfU3ktQyyd3IyDB1HSbyfs6mA0+/X1d+HG//FiHPK3Ta+uRO6A8QgPTXMWXAAbrwOkxSoQbHyYtuJsFBwtMVcACuNI8CAeF1R2Z7yhZ1XZZniDhS5uKrJP4YRRGF9J3l/6i5wwbNZPYVksAk199gZIQxeEohGviwURJDMOW9HA1127bgGdHqWK1A5E1w7sdicME/ekRdfy3+xABbfPvCpoYEP3DlZtl1BL0TLY3iGRTi2rcBVPzgacwfob9Ylp5itRwM8aXxNjBQdk18UoMKoLZBnZWpPHvQU2RDkAdDIv7AB8CEaolT4UBLezWkPNJl/s5IWvyelMEFtj2+QYZgWIDJl3/7cyv3xrLJAAG/ipPD7vKgROOpP4q2FE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add verbose mode to the proc tests to print debugging information. Usage: proc-pid-vm -v Signed-off-by: Suren Baghdasaryan --- 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