From patchwork Thu Mar 30 16:07:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13194495 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 7E6FBC77B60 for ; Thu, 30 Mar 2023 16:07:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1EA0C6B0093; Thu, 30 Mar 2023 12:07:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BF2C6B0095; Thu, 30 Mar 2023 12:07:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 011E4900002; Thu, 30 Mar 2023 12:07:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E15E96B0093 for ; Thu, 30 Mar 2023 12:07:35 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A8C18A071C for ; Thu, 30 Mar 2023 16:07:35 +0000 (UTC) X-FDA: 80626044870.30.E5D9800 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 25FFE10000D for ; Thu, 30 Mar 2023 16:07:32 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BrnrCJli; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf14.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680192453; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9IAbBMcnsKQ/wMG+wiEQBSaGDUBrmUfxUQY9hBhFLu8=; b=RDBetNJ5EExiaiLuxFwpGgDbXKs5w7lLVUTLoaGYkIp1Hmv+prN7Dp5brvgvKQtndDh+Wd JQKU5CE9ErDhPBWFiU/gh1P/r0hN/pPhMMkFrHPRFFFm6eyoYRanI3Dy2zHCJsiH6/ssYm AJzS0T/Uq5SDk5B8GLiCp29NMNZqAqM= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BrnrCJli; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf14.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680192453; a=rsa-sha256; cv=none; b=G1kFgalYyb4t0kd+T7LdbJk6+As81Dh4ohABPKj1SBcipEGz8/AjVhUayDzkW47rtjlgqM V1UFUHpNcrq/V5rrFROLcecT+uPZmK5IEXEptaKSOUGs+A05OqjytryOPVJNirfw7kDkO1 3gVOMs6F7AJ0pQsmmIDk/aeKpFb3s40= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680192452; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9IAbBMcnsKQ/wMG+wiEQBSaGDUBrmUfxUQY9hBhFLu8=; b=BrnrCJliNJMaK5S7he9guLfIl9SioaTPFQ/CLsobhCATwAXB0DO8jwO/AvfqVIFnHMR1yT L4IeWEvTKdPkOmFNcTxdPE5tA9DGtpWLtlLz0FzeZIlGbmmy7fwhpLjlRz+MZlCpeHu09L 8M941CinsK16MmqMEUEUJ+lqZcW2ySI= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-475-ac33Z6lGMRCyfmAknDlKxg-1; Thu, 30 Mar 2023 12:07:31 -0400 X-MC-Unique: ac33Z6lGMRCyfmAknDlKxg-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-746bae78af3so60162785a.1 for ; Thu, 30 Mar 2023 09:07:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680192447; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9IAbBMcnsKQ/wMG+wiEQBSaGDUBrmUfxUQY9hBhFLu8=; b=tjAbjHwmQiKG7xowKHg9SsWC1u0GOmXlmPqkjPy6+sSrshmWs5wF70x/v7Q3jh+djv yxp+kjUTWqwpZIkC8t5JqZy0wy8EzIt+lBgwN3BAyuTKhfG3JIJKf+0zRufMctyHJJPr Fmw0B/5q38TIWQj7nJTDShk91VFCCnslhcbxLfBhQ9SDEu5UeyA2DpdKfhPNfwavjo2h nPrXAT/5xDWn90LAOdR2vIx34R1hVwro+Y0O4Zc+U8QDfzf3TOtvOY9gK5IuLbiwjVpG 0lJGFv5rHm7g4COjCaUx33zOzNnMlv5xMmFVi80zzR25XWUBNghFRdrZk2gwgmT4C/5q et6A== X-Gm-Message-State: AAQBX9ftnSUFeI0isZOzFMsJDu9izC5DxD7eUX8RfKbyQw8TXz8m+xEJ 2LWuE/yiKzLLBLnR2qdHXUfGYEftfMI70/rTpmTb9HAsjupDgf2L4DeAVSyBYU3KhVQPe5/LVeH wT/rWo0xcB6xmhYSyLvtV8oI0KS1Fm1RzJVwu+xsgj8G/INbGOgtPTQcwG4aRdJmakoab X-Received: by 2002:a05:622a:1885:b0:3bf:cf77:a861 with SMTP id v5-20020a05622a188500b003bfcf77a861mr4161770qtc.4.1680192446777; Thu, 30 Mar 2023 09:07:26 -0700 (PDT) X-Google-Smtp-Source: AKy350aDzum34tIGGIl5D1DP0AG1BkXRe6bE/ERsqntOfZrNMLu3f+ZX4TwL8/dXblBvXoRbwqvGXg== X-Received: by 2002:a05:622a:1885:b0:3bf:cf77:a861 with SMTP id v5-20020a05622a188500b003bfcf77a861mr4161702qtc.4.1680192446285; Thu, 30 Mar 2023 09:07:26 -0700 (PDT) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-40-70-52-229-124.dsl.bell.ca. [70.52.229.124]) by smtp.gmail.com with ESMTPSA id p126-20020a374284000000b007486fc7a74csm3517511qka.135.2023.03.30.09.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 09:07:24 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Andrew Morton , Andrea Arcangeli , peterx@redhat.com, Axel Rasmussen , Mike Kravetz , Leonardo Bras Soares Passos , Mike Rapoport , Nadav Amit Subject: [PATCH 13/29] selftests/mm: Split uffd tests into uffd-stress and uffd-unit-tests Date: Thu, 30 Mar 2023 12:07:23 -0400 Message-Id: <20230330160723.3107032-1-peterx@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230330155707.3106228-1-peterx@redhat.com> References: <20230330155707.3106228-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 25FFE10000D X-Stat-Signature: 3hw6xeeexumtgaos87riowfm9rhjayge X-HE-Tag: 1680192452-804463 X-HE-Meta: U2FsdGVkX1+56ok6OimJdwNgppiY6iCpbdx4LkyApXEftpabsbau+t1PPtlkjXjse8/IjTgANk/euiCGhz6+TaXnsyKPHrP9aocyaDoHZQHxkErXoD60r89a04nlI2e6q7UiE2xIzdchdcc0Mo8RaFYVldTeYHNA/4N087dOzFun5fD0TaMAMf1gd8iIjtJfrnDBeaAeyefUdz8tNAau/yHnrgQxmDuNastA7XHHVjvYB3MZSWhI0TggyZKzs7OBdESvmiSgvRkdHNjY+gyalXiHwEdrxWT7bmCpkcmgQYR/qLtElAviYfeqzfpBM6KjS/Sw/AIRXENxSYubfjYmItDhKCILUdSPYGBMPpwf/uPB48eshRO3egNbEg8ocI//5DR+pc9lhCPBUz16M2303hTaZ+kF2KK5jzgwAXWp2gwmtIwpajaR9qFKqLVVtqhXGQozDDS6CYq3HhMY5FQwPeF66ItvJBgdkWkawSCE3O54gr/Z+pJfd9MuCSNVSMcgXY5I2Tgro8pH5aiAW7TYExvXHJDfjwFV2C4Fd/CiKTP/4Y6Mef+K5X4RFaVfuHTYuH1R/UkjP914d5wuO+B6+qM1gP6dA47k4ciSu+FaqFd3EVIBslJ9dATNLvaGX7+zAJFvgIgozVRd9W4KW9zKnXwnHs6JgpVn2+u4DFxL7vrk5OQ3afJ/550Hm+xnPzzDtIRe4bWyDL7wHpUTLBaqSl6VUan8jnquS0xf2FmMvtWF8yHzxYyHkcuR7ON6bx363VAwwV43qEkB4/ERc7XqUNiZUp/yYkH8vAyKV7eLmISszhnEaZIuP0ItrbNpvpmSVJfnP89MdXcDOYX562IyCdLzkF0bBVGvi9XH3vUUk3ByyyVjNPR4DNNdd89dWpHDsXi3I+DEAAWngesDTd22XIh6xo81NmOfZR3ASmWWC1YuHmEPfeF9QScx4NxnLyH8EW9t/GGQopMVRs0hnCJ hwarcGd8 xbv21LBClMPuOQ88cK5VOEpQphGSgbn3dC0ktOmWPaywMiNKWbW1y+w86Brf7VbtdexLwGAw2TLF6gpogled4/Pi3Qlu3YTwacF0M2V7zT/1RfN8IMZwLssB77lYcmtytT/fMaK0nZmxmeIRlrS+E1OvUFBaCIqvGEyWgIwXzQCyI/ESgK8wCcPGzNdJdh1OBTu+/n1VmpJGuPeegSQgf8fVtKCWfQmNro6ldmkrYuvgCEDbUAXjyE0gisgGqxHcLf1bwJBwotIvZT9rpw9zxoj+m5lVjxX5wNwL0Tyf8yBN3f1Hl7poamXOmPrC/IHkD6PGw4PvMi/Ad2civb0wpFcs0YXXcEFEZd+J0vj57ksvLU7aBFLIIsRTTXV02ETeHwgcsWfTjZGdvSWBp2vkDwYCWlWAfFwpQW2A33/eDuu5HNZXatgMIg6CVuZ+T1qDjHT+D5rWpe49saD9mKb4QGizyGi6uOuIAephy 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: In many ways it's weird and unwanted to keep all the tests in the same userfaultfd.c at least when still in the current way. For example, it doesn't make much sense to run the stress test for each method we can create an userfaultfd handle (either via syscall or /dev/ node). It's a waste of time running this twice for the whole stress as the stress paths are the same, only the open path is different. It's also just weird to need to manually specify different types of memory to run all unit tests for the userfaultfd interface. We should be able to just run a single program and that should go through all functional uffd tests without running the stress test at all. The stress test was more for torturing and finding race conditions. We don't want to wait for stress to finish just to regress test a functional test. When we start to pile up more things on top of the same file and same functions, things start to go a bit chaos and the code is just harder to maintain too with tons of global variables. This patch creates a new test uffd-unit-tests to keep userfaultfd unit tests in the future, currently empty. Meanwhile rename the old userfaultfd.c test to uffd-stress.c. Signed-off-by: Peter Xu Reviewed-by: Mike Rapoport (IBM) --- tools/testing/selftests/mm/.gitignore | 3 ++- tools/testing/selftests/mm/Makefile | 8 +++--- tools/testing/selftests/mm/run_vmtests.sh | 10 ++++--- .../mm/{userfaultfd.c => uffd-stress.c} | 0 tools/testing/selftests/mm/uffd-unit-tests.c | 27 +++++++++++++++++++ 5 files changed, 40 insertions(+), 8 deletions(-) rename tools/testing/selftests/mm/{userfaultfd.c => uffd-stress.c} (100%) create mode 100644 tools/testing/selftests/mm/uffd-unit-tests.c diff --git a/tools/testing/selftests/mm/.gitignore b/tools/testing/selftests/mm/.gitignore index 347277f2adc3..8917455f4f51 100644 --- a/tools/testing/selftests/mm/.gitignore +++ b/tools/testing/selftests/mm/.gitignore @@ -21,7 +21,8 @@ protection_keys protection_keys_32 protection_keys_64 madv_populate -userfaultfd +uffd-stress +uffd-unit-tests mlock-intersect-test mlock-random-test virtual_address_range diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 9c3737285f8a..ca8bc4ac71e6 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -20,7 +20,7 @@ MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/p # Avoid accidental wrong builds, due to built-in rules working just a little # bit too well--but not quite as well as required for our situation here. # -# In other words, "make userfaultfd" is supposed to fail to build at all, +# In other words, "make $SOME_TEST" is supposed to fail to build at all, # because this Makefile only supports either "make" (all), or "make /full/path". # However, the built-in rules, if not suppressed, will pick up CFLAGS and the # initial LDLIBS (but not the target-specific LDLIBS, because those are only @@ -56,7 +56,8 @@ TEST_GEN_PROGS += mremap_test TEST_GEN_PROGS += on-fault-limit TEST_GEN_PROGS += thuge-gen TEST_GEN_PROGS += transhuge-stress -TEST_GEN_PROGS += userfaultfd +TEST_GEN_PROGS += uffd-stress +TEST_GEN_PROGS += uffd-unit-tests TEST_GEN_PROGS += soft-dirty TEST_GEN_PROGS += split_huge_page_test TEST_GEN_PROGS += ksm_tests @@ -107,7 +108,8 @@ include ../lib.mk $(TEST_GEN_PROGS): vm_util.c -$(OUTPUT)/userfaultfd: uffd-common.c +$(OUTPUT)/uffd-stress: uffd-common.c +$(OUTPUT)/uffd-unit-tests: uffd-common.c ifeq ($(MACHINE),x86_64) BINARIES_32 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_32)) diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 9cc33984aa9f..af7bbc74cd83 100644 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -196,14 +196,16 @@ CATEGORY="gup_test" run_test ./gup_test -a # Dump pages 0, 19, and 4096, using pin_user_pages: CATEGORY="gup_test" run_test ./gup_test -ct -F 0x1 0 19 0x1000 +CATEGORY="userfaultfd" run_test ./uffd-unit-tests uffd_mods=("" ":dev") +uffd_stress_bin=./uffd-stress for mod in "${uffd_mods[@]}"; do - CATEGORY="userfaultfd" run_test ./userfaultfd anon${mod} 20 16 + CATEGORY="userfaultfd" run_test ${uffd_stress_bin} anon${mod} 20 16 # Hugetlb tests require source and destination huge pages. Pass in half # the size ($half_ufd_size_MB), which is used for *each*. - CATEGORY="userfaultfd" run_test ./userfaultfd hugetlb${mod} "$half_ufd_size_MB" 32 - CATEGORY="userfaultfd" run_test ./userfaultfd hugetlb_shared${mod} "$half_ufd_size_MB" 32 - CATEGORY="userfaultfd" run_test ./userfaultfd shmem${mod} 20 16 + CATEGORY="userfaultfd" run_test ${uffd_stress_bin} hugetlb${mod} "$half_ufd_size_MB" 32 + CATEGORY="userfaultfd" run_test ${uffd_stress_bin} hugetlb_shared${mod} "$half_ufd_size_MB" 32 + CATEGORY="userfaultfd" run_test ${uffd_stress_bin} shmem${mod} 20 16 done #cleanup diff --git a/tools/testing/selftests/mm/userfaultfd.c b/tools/testing/selftests/mm/uffd-stress.c similarity index 100% rename from tools/testing/selftests/mm/userfaultfd.c rename to tools/testing/selftests/mm/uffd-stress.c diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c new file mode 100644 index 000000000000..6857388783be --- /dev/null +++ b/tools/testing/selftests/mm/uffd-unit-tests.c @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Userfaultfd unit tests. + * + * Copyright (C) 2015-2023 Red Hat, Inc. + */ + +#include "uffd-common.h" + +#ifdef __NR_userfaultfd + +int main(int argc, char *argv[]) +{ + return KSFT_PASS; +} + +#else /* __NR_userfaultfd */ + +#warning "missing __NR_userfaultfd definition" + +int main(void) +{ + printf("Skipping %s (missing __NR_userfaultfd)\n", __file__); + return KSFT_SKIP; +} + +#endif /* __NR_userfaultfd */