From patchwork Wed Apr 12 16:42:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13209349 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 9E39EC7619A for ; Wed, 12 Apr 2023 16:42:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 41387280003; Wed, 12 Apr 2023 12:42:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C391280001; Wed, 12 Apr 2023 12:42:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26433280003; Wed, 12 Apr 2023 12:42:56 -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 18659280001 for ; Wed, 12 Apr 2023 12:42:56 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E23031C3CAC for ; Wed, 12 Apr 2023 16:42:55 +0000 (UTC) X-FDA: 80673308310.01.CEA5002 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id B119912000E for ; Wed, 12 Apr 2023 16:42:53 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AInr+zyd; spf=pass (imf29.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681317773; 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=gEk7ts1lThyIvIfCL1IGZ4lKytmWVdDqEngQ3sxu8hg=; b=1pw2egvwpDkdVSQNa+S19LCbBxLkZk2vKm0u2Hl8NnVHcSR4WINQYJFPsprM6Q5LnrhDQ3 2pXR3dLRJJ/wIwzusPIqlDb9egQWUb0fYZ8//kCG+Q5MGpb49Hir9zDrPfMABWXULaqIAk ZGM2Rcm3nZmX4l1pblOJtVC+lQ6vLAQ= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AInr+zyd; spf=pass (imf29.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681317773; a=rsa-sha256; cv=none; b=xFFxhd6bhIoEMsichMq/KqpQ5VfRYNQjsiyq2kQq1ufBzLKQ4Cx/vqJXlbDwzbmDXhej/6 jRpXCDTRdbl62/BPZizwpX7HbflQiCWn7sYeeda7JawO1vHbYH+GvK6eRYQrtBkL+fIhMc MQiQVzVCfXe6lj4McyhyHq2k1arSOsY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681317773; 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=gEk7ts1lThyIvIfCL1IGZ4lKytmWVdDqEngQ3sxu8hg=; b=AInr+zydDLv8KMf+jGQgonCp27sa1TKqUvsKDrHUtdAD0hrlki7HnW2rXk/IkuYPMBia6f oDFjCD+3ern908DcmOUg5gQmHHsPkP6bnoxU/gZjyLvpCm/CNj/wG1qUTZZsRyE2XOgzVg /6OqPqtIGK7oHSmA4rpZ1LFGM1FK2/o= 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-586-Pfpinnu6Mx-tXQ2b0d0P-g-1; Wed, 12 Apr 2023 12:42:52 -0400 X-MC-Unique: Pfpinnu6Mx-tXQ2b0d0P-g-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-74acb477be6so2296785a.1 for ; Wed, 12 Apr 2023 09:42:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681317768; x=1683909768; 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=gEk7ts1lThyIvIfCL1IGZ4lKytmWVdDqEngQ3sxu8hg=; b=aouhSdmg4g29yyWTgh5SG3OSIO6apaYysyBF0+VdHNDPXWpVFi9tIwQI3F1k/lteOe 7/xGra7+7nin1yGc1UzRoah+liOCL6KvYga/ThRS4kKGyX0S9Cztj2MAAJr9hqMkbmap ARoIuW84mDBEpXI4BtqUL08awgvdZGgInBvmbs/AY08vnr867zUllZyg5NMjgD6scURs Jei92kslb7YxzT23oulRb6u0uWwTCQeKlzRMFUncIQjtLeMbb++h0ckF1IUHRVf3NGND ZJ0IixhGbs9xLdGu+BqSLUbjV9Mopt1BmISDiW+9UtlaGx+V2jsbDsTyDeBsBpsVyBnx YSqQ== X-Gm-Message-State: AAQBX9dI9MuN905EVkU9nszQquyBepPYi4tBCOfWvdb99pwrWMFj3jTd 3yDw5ac/cLg57zphoVnL+4F2Q17kobLExGRuf89D761CR/xzETfvw1MUAkCrIoRUw9C/wJCjtOL ynhEbIEDTWPeUdJ0v8RQ= X-Received: by 2002:a05:6214:4002:b0:5ac:463b:a992 with SMTP id kd2-20020a056214400200b005ac463ba992mr4598510qvb.0.1681317767835; Wed, 12 Apr 2023 09:42:47 -0700 (PDT) X-Google-Smtp-Source: AKy350a0pJ+/tI/6Rg99Rlojds2/BsXxwj8wuO3kxU6T8U2AdUZsBRqUPHcEr1eIDqvTv36rahRGqw== X-Received: by 2002:a05:6214:4002:b0:5ac:463b:a992 with SMTP id kd2-20020a056214400200b005ac463ba992mr4598491qvb.0.1681317767536; Wed, 12 Apr 2023 09:42:47 -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 oe6-20020a056214430600b005e16003edc9sm4882592qvb.104.2023.04.12.09.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 09:42:46 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Andrew Morton , Andrea Arcangeli , Mike Kravetz , Nadav Amit , David Hildenbrand , Mike Rapoport , Axel Rasmussen , Leonardo Bras Soares Passos , peterx@redhat.com, Mike Rapoport Subject: [PATCH v2 13/31] selftests/mm: Split uffd tests into uffd-stress and uffd-unit-tests Date: Wed, 12 Apr 2023 12:42:44 -0400 Message-Id: <20230412164244.328270-1-peterx@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230412163922.327282-1-peterx@redhat.com> References: <20230412163922.327282-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Stat-Signature: juhyaneihqbcmx5nrrszbqkjjjmdok5w X-Rspam-User: X-Rspamd-Queue-Id: B119912000E X-Rspamd-Server: rspam06 X-HE-Tag: 1681317773-372183 X-HE-Meta: U2FsdGVkX19/8VSEqyWRFElji+zbQGd3t9Z/WA7CwyUz8K99VtanxZJFPsNzMAoqPsXorOG9QbcTSM54Rr3Kk9PQnHvX+KwHaBcCCVFj8G9h+6xO+AU3wtnc2IQx0Y8B72uemA/4Te7sCD6uekwJWJWb+sv3D35R7KBhSWw5TiCbPvF/DYLvKeKOa/9D84HTxIYpk78znUr27QXri8v3DeCcfZzPAhSq5EXNn7Y7dMUxwjFl38r8bIUkM0+n+6dadcC/RVwWJfl6tPqj2yQNKpfFK5fxT3C0FLZHSmvuE3uAqskH9csTOhQ1qXaS+8Z9mWSTyyaLWtwmFnB+hr5dUhZbKv6wRPevYYknHsGvQbgxoNO5HeLwlzy0byjvJ2b56cwYC69ZaFeaX2Wcozm8KI5Oi2DQpQLrmInfy8f269iofDFLTQ6o3+HVM7cQvDYYZMm4d9+DC3jURkKQic+0gFSx54z21m0WP36QedBbZtymwVbJJAdIchHxcXLDyyamjfezPU3xmPiXs0osHFdRbmLV5ON/HeQcr3mjb6UM5wCBh6EAeF84CLkwrRYZCiTsP7mszpSWR5PN9X40wHPt2XFihOH2PSk5FFveIbXhqzTyv2EXB6Fjz+lMcrnHwv6xIUAYFSRWI7VRXL6Z7ZosuOlJucI88ZOwCsqsDFcBjBjnwVF3jhlW0zAEopvHQJ6f/nh/FKXiZ1c8Hu06+A3M8hLueQSHAtELh254zxhejjJsLe1dZRxrPnkmWYlgyQJBarHQHF17vyK5hRpzZpn5h11E++lsJWVmeJCM3iDOEOyUrhO9irrDaQAiwX6RZMMSALLdQZZKSTzcEFDhny1UpVqtuN3UXS8aU5bn3dn45bZv5TZzkdHx5l4AcnUFNIucS0i/uWWqEW0zIH6aw/vnMfprg5hsY893uASGKVLjbqghvab63F5MtawfyOKuZeOZdI1roqT9hJJnIELQEzP R62dLSle k6C55rT/CWH/spLFE6YgLbPlLTKKZCS5edVbCSp9an/+UfGljKM3h9XtEXPtD6veaIEOueH18nyZNFfkAG+TEOE5/CRwP1W7xXmTcyARK3g+3VUswml2wkGY4hJc4tpjvwU8SYnpDtE3Ck6hDJNoWHQs9YU+/P/opJNkGNYzWuDFny/6Lb52F+lPhK4yqqT4YbkgjzbVTPrgq90YZxSjJavlfPAE8qQu6YHhB9Y+T1e/Xj/GkVAgVceOXyyjBQba5BgvJ3E1sTRX6ahpj/inOoeBaOOlIp2pkgAUhr9EOvi722eVyFew2wqNEYLQwkk0WvaeOYxqqV54YGiD8yBu+Au8CpSxA2BDGrKuzAKtgMmRk+BhDTmNu6km0AcZPboBLR4uhUP2MAlgoFDDKah0T75cHsrYcYxud8vDuyf773xNTOBfBcTmdvKrvcs67EZedmZELeILYtCtNV7kyBCUUez3tC0DatZZgekIh1M6qkF1MvQ5phusXj3rCvbhOlYZ2z8rs6u9oJl+TCjXOi0Wu5ylUaRh9O6ue01o3 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. Reviewed-by: Mike Rapoport (IBM) Signed-off-by: Peter Xu Reviewed-by: Axel Rasmussen --- 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 36467c15ca00..5a3434419403 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 @@ -57,7 +57,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 @@ -108,7 +109,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 ddf40f883747..efe22dc569f0 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 */