From patchwork Fri Apr 18 17:49:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 14057559 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 41687C369CA for ; Fri, 18 Apr 2025 17:50:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB9F96B02AD; Fri, 18 Apr 2025 13:50:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D678D6B02AE; Fri, 18 Apr 2025 13:50:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6DFE6B02AF; Fri, 18 Apr 2025 13:50:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8F36B6B02AD for ; Fri, 18 Apr 2025 13:50:15 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id F1833120AE0 for ; Fri, 18 Apr 2025 17:50:16 +0000 (UTC) X-FDA: 83347903632.10.5023D37 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf25.hostedemail.com (Postfix) with ESMTP id 313D2A0010 for ; Fri, 18 Apr 2025 17:50:15 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=qp58tD6V; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of 31pACaAYKCEk352pymrzzrwp.nzxwty58-xxv6lnv.z2r@flex--surenb.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=31pACaAYKCEk352pymrzzrwp.nzxwty58-xxv6lnv.z2r@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744998615; 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=4jqUSvj/NGRZpdVDELGH7hX9O/M0JsmqV6H5P9bViYo=; b=VlX6aePZAil92EpcaTf1G+v0bn7djJBNi9PNTYrEnJyazQZmCUny3c4x/TE3htyaQdDzrW Ecc08zQW0Iw9Pnmqsw1gGdg55D0ZLTM5vmpMHSmnC+OuIUuw4YpbCjfJnPx1PzHvss/PLW y8XPe+aIrsTgabQ87MZLi1LOAZ0kcD4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744998615; a=rsa-sha256; cv=none; b=jKs7JVZegqeJ5TTIjSMmafz+/7c/zDJ+RLGNYQr8nGY/9WWKklR/mdYF5rpzj0SqCKlTcj wa6Xf2R+B6tbjals5K6Ya8vp69GT8D/lKpXN5bpYWc7pYkex6ysKTQT4HDasxxJC7nqhB3 JyqGVcr9t1xsMxO+b++BQrGqSaves4E= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=qp58tD6V; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of 31pACaAYKCEk352pymrzzrwp.nzxwty58-xxv6lnv.z2r@flex--surenb.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=31pACaAYKCEk352pymrzzrwp.nzxwty58-xxv6lnv.z2r@flex--surenb.bounces.google.com Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3032ea03448so2090343a91.2 for ; Fri, 18 Apr 2025 10:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744998614; x=1745603414; 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=4jqUSvj/NGRZpdVDELGH7hX9O/M0JsmqV6H5P9bViYo=; b=qp58tD6VdNfvh1Kxxqnhn20YbNp94LvwfvJx9aFxVR8RF2FZDn1qCau7snhF6clqE/ JCIfM0i1Nxh5HW08pC3rG3+oB/FgVB5cxehatZ5aOAynHCUWFoo0Eqn8pw4KtGBkDE+T LZJ8Npuc3LsAlLHU6Sqew3PqBkvA5mtIXSIm05hgU2HtzoM+GMAYCkQ8mM8R8mGxrbBW DA7TFgh66pFP4hXRArFIA77Sdt4fDaZ23eM35jlXm5NxP6fuXBq8IuAz8TT/4wsgHq4e bZyyA4MMFq7/X+ruJBre6xsGwgbMvvUlGeqYYoXxb5jVjxiG2hWIMKXyrHEvgvwos5oC 0boQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744998614; x=1745603414; 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=4jqUSvj/NGRZpdVDELGH7hX9O/M0JsmqV6H5P9bViYo=; b=Rsh+Xg50VMBalQjKT+mTY98m+7z7bNvRU2OFE9mj+9zYj7zqFuWkt+WjkiKJ8/UssA bK149IK9VUAptNugrn+OPpTEF/3rzExJXS+zoF3Sghmv9NykoET0ySptUkSrkfr1zGr7 vRZSSOckGD8vrM6nWDuAzrx+n0ySGzprsOoOpbqLZCLY98Z15Axulb6rdu/dAlm3IeT3 cuMWaplQHPm1XLiZ7ik3q2eNtFiOKwIgDGhJU8xbDUB1stx+egYQyQJp3eAklXGYsx04 xUBSHhxDstzHQi4PW58h44NdbTjLEukCAHIvSl6kQ08tGEGXfR4tan0gNkQQSyGjElQS FaOA== X-Forwarded-Encrypted: i=1; AJvYcCUBLHUEyQ4qMMF28LsSL8OyKaYkLxZ4lWfXn+A3W1MmAltyV4Hcr8sk4DpXm8FEmGizfHBj653Lww==@kvack.org X-Gm-Message-State: AOJu0YzeLGi6WZFnFozCT5/zg7uoutJF+A07xGqfyAIK/jHfPtsZOv7t lcPHqSZ9f0LBNNRlwDoqr0AwW4Vt1uiqU+LVkZr+WBEBxyepDZqt1Y+wcnbjL7zOR2SECFgQx5V oaQ== X-Google-Smtp-Source: AGHT+IERCla4iFsgpWYpwI6HMOKZWs0UZbPEMYoTuXdvkIt8Z5/Vr0hH5bN0CnC5Fg33kNuXlwhByED7Sls= X-Received: from pjbpd10.prod.google.com ([2002:a17:90b:1dca:b0:2fc:c98:ea47]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3d89:b0:2f4:4500:bb4d with SMTP id 98e67ed59e1d1-3087bb6ba88mr5312595a91.20.1744998614144; Fri, 18 Apr 2025 10:50:14 -0700 (PDT) Date: Fri, 18 Apr 2025 10:49:56 -0700 In-Reply-To: <20250418174959.1431962-1-surenb@google.com> Mime-Version: 1.0 References: <20250418174959.1431962-1-surenb@google.com> X-Mailer: git-send-email 2.49.0.805.g082f7c87e0-goog Message-ID: <20250418174959.1431962-6-surenb@google.com> Subject: [PATCH v3 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, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, surenb@google.com X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 313D2A0010 X-Rspam-User: X-Stat-Signature: wfrmxwqkhu8mctxpcadms67ja4yfp1j3 X-HE-Tag: 1744998615-628045 X-HE-Meta: U2FsdGVkX1/IS3x6DOrERawfHV9JEYtOILn+5qp0/h/aRU1Ia8HT+hBDSKPi2VRXv4zHDyhC60osJtEvFvxq9c56h902er0LD7FCJchNIrOL2Ozi9wYACQ2nH3fcWOrFtljmf4eszIEdOeJT9Q41EfWvU+FmDwN+gi7ehZSIsiN84bJ/Z3XQ1Suy+nbZ0QMLGwYhHdDNCttTf8UAY6F/UqKU92hZOED1+H6HfaKafW8UvRzUS6HgPvVWhJ9Dc3jSo6lnYsIJGNnqsY/fCYsAlcuHlsekS8m/Ay6AdzH4YmACHF1PqtZdkwIL/3QnrYQPzPldj1AMMcwIcp470pmKta/4mJb2wvaxfbRNG4d6bU0p5EtmEjXemJ984Zvrgxod8fc9WzmqVds/XTyFcPQ3Zzk4we0OZVgh/XF7rYPnUsLEZieY9AGUK+XO0KDNp5nD5z6vxjUyQbhv7ZMWNphvQuNSUz+khcwse/VIgKQfUkRPZvkq2lWohQXQWwrgO1EK0NFtgDwD2a5rph1jY16AYwvhdZ73HUBYIrGOyQQltuso8PbHLYfidoS3PLEKajxeIILYqDR/XuQkE258EhdafyP/pUoW0sb7E5tqof32UbE0p9nua2ZQShLPBgnZ1vOeImdBCPs35tz+RAaEyCEEdO49DlaoyMhvIhFJZcOF0pO4ElNZzZgcEHWy0vX2eEGzsGEOFXRIwpZrlzvoCGFwsq0h0O5pO6p/ZOSg2UUJj1SumcZI064ZYgVjDlSvnLT+y90pCpZwOzK/NAIO9AyDg3EcGjtVGTPaVMvw2vmAp0GiJAMveAg9hkK5+tW291MoEYuOcjRuCRS5YcJPT10HJ9zpmnkt3FQAascpdTaWwOCF3s79jId0hc2sYwyXxQKHKNfJHQbYOrxamvnDURqn/lv+8w599h+e+Svp3ztaIUA7pkj9QgBTanu8WkgSdic1P1NcHxG4p6oBK/NvdzF GdSbVYWm E6t31i9S/me0cmrhNWGtswqYXCKBoYizs7JN4at0j3ZCuEsMvhFHuGFmuOMMrao4IwiU/9YUVgUJk316qzcK4tx0F9JQlfQV0cufnaL3NKDpZNKiHDgaaR99I3Lb9EvU8+eeCeMp8qS1ZGtGdjJuxCdZMuI7FASUPyN6eQc9BMm0rjn0OSWPz99ZOCAMxkISgCfngc2z02grto7KR3Xy6mV33xVY+E2GIflGkhElrSpvFBfv0RCqdv5/ep8T7SPacTVP1o3s+5Y3UsC3FtFXA80xvleyKSeMvInBPH1SwQjAUMT8C3xf2X9LOjSisdysNcNh04XL2XI51gleDE7zVVYxccdAQtnsbPIAdMo73MpL/2I+3iKQPXWIMb3/Hvr9oNzMMrM747G3yrHm7KUQuTpsVWz5EO5H51FF0Di3pPUKLjN6SUaDnIsJMVF1bJfyi6uZxf/VHBS5z2jH+ayzvSM0lA54xKWlGRbJgK+36qFD4iOXR7DP+c3AoeCJ0UOVo1rF1EjDTeRawrIQni8LJbo70C4UNcklTQZCjQyFd0tyS9D0= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, 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 more to the proc tests to print debugging information. Usage: proc-pid-vm --verbose 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(); }