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 29C29C77B7F for ; Tue, 24 Jun 2025 19:34:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 990016B00B6; Tue, 24 Jun 2025 15:34:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 940AF6B00B7; Tue, 24 Jun 2025 15:34:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80A416B00B8; Tue, 24 Jun 2025 15:34:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 695896B00B6 for ; Tue, 24 Jun 2025 15:34:16 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3EB61105B93 for ; Tue, 24 Jun 2025 19:34:16 +0000 (UTC) X-FDA: 83591295312.02.E1AFB20 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf01.hostedemail.com (Postfix) with ESMTP id 674D240003 for ; Tue, 24 Jun 2025 19:34:14 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="z6/HaoWq"; spf=pass (imf01.hostedemail.com: domain of 3tf1aaAYKCGYWYVIRFKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--surenb.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3tf1aaAYKCGYWYVIRFKSSKPI.GSQPMRYb-QQOZEGO.SVK@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=1750793654; 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=5L5H3FNoajNf/UELmS1eaZLiPr7GIJ0ppwDkwKzX2RM=; b=IPcxfhw8iNhkwoci8O2kNiy7TZM7TA0KKPufbfvtwUVALQJ9Hpfl/nM6hFGnf2K4bCiv09 a6SUXHW7LN5fFK1KW8D0F4qLRwIlIsRKFXuYUSQiVkBinNVzO7H76cHMjOiQ+oOFjzfkoB adVk+1uyB/QaiQUpJ4EllLRRiH+k5Ok= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750793654; a=rsa-sha256; cv=none; b=6HwavGEpaQwtU6an1ZRJ1NCk6KeRKuFx5f0QL0cJz85D3P8uVtt4bmeApHY3nqMwCZ4qvF PfQ/Ajs4DsSHPGDrCDcWnM6eYxY929L8lJLI93Oh3OqKiD5rUmVFI118O2hS8BLf5PNTcB z5kLCUdtl1/RY/p61lRKKOt/SuMsxLo= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="z6/HaoWq"; spf=pass (imf01.hostedemail.com: domain of 3tf1aaAYKCGYWYVIRFKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--surenb.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3tf1aaAYKCGYWYVIRFKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-311ef4fb5eeso142128a91.1 for ; Tue, 24 Jun 2025 12:34:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1750793653; x=1751398453; 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=5L5H3FNoajNf/UELmS1eaZLiPr7GIJ0ppwDkwKzX2RM=; b=z6/HaoWqgP2fjChG+yT9FyoOnIIHdRFZmtbKSBS6yEq7fn+oCPQoH4AHMARh0FdnOr RuQNVsUR16zIzD4R306BM1ujxk3xs77D0b+gMN9l+0nXBFirsbrLkWnZ6tqkvqNNkeWi sj0BbfW7NWRW48FUXSU+Q9D4MsZL7WqI/X+zaR2+ZDG0k2DBaqsKFp2/DJeuqf4yNmIi KgfLe9es1vLpNKNfT5RZOqxeIDdoPstWmO+Dzq30/Wdm4Rg+WcgUhpiS94OfjHu5c9Gi +pIBt2kuhHj9B3rp9kI6ZaJfMJW1CATOjQ1HGCdh8Tbj+rbj/2K/6aEvFgar1Zerho2L xoig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750793653; x=1751398453; 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=5L5H3FNoajNf/UELmS1eaZLiPr7GIJ0ppwDkwKzX2RM=; b=VdgQZsvtg5kY+YA40vM37kbVWkeybsGuRNfnL7wg5o3soZ1UWLwbWfMFpvXMU1ylUA ThA+GD5TgEUhk244og0SYKN/CPPk/DCap5ozLWSns3FzH1VZNELnxyR4PFvhY1IlyxEA rH54ponKsdw3BYCIAcyY4BtHtP+vBV9H+KNti/WzOolJqsFvbjbTmzC0gTIBNgYGcdQf Ix1ba05DNRKXQbKJypq95TQ3ZA6Y55q6HRamxO8xNUF3XVEM2cMKTg0sFiubBA7/WK+l yESyP3I9c33QlhbauCdcub7T8bNPXvpSykOVpMol/gUrkMgQ33N+TPkJ/Dr8XZTU+PHn S2NQ== X-Forwarded-Encrypted: i=1; AJvYcCUQQPGtHxw711RbTKre7mDeLQ+T3FMUy44kBDpk2eyrcUZSzOm9CiNaQahVeTV4Ulj19IhF8zJb/w==@kvack.org X-Gm-Message-State: AOJu0YyhjQKV+zphSi5jcgxDtkkQ0P90z6jMx2fjzqrTz+FSGh867T6H VskcpEgkMN8RPpORNp8NVG66wduMFABjqsdLT5PJEgl2/DNLDTb++1hf/Si++s8kp2E1Nxe9oQ6 HcSAglg== X-Google-Smtp-Source: AGHT+IGv6JeXyWyTe30WOyPpkx12eoNk+GrPmkwRBZ04YyBIZv26IDRNFd+s3FgwEXmVVNDLoZsKfuuItlg= X-Received: from pjq6.prod.google.com ([2002:a17:90b:5606:b0:313:285a:5547]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1f8d:b0:30a:9feb:1e15 with SMTP id 98e67ed59e1d1-315ccc4da71mr7233133a91.8.1750793653167; Tue, 24 Jun 2025 12:34:13 -0700 (PDT) Date: Tue, 24 Jun 2025 12:33:57 -0700 In-Reply-To: <20250624193359.3865351-1-surenb@google.com> Mime-Version: 1.0 References: <20250624193359.3865351-1-surenb@google.com> X-Mailer: git-send-email 2.50.0.714.g196bf9f422-goog Message-ID: <20250624193359.3865351-6-surenb@google.com> Subject: [PATCH v5 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-Queue-Id: 674D240003 X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: 557716tgeibtsjptwdrk3qw3kxcmo1yq X-HE-Tag: 1750793654-602125 X-HE-Meta: U2FsdGVkX1/gsreIZ2dATCfdvuQdttG6zZbjG4PYSuLdLjsg5Zr7E//E9xmbFN21lgRvpDq692ayd6xsAQpHJJPd+rEkkZEBXaE9Ca4qecnPzovDhBCnXc2ReS9ol66/4AWxL8B2bwuggGrTx6L+oRpoy5hV+xsfEQHl0eL1VKnSNx0KN1z0RuC1wNR8qlgzH1+n0euXYZzcJLJ21VnsCpZ1cIlWkHW3OybX9aWhHrJmB6QSHfn3T59BuweRfrSheeMPdYDm5/t0rche/kgIgfu7LVZrQ/8TWtFY0ktTQ5kngzMSFfxCtzEgS1WViJVv4yvHG8ivyFMy4rZefWPC0c1bIT6dWatPF45jhlV1Xpyr5T8JYotDsUgX5u2OXxqJWj8LJUlyu6DoyWsPCgf7hoeMvNfeTG4+Ju3I2Lu7bMlj6GuYtamLwrRTJrjOgJ1ss80rYnG5gTO1jsQXkHR9Pstp6GL3MMqTfgAxUyGErh5QYjlbXBcyhysKIgZO9mYwUj9SmJ+Avfg+q6v4kmpKNNTtdhazlTTiA4kNxvGqmeBnJSC8V5CkWBgDPyZSAGrFsIuIuA+3iaLxdmmzu+jvPvsMO2OrMEBbcB3yctX0rc2gxWnNGDnyma81+FHVdEO7MBwCtjnHzt4sOdCkvWZ9hLcsaYkJ9o7tYgWaHqjMng5HxyjmJiRT6SySOWBtStId9DLZT2QAkBS196rl1hmJuPcw46eDZkWECrl483iSZ8ZwbGLU4g3+UOkbcs54mfziq58aekZNMZfnEw23fDPmhCnT+QJe5u7jZb+tj2kAsfLbv1OOUNYWRJTAlHe9JgD6P9jIbivB4gGSe1Fv/jvZDnq6rCNEdkX/CityjU6coRSoZQ7NrIGASLEKgG4dRiFwbhkAyPovxG3+kQPbv4BHCez/qpip8P2DkvsRRyzV9nDuknSUOkA9q1RM6t9H6asMl3TWR9HGx5xePAV+ohN nYA3yBS/ RD7A9eVzwTYXR6fwSAhg8CtvkVPJF7E0eX3qeuj3e+4wfHApqqlJBU2wt4BMSA70HdfNhQ/Sw1IgSl/mkkYMYb/7ZPT7+/rMjM1G0gcCb5P4+uFOnKpJqG3k8HfNO45iYUF2dYoLhGGkBo/IIUbUHo+RO1PQrc/qNyM3HJ12wPFbuoJjRSoo/DEKYIINHcoYIdTWb8W7oPLaGw/ZBQxYv0TaOLdhvYk1SoWIU3GcUPwjwSi9uOoEjMWX+byiMpZnR5jfTARgarqSVfIOxaS+JTzIuaHbDvEdKgUeEA40GC7ql30fPSQtGs+VeLmfkAc5VpNiXFPLlrs3y6KeBz0SDMF6JGHGXO0E543inGyPvadWJ+phHj8AadjUAD85kVnhgCoT2ECIGNr0/88NBwgeG8c9AJsSPm4kybTvr25jTVQV4raRb14JLxtrh6rw4jrXhK3FEBHhG83Fa7dzpvx3TUofeRbndPx4kKmdqzyjJEqrGswGb4tq0qpIxzoQpJpe5W+blmilVhyq/E0qUaftRccoTRksh6Pla6kdx 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.50.0.714.g196bf9f422-goog