From patchwork Sat Oct 28 00:38:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13439341 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 307C3C27C47 for ; Sat, 28 Oct 2023 00:38:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4567E6B0404; Fri, 27 Oct 2023 20:38:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3FE1E6B0405; Fri, 27 Oct 2023 20:38:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 29F356B0406; Fri, 27 Oct 2023 20:38:32 -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 12F806B0404 for ; Fri, 27 Oct 2023 20:38:32 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E8F2380324 for ; Sat, 28 Oct 2023 00:38:31 +0000 (UTC) X-FDA: 81393009222.08.387A772 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf05.hostedemail.com (Postfix) with ESMTP id 2EC00100004 for ; Sat, 28 Oct 2023 00:38:29 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=syYqEFwt; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3BVg8ZQYKCNYKMJ6F38GG8D6.4GEDAFMP-EECN24C.GJ8@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3BVg8ZQYKCNYKMJ6F38GG8D6.4GEDAFMP-EECN24C.GJ8@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698453510; 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=BD9lPzNt8hnQJcZ/hWgSWD/y67yszl3sQZlzVb4etk8=; b=RDMMJ64ZXrAEqH/CsusuVpkIEqena7dE9MUL+2DlL4Z4EwqVST1HeJ5JIQAL/D0FnxobkY ShrNUHQNon+8afaMfsCQ+GahG+fsmge27qm00GsLnXdGV1tOiPWAvLmnGLq8w9OeJtQwvw 2wFX4BzpSdaFs+fXv+9Q9qrcLqbU3pg= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=syYqEFwt; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3BVg8ZQYKCNYKMJ6F38GG8D6.4GEDAFMP-EECN24C.GJ8@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3BVg8ZQYKCNYKMJ6F38GG8D6.4GEDAFMP-EECN24C.GJ8@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698453510; a=rsa-sha256; cv=none; b=xJfX/dF02nKQkiwnRBoIKt76pVvS7PNAMtXLxhAJh/AiOyfYI4SiwwEwDYqfiOswM4xKG6 /o4igefJQ7WCiWf00QLzf+siLsTFAhNNnbmFtwkOCS74nNa0bW5+dx+XglW4J7o8rqb2nm tb1HXPlZrBeTnQ+3zOCC285ZM3CVW5w= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5af592fed43so16542717b3.2 for ; Fri, 27 Oct 2023 17:38:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698453509; x=1699058309; 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=BD9lPzNt8hnQJcZ/hWgSWD/y67yszl3sQZlzVb4etk8=; b=syYqEFwtQ81MdWcV8hprGd6qBU6ayv/sTRSQVPugmuqm86Vjag9msgxjXM/3O0eoJT iKpOL4LmedMWH56HfhUq/hTdAZvhOR/gbrvyB004+LUh/U6ZgphQho84yqhhY5OMr3AI tGBO38L5HzJGWXaYQAu6lw/qtpX62gFyqWQ7twqU7qwtNG596XGIcY1FC/T2P7jg4OV8 renk/xNk1kw+ICnQsP7p0lf1XE/ll48uiUy8ROnTmJSmwKQWxiUjb9mPgPy/sVWb2Pj6 sL+blLLobVnHXnJx0ilg5TXpIqhK9fx6UJ/6vcrqaiPcTuu4+vk3rYNTblhUD/JmRx7B aMrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698453509; x=1699058309; 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=BD9lPzNt8hnQJcZ/hWgSWD/y67yszl3sQZlzVb4etk8=; b=PYvNoNbUGbyz504kB4UJlaJkIFsmmaonRkukAPRw2gwmGG8WrmdDHMaz/NDGc5WUHP VjBu42gy2A3D37dKCQ/46RmF7jBBC0LIb+iit4hiuXE2s8WtashD/jvjaRyqkP/dn2+a /XlmZnsrMwbssahgB9qWnNj8EmAKg2L1thCHp5YMhPY8mJfM95xFezm1DrZ5eb5SipQO aWRWYRDxQe53/GHp5qE+siaYOCopgsyC8B6PHYNjAS6V6AEHWwvM0SgatP/9gkxKZNUs ify0wrltLjQsr/b65KdgM0l1+Y3RXarye0/M9o6sDapivPbdKVut6JcGdZsJGAy020yx qoGQ== X-Gm-Message-State: AOJu0YzeGPck+xixoaDPzQQKYhtGjfcIdzdYsGBXV4MLeav0xtimD6ce H8KChokRdNwlsojXjgFr0iZPRbbHcPg= X-Google-Smtp-Source: AGHT+IGmeKeXQi4pWbtj4gTgBBjJn+MEaX3ROLUS7uMooi9MoHIQXOo8pDwybtu05kFAWMGKkvzAZguj9E0= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:cba3:7e7f:79e4:fa57]) (user=surenb job=sendgmr) by 2002:a0d:db97:0:b0:5a7:b15a:1a7d with SMTP id d145-20020a0ddb97000000b005a7b15a1a7dmr86233ywe.2.1698453509335; Fri, 27 Oct 2023 17:38:29 -0700 (PDT) Date: Fri, 27 Oct 2023 17:38:13 -0700 In-Reply-To: <20231028003819.652322-1-surenb@google.com> Mime-Version: 1.0 References: <20231028003819.652322-1-surenb@google.com> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog Message-ID: <20231028003819.652322-4-surenb@google.com> Subject: [PATCH v4 3/5] selftests/mm: call uffd_test_ctx_clear at the end of the test From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: viro@zeniv.linux.org.uk, brauner@kernel.org, shuah@kernel.org, aarcange@redhat.com, lokeshgidra@google.com, peterx@redhat.com, david@redhat.com, hughd@google.com, mhocko@suse.com, axelrasmussen@google.com, rppt@kernel.org, willy@infradead.org, Liam.Howlett@oracle.com, jannh@google.com, zhangpeng362@huawei.com, bgeffon@google.com, kaleshsingh@google.com, ngeoffray@google.com, jdduke@google.com, surenb@google.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-team@android.com X-Rspamd-Queue-Id: 2EC00100004 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 8bo9sfsbt7f95ndqgz4brjc7ehype4nq X-HE-Tag: 1698453509-737822 X-HE-Meta: U2FsdGVkX1+s3Ze0dqIfqP722hhl1MyO4T+OB5TiHOIzrAe4jq8x020XAoJ6H2R8ikQ+7xyICFfpzwRYf/l3+y2trHsFAvGGdsf9+gvq66HgRSv60g9rHi4+PuBPiD1YYLD3hQXbi4fo8WwVIgHyzq7D2s7m82QpGxKlBYKPPIewRvtkZ4PI024K4CUGLKPJnxcdi9ERpKLPy5+4M78wohCKs19VMfQ5WPmMWPWUDsfe8BgoDATUG5V4aghI4tMNmj135zGMVgHydWy39uNzfcQO9EqQVBHl1XdIsVQt+iQA0oTrB9K6+/uRvAN4d/be85DZTOEe6SAVi6sE2D6KrehUomihhpZLS06DXi9W66/D/6Af+buMOwqTYr36PPxeVeFy1M5s11M8/hjw9GCp2q7DDegtMbyjcr7K/EpBaEYDk6lJOnLeAaL+RDfNSv6VKA49yC3vBlMENIGS31CByrRV4uCJD5/0RQSZ8kz3wB+/hggOpHUusorR02uzWxMzCVH9ynWwcyfpsFJHoeoFw0Feou+7dGu9okoIMUCTkz9Y2nyRGsj8uBmCSFoez2wFzU5zlXEZ1I7+V4EdTAqD9rnBezk0HSdkOC8rBq5ert1WwM3PFlus0tq196OZt5o4gy2cxtjVl8Xdy8ZLhAnhhzzP5Hr2UavHDSg6qmnTt/ZF0jyQSFslJfGnJndrfEel/HdZw+iA/FkzceuKSbHPLD9SRXz3juAB5U3Q/L2AsxVxHcu9ukGTnkg/qSkKV1o6J+7paPS6F1ByC9v97ptRPwdOr1IUixUUPXqKX85HbTAoh9BrNaV9/SfzP2bnEsxCW+Q8kQWifwP4uQ97kaf8EY67Fphb6fCP5F9jFvspazDXIKzZTyjEw3p0d++WJ0zjU4rjKs3kylUdKb7cLpL4OOsdIzdwJIyfMEswftpgs3reTuelwp/reX1cDwqgThosJcWX7+K2K32HT6x311V O+mgwyZd cDlrTG/KLZ+gr8jUCHnwbRXx4CbV7O6stee/Bp1k/lq5j1+pHFTVe8KJaMoqA0cCBfGR+cmwDKzF5SZHxANGeMSfv4Fmi1OidVvXaM9GqkmFIt/ca0Dn6chHZxvjKBLQE3zF/K7JkrXDXWix0XxlLgNGU86nTwvDtUD3OFtCatwBscXE4YGe/8z18a6JVATc6Y4WemIzNMC2hi7bN5Wb45LcZKIB33t3qLWv3AEfVgvraQm6xdQwm/lByVaMpaF+aK1KUwo4OXC0FzAGszBenn16EAZ+eQCg33OO5wWtPR4V879tjdLt2aTSJwrtJGV45l1mZfw7MuL5D0bk6IKLJDWtlmQlC7giSaNu26P+iAe7Giv1ypttzggdh3Jq0mAOAdk0x8MvD4dHLnF3NRUndJz3g5K2azqJYFV145itg0flteG1OOx/dLBtVVj5iiQKO89WC1jkl+P4cSYDq5GgVs12NR6uEkuYYvtDXh5LIrGmguWcJ6WPbaDfCy/+MO294A3Qrr1pTjeh8X7K42rB1m+nIGqzVLDcSWEdN/gBMoHx6LcIkPZU+MEKMaTUlJdRs/A7QdZEIvJjmQmXiY4uC5xlZUCeS0jv8mmksITgv6PvlBRXs1uS8wnnL70xRfRXq6bL9Jo2xpZZolL5y/UXJPCSMGlBsyvdRc68YrPHTqZfHFzmpmDNgYyAhIw== 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: uffd_test_ctx_clear() is being called from uffd_test_ctx_init() to unmap areas used in the previous test run. This approach is problematic because while unmapping areas uffd_test_ctx_clear() uses page_size and nr_pages which might differ from one test run to another. Fix this by calling uffd_test_ctx_clear() after each test is done. Signed-off-by: Suren Baghdasaryan Reviewed-by: Peter Xu Reviewed-by: Axel Rasmussen --- tools/testing/selftests/mm/uffd-common.c | 4 +--- tools/testing/selftests/mm/uffd-common.h | 1 + tools/testing/selftests/mm/uffd-stress.c | 5 ++++- tools/testing/selftests/mm/uffd-unit-tests.c | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c index 02b89860e193..583e5a4cc0fd 100644 --- a/tools/testing/selftests/mm/uffd-common.c +++ b/tools/testing/selftests/mm/uffd-common.c @@ -262,7 +262,7 @@ static inline void munmap_area(void **area) *area = NULL; } -static void uffd_test_ctx_clear(void) +void uffd_test_ctx_clear(void) { size_t i; @@ -298,8 +298,6 @@ int uffd_test_ctx_init(uint64_t features, const char **errmsg) unsigned long nr, cpu; int ret; - uffd_test_ctx_clear(); - ret = uffd_test_ops->allocate_area((void **)&area_src, true); ret |= uffd_test_ops->allocate_area((void **)&area_dst, false); if (ret) { diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h index 7c4fa964c3b0..870776b5a323 100644 --- a/tools/testing/selftests/mm/uffd-common.h +++ b/tools/testing/selftests/mm/uffd-common.h @@ -105,6 +105,7 @@ extern uffd_test_ops_t *uffd_test_ops; void uffd_stats_report(struct uffd_args *args, int n_cpus); int uffd_test_ctx_init(uint64_t features, const char **errmsg); +void uffd_test_ctx_clear(void); int userfaultfd_open(uint64_t *features); int uffd_read_msg(int ufd, struct uffd_msg *msg); void wp_range(int ufd, __u64 start, __u64 len, bool wp); diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c index 469e0476af26..7e83829bbb33 100644 --- a/tools/testing/selftests/mm/uffd-stress.c +++ b/tools/testing/selftests/mm/uffd-stress.c @@ -323,8 +323,10 @@ static int userfaultfd_stress(void) uffd_stats_reset(args, nr_cpus); /* bounce pass */ - if (stress(args)) + if (stress(args)) { + uffd_test_ctx_clear(); return 1; + } /* Clear all the write protections if there is any */ if (test_uffdio_wp) @@ -354,6 +356,7 @@ static int userfaultfd_stress(void) uffd_stats_report(args, nr_cpus); } + uffd_test_ctx_clear(); return 0; } diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c index 2709a34a39c5..e7d43c198041 100644 --- a/tools/testing/selftests/mm/uffd-unit-tests.c +++ b/tools/testing/selftests/mm/uffd-unit-tests.c @@ -1319,6 +1319,7 @@ int main(int argc, char *argv[]) continue; } test->uffd_fn(&args); + uffd_test_ctx_clear(); } }