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 95DB9C83F27 for ; Wed, 16 Jul 2025 03:06:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ACF536B009D; Tue, 15 Jul 2025 23:06:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A7FDD6B009E; Tue, 15 Jul 2025 23:06:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9493F6B009F; Tue, 15 Jul 2025 23:06:14 -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 856526B009D for ; Tue, 15 Jul 2025 23:06:14 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3A8C112BC22 for ; Wed, 16 Jul 2025 03:06:14 +0000 (UTC) X-FDA: 83668639068.07.0D0E5E0 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf17.hostedemail.com (Postfix) with ESMTP id 60CCF40002 for ; Wed, 16 Jul 2025 03:06:12 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="BlV9pL/X"; spf=pass (imf17.hostedemail.com: domain of 3Ixd3aAYKCHgoqnajXckkcha.Ykihejqt-iigrWYg.knc@flex--surenb.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3Ixd3aAYKCHgoqnajXckkcha.Ykihejqt-iigrWYg.knc@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=1752635172; 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=EcoI2p8uuAsDBGtgT7de3rwRJSVF8YExsuiJpyzQ0azaHtW896iKV1wiHccQE4teJoXy5U r6KeNqHncQfmsesL37KS+CR0TYBj1SrLad0Vv5OrNoifLKMr9G8dLrcLhHKig/tQzzD/pK fbf6mnW5tHAmvxBxjns15rWlhrdhRS4= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="BlV9pL/X"; spf=pass (imf17.hostedemail.com: domain of 3Ixd3aAYKCHgoqnajXckkcha.Ykihejqt-iigrWYg.knc@flex--surenb.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3Ixd3aAYKCHgoqnajXckkcha.Ykihejqt-iigrWYg.knc@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752635172; a=rsa-sha256; cv=none; b=dwvhfMzYLykTfzWI3JRJ2PtQ0x6oKJc8ZHfNEcdcKHLEOMpLo2mOAUg/qFWyp3imqHapXp uEySK0J4mA9phyml/ywTOGG2eAdeJB8BQdq3YipirXnPnibZK+XS9lkJDLx+6EJHkb60aA Ckz8Zozmuw6fOmqmaa8LXi+MwjMXGd4= Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3132c1942a1so9941882a91.2 for ; Tue, 15 Jul 2025 20:06:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752635171; x=1753239971; 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=BlV9pL/X3jj4jhNVHWy4m+fZ0ZMGdiWPBWYFOG+ADc0GkrfDWnZRa/U9IFFnz/Eqir nJl2J84x79Uj6H4XqIgQiSmQKv0sJ44rv+/WIo2saMnyAmj10PrulFLxdAFBbLdzErHZ Rscw9r4ikOd9Kf2hrMnjbch6GxDkAZc6H3dZHMRmgjKDzPW5xnb1PM1WVQ5igP6pwUIk JNFy5ZhoXeYP5UDCDyz/C9CjIM7ah77AwRlO+FQOmXJmVOf+Sa31GXFts2TjdFHf4v6M PzT5n34VkQ8YE53UCvcY07F6JCiyLdEYX48eZXVpEC4JlDpOooeVvsLcsxF2Teyv3XNa qjSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752635171; x=1753239971; 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=t+E4YJyJDSAa7KE7WDjdh7QaQQqk5uxulBRXcZSkJOGPF8AGoNs3up9NNGj4Wij3qH ysUzYmZk6yFlj18BjJgzprgLa1CFActLk9eD/TJpPdeHFrqqMlZKUQu9IGVNkWql6slr rTpyef6N9ZeWLccxqqL18nAJ34qBWriOeQWdkARrDf6OSTX8HZ0YcUKjLPjGRHfGfZ2B yQ1OF1HiAULiZTDgEUKhHrlDg3oxXsP9foXYvXcpiIkLariaPPETp4453FgYBjhngCXu oJwqmhFCiLBimT/alYCW8XsJ/yD+X+HHgH6nrR3K9+w50iqoohMvF6bebQQ6kezW+JJJ BamA== X-Forwarded-Encrypted: i=1; AJvYcCVG7hQC8pT9x1QBZ9YvuslypfcBrjicMRkvJWpJM8hC6skuG/fhFL7NW4E1cIPhFa54JgXhkXx6oQ==@kvack.org X-Gm-Message-State: AOJu0YzAz6T9bLInjqKXTWud82QUwKbvC2/J7GjjQ2osEQ12PrcKCVP9 xq25Tj3isnk46vxdmk8vC1cEw/qJ1ZIF1f5joihl+fsTJaj3o2ov0WRp9C81yY9BQIQ2dlpZQX9 AswHnNg== X-Google-Smtp-Source: AGHT+IEb/63ti7d4Q2qcu9whEMcfzkbMdhtts3srSHto5sREd8kxF2Vw4VbGHfvo4ixP5EDqUO+ceN5/tWk= X-Received: from pjbsm16.prod.google.com ([2002:a17:90b:2e50:b0:31a:a0b3:5f6]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4f49:b0:31a:b92c:d679 with SMTP id 98e67ed59e1d1-31c9f44e3c1mr1397320a91.35.1752635171211; Tue, 15 Jul 2025 20:06:11 -0700 (PDT) Date: Tue, 15 Jul 2025 20:05:54 -0700 In-Reply-To: <20250716030557.1547501-1-surenb@google.com> Mime-Version: 1.0 References: <20250716030557.1547501-1-surenb@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250716030557.1547501-6-surenb@google.com> Subject: [PATCH v7 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, 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-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 60CCF40002 X-Stat-Signature: 9rfeik5img3ri4k6sjr8gpd5md5cfsai X-HE-Tag: 1752635172-175495 X-HE-Meta: U2FsdGVkX1/COsdD7YcqzxCvEMfv/l0OueY4rqZf4tm/D4W/e7xaafrPfiotRxqalt3FRBO+hPyvZl3kCjpnM7B8uu2D3QZVjkAa/PhdmMq99vE7jzWYieAg2i3j5bnxrrk5O8I9mmg1dAd0IZGYBhAfBx5fKsBM+sOnz5vTgib2SCA1INIjNa7w/79AMOwzPLLNenqTXBOlDu52djGVmUx3rF1+VC5ZYpL2STWWc9Svmo2x4fPHpWQRjblXjUyexkzOoktesQz2dKb+RoWctmzpyOSSAwYE61vo4XB4+XYZLyzWSz9cp7RYh1PSeqEjFBMqTwXpSFaqMlZ442O0rYZAmR0qxxI4ZdH3iS9x8lrQfd8a5s8p5d7s6M6L7d8re6Yr8cdA5VKmAqdTOL5nqYs+9Gg/0Kn27qVJpmnf/CI4HqLbW92G5kb+/sx5pVQSHIH2frP8/Pb1KzcRme8AroiQ840KrHt7XjULLLe4fRp88DvkoGrOUZHSEhU5WnWQt3ZRQHwOs1Og9pSALiOrnYgl4TKyo+ZUm84j7XMKhlMvKW+05miVH4x1qp+xyS2huK7KEX1GmckTEvoRPIGyB8Qf0EerXhmPeq+/gwloupHs0MBmDw9m8pYaB8inFEC8II8O30fVlWYCq/qfqoaNRoUzyheEgxYzOCIu4w4DNRAie8y0xQoz7u5PGZLajWUVUOixMdPIGlCad2VG4AYe6oX+E+IKlNpYmAlojYt9tZYxvyuAExCZxqPqudHaP9szSGLWPVxedGKNj07Y7h92jJ5eWiWkjAgYVBxNpLwtfK5YN57c23bklYXctSbYi+xxq24hXKmbCTXk/aYPZcDKXqqpyiGxm99q45we4JsV6X4iuntLPXeqwUqmDa9FOgbWa1Q0Zg30jNor6VcQfa4qhEc73gj4wmiYG1JQmcl9S2EgTb2JJDExCBFIVvA6/1zfEQTMYlhW5KXBTSUdgRa o3tSPpZk UhNWHY9k05OmKAj8W1jMiqw1CD250VBsNwITeedL2XCUpYH3N6YruNvJ0hnCAWsn8pi/Ymifay3Mwp8VcLVHBoOSSjFjShuGTVZgfmw/tzhZaPLjHclzei4pSBTQBhygKkXi2j38NuYQU8bwckkR4z8z9d9/W4ce5iVbZ5TBcWdB/5GlGD23OX584K0C4xRSA0ev6Ky6CY13fDDh42ibBSR5i4SUtwW5jSDGV+7x37jN/AuPGFXHAmPFrPn2jz6bKabID8PqR6DuXiJRHss+B0eFFjBOtvYKxEO4A4jC3YqtIFyCutvj5wvd+XvBZ7/ciby0/Fdfs8qliCVcWUEKkLmpapIpZe+p2gAX9xJMpIzTot7ZMDqtNtduD0FYU4OqlzHZBbAIB4Rq3e7QRR2QUFJm5A/Xg0I2xKC8LWCN8877f15fXuHFueKmj1lbAebLWkTM4ld0uxg/Hri2v7W31DCA0U4SqXG7W1qrdBEUdNi9/h///7h2o74XXYx7jKOosMNkO9T8DHsdBMP2jQ7Z+9lqwC3zfjgt3Hi9Q 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