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 2CB13C83030 for ; Fri, 4 Jul 2025 06:07:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 819656B00F7; Fri, 4 Jul 2025 02:07:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CB176B8008; Fri, 4 Jul 2025 02:07:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B9186B8007; Fri, 4 Jul 2025 02:07:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4FC6C6B00F7 for ; Fri, 4 Jul 2025 02:07:44 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0BCAAAAEC1 for ; Fri, 4 Jul 2025 06:07:44 +0000 (UTC) X-FDA: 83625550848.01.4293C1E Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by imf07.hostedemail.com (Postfix) with ESMTP id 3EA8840005 for ; Fri, 4 Jul 2025 06:07:42 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=zvY2aOsx; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of 3rW9naAYKCHQkmjWfTYggYdW.Ugedafmp-eecnSUc.gjY@flex--surenb.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=3rW9naAYKCHQkmjWfTYggYdW.Ugedafmp-eecnSUc.gjY@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751609262; a=rsa-sha256; cv=none; b=HYT/fNPd4K8OKiXgLgrOd45v8LQI3YPcp26Z+ede52wBgnYpU/clpeSW8/S8JuTgsz28iS L24sptqhiVsvHcVxpN1OkpWP8OTrKKMje6oF3JiZ/Qs91WY0NEBq8FjY43bb6L8uSpkHgw 7oAQ+PeqZcpkBdP1DtTcg4V8w/gmmys= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=zvY2aOsx; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of 3rW9naAYKCHQkmjWfTYggYdW.Ugedafmp-eecnSUc.gjY@flex--surenb.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=3rW9naAYKCHQkmjWfTYggYdW.Ugedafmp-eecnSUc.gjY@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751609262; 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=+EEGEPDve4y58hrdp46uj5UK2kmzvt0af85C6yPTlxY=; b=mivebI/Jm+QC6QqaJXXRvkf13KteQG1IZ3r+j69eUfHjnoL69opJy6vs2NrEArXc1EDarw WM5m/jgH1FsxFgk9kPbULSkuOkwtktTCxV97w1FXGfNvD/3mijnO58MN9za6CIEm5jVxpI oR4emHVzEqUKjiF+6JXdmUysvikBR+0= Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b31ca4b6a8eso398253a12.1 for ; Thu, 03 Jul 2025 23:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1751609261; x=1752214061; 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=+EEGEPDve4y58hrdp46uj5UK2kmzvt0af85C6yPTlxY=; b=zvY2aOsxVjZ2FRlJC1lSFgYw0Tjwks4eHAB0S1vqm4r5VEhkcaBM747snpmrRtiPU/ ByhZDAvZRvGDDx3GFJNco991lFL9+ocEEJ+8/n5zAorcLKxGk/B29LRYVzYr6tOwNywW 360gdeHpOpji7gDhDOsqzijeDUzFkiVt0/G6ZdHCjZTwkJCI1y8iNJ8raheHz6sZdDXr zFJc8nI5JXxMgt3eu5A0ZKNch7ZpXiLtL5+35XGBmMLlhcAAFl1r0bTcIsbkR5NJvY+x Uh0jtq4voKqMelzDsVKxlwROpMjmBDIuMh5jvgcqHptFtcJqPH6rH59GwPrzDoNvr5ut Kmkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751609261; x=1752214061; 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=+EEGEPDve4y58hrdp46uj5UK2kmzvt0af85C6yPTlxY=; b=oqN6yD7WEzunqTsKuzuMWsvjRl1qo/MvH7FQHQR1vZJfshhcM24ha+4hBQbmo48vx6 gnf3wD4/BSu6RX2+RsAxKpHjxY6IIusrhNZSZQdY8rPRQsNfnvNDjGH9UYpN5OzwJcCP bdj9egdmAbpZcq/5uMiKtAqzYktIm51gsRJ2LdkljkPc5nNjoLUnq8QehQ+ziB9+42Wa t3bI8nvKAyY8A9sn6zXZE6etEC4A0Fn2n0KZtA0zvFOxur2Yv4rNEUd/WCfRDj/2U8Xo grZl1F15YjQbMUD2j8NBkMNnaZxQWaapT2SrgaTsuid/yaqN9APS3pb19CMNesxV8fbr sMng== X-Forwarded-Encrypted: i=1; AJvYcCWpNDVwmVZMOslCle1Rtm1T5fejzg7VbqgZcLn1NpAhwsUF8Oh/B0KPlCMTmLUtqCVS8Yyxl+Qz9g==@kvack.org X-Gm-Message-State: AOJu0YzVm4tOF14Ii5Bj/yodPA/trz29LbHMQ+EYko5lq1NOXKHrd616 QuJjljMYtRJna4N98GFlx0Tj+rqU82vOCg1mn1RqcOuJpm9Gu8OJAQW2pwx5mpOovRORiJzjV5H M2jgWbA== X-Google-Smtp-Source: AGHT+IGwByjyjbWto9oY/VtnoR6krv+OKvQ79zjK0W0qyloVZR9Tx47plfk6bg9opHV46dxYuI5qPKfJ5JE= X-Received: from pgha7.prod.google.com ([2002:a63:d407:0:b0:b2c:3dd5:8139]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:c888:b0:21a:de8e:5e6d with SMTP id adf61e73a8af0-225be6e4963mr2470660637.8.1751609261073; Thu, 03 Jul 2025 23:07:41 -0700 (PDT) Date: Thu, 3 Jul 2025 23:07:23 -0700 In-Reply-To: <20250704060727.724817-1-surenb@google.com> Mime-Version: 1.0 References: <20250704060727.724817-1-surenb@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250704060727.724817-6-surenb@google.com> Subject: [PATCH v6 5/8] 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, aha310510@gmail.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: rspam04 X-Rspamd-Queue-Id: 3EA8840005 X-Stat-Signature: 14gf6t9gpeci7g6oiasmror785mcsp7e X-Rspam-User: X-HE-Tag: 1751609262-660251 X-HE-Meta: U2FsdGVkX1+sDxnzBSth+JE6b8EVNMEfzDUOW4DrlnM9RdUYBs/74rOpCOVfLDx5xLmTqUswC0RKAhhTzWe6hw2bgM/3JAtu3y7vSq1XrnYpFNNw5QxpC0K66FIrT4Yy8blUf2dDWoXmGQZ5ebMeqWFTEUq55Yng7DfUZm5C4HxQE1U/koAtA4YpIHNZhG848w19reMqckvQD7IwON38asx98Go5gxfU4QARGdKjFwUg+PcK004dVGEOPnDzdNqKlt+KUX2LNXZRpEeLcuwOFvGcPk4m/rSdStTJ27eMtmbqFNSvBmrHyxCqUcz+eWxrjOGiwz8i28a8/ZiwrC75mYIyRxrKG/WAYZPTC14wBKGgTZEs0qIcjt5GRrl41Xw/khoxFttRHMgDnON5IRg3He7bVNiEaW2Gn3QPlw0YHAFAteyyKsmxr1pqOLKATlOLrQiVDk22XHKNNU856KHXAnM4GGF92jnbHrRxMMru03YFK/ql52EsQPjUevGESc5GxPUuwmyUj1tGfQ3cpbgUwQfeOzrvxn7VnLfJ/lUmoDcod0z2K9n48nm4NA6Uh2BSfgJ6CrXPxPWtxilRvmnm7BD3iLea9psHCSMZLAUtiHC6GV0aZ00VGU4M3TvOMA3DBvCQA2qIIQDqwH2NO8xGwnafdigVTzMyJ9QDCad0f8ROx3JpoYjIqxt3qN/sXM4ESTS43+hnisD/gqWuDJA5l4vn+V3DnVIK0KCZgAN8OfP/E/5qQAyNRnJg1hXkQCbjZdACFLe+pb03Drcvmwe/NByUjWBHW38Q7nmzrE82ryQTd4XMQN4pJ54tjCuPH8fdHLIm5lHBG1P5VKFFyxvlSeHEKw4WyTlY03/tBkaCA/5eji3hNfTyBwxIZ0ksIIX/h/lP0dUKZDfOptliTGs3sAMwk9gPFMuBWI2cbgTOSiLSbDPHC1JWwCtB+2TKM/+tbrfg9zyZqif/zlyd/l9 d2/nlIIQ l4xPk244P9G6srdI27ZmiPHgGTkOkOAdiGinK4g0SZPgb/SFbAVVSKLvu8+ZQZjFaBx02i3AtNicNiTa4LZoUJPJNxH8ehSFcI0BS/2wyQVlaVYJ9QPJHyv7l7GlAZQAhPXx7dF91ZeHnnDTgz/xeqfTQjnqE4xEkATmtcTjmRm+D+pVN3Yhq8MSwRKyhWvGs0/dRAj04AqvvZU2VdkyaY9l5bVijuwgpT60WFwwAGf56l73lTpwZpNlvl8uhUTXvrl2Ep4B2FSdMdrlPWGQGkKDM/RD0rwIokuIQii2quD25uTJ9kiglHcankDD7RZN9t18urF16RGFSOP+GE/9gkrmkfKQ+M34YL0UjvIwcgaWxtrpOqSmb6PEBPWFruiYDbmxY845CMAzNQzg8YGn9e120H2HvRbf9YkugUu8QYva5mY3/J+SplXRIkp1S0DrVAEDgt8Koenn/5XOc4R4AL9o6Dn2UWKAmn3numq6GKxZDQcqFngya3vVFXg4yASetIJGnMqyxoBdbZhPGd2Ub1c8FCdG6ldvCeTtb 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-maps-race.c | 159 ++++++++++++++++-- 1 file changed, 146 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/proc/proc-maps-race.c b/tools/testing/selftests/proc/proc-maps-race.c index 6acdafdac9db..5f912fedd6cf 100644 --- a/tools/testing/selftests/proc/proc-maps-race.c +++ b/tools/testing/selftests/proc/proc-maps-race.c @@ -39,6 +39,7 @@ static unsigned long test_duration_sec = 5UL; static int page_size; +static bool verbose; /* /proc/pid/maps parsing routines */ struct page_content { @@ -207,6 +208,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, @@ -218,18 +312,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); @@ -301,6 +401,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); @@ -313,6 +414,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; @@ -332,12 +434,18 @@ 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), + "Merge result invalid", page1, page2)); + assert(!print_boundaries_on( + 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 @@ -362,7 +470,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); @@ -409,6 +519,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); @@ -421,6 +532,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; @@ -437,12 +549,18 @@ 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), + "Expand result invalid", page1, page2)); + assert(!print_boundaries_on( + strcmp(new_first_line.text, restored_first_line.text), + "Expand result invalid", page1, page2)); } /* Check if PROCMAP_QUERY ioclt() finds the right VMA */ @@ -456,7 +574,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); @@ -512,6 +632,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); @@ -524,6 +645,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; @@ -540,12 +662,18 @@ 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), + "Remap restore result invalid", page1, page2)); + assert(!print_boundaries_on( + strcmp(new_first_line.text, restored_first_line.text), + "Remap restore result invalid", page1, page2)); } /* Check if PROCMAP_QUERY ioclt() finds the right VMA */ @@ -561,7 +689,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); @@ -571,6 +701,7 @@ int usage(void) { fprintf(stderr, "Userland /proc/pid/{s}maps race 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); } @@ -588,9 +719,11 @@ int main(int argc, char **argv) pid_t pid; 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.727.gbf7dc18ff4-goog