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 B3824C001DE for ; Mon, 17 Jul 2023 10:32:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C3AC6B0075; Mon, 17 Jul 2023 06:32:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 470578D0001; Mon, 17 Jul 2023 06:32:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 29B5E6B007B; Mon, 17 Jul 2023 06:32:13 -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 195EA6B0075 for ; Mon, 17 Jul 2023 06:32:13 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E970AA04E0 for ; Mon, 17 Jul 2023 10:32:12 +0000 (UTC) X-FDA: 81020738904.11.A32147D Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf19.hostedemail.com (Postfix) with ESMTP id 2FC521A0006 for ; Mon, 17 Jul 2023 10:32:10 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689589931; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OhDfs2rBRxa6sjKAOBnl3G00rvbgCnvO7zVueRIMeN8=; b=EJR3azqyCXmk6xCUE07lHu2Ou0rDwBZ+k4W+OvAb+zNZyJqnjU5Z8QKROo2QWeXYU8FFtG nXG7wrsLf1eM/9LYNW1PYXpevHkBHwQLrZMprF3QGMYz4OIa/QUM8UKI9zbDB0bkKOI/az Q9t3RJ5Kk9qlJVTj2XEdkDgR/EO7BFg= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689589931; a=rsa-sha256; cv=none; b=EYV9KqAtXDmA1PP+Mni70mkXudJ0ZxJiUKVmpMnv95k6i5jmAmSKtwS9uTSgH++RbYI+ob SaQvN9arYJezzAUzuYAk9VQRtVQknfu+3kPPlMhtNFMWu8qePlg9sDhdtE15DHXjUehKRc rqJcGQCW0ZOH6NucYyf8xYb8c4FOa0s= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8D7CE2F4; Mon, 17 Jul 2023 03:32:53 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 930F33F67D; Mon, 17 Jul 2023 03:32:08 -0700 (PDT) From: Ryan Roberts To: "Andrew Morton" , "Shuah Khan" , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , "David Hildenbrand" , "Mark Brown" , "John Hubbard" , "Florent Revest" , Peter Xu Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 2/8] selftests/mm: Skip soft-dirty tests on arm64 Date: Mon, 17 Jul 2023 11:31:46 +0100 Message-Id: <20230717103152.202078-3-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717103152.202078-1-ryan.roberts@arm.com> References: <20230717103152.202078-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2FC521A0006 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: mox8cser4sfahkmxw8i6ep8fx64ypyrj X-HE-Tag: 1689589930-450826 X-HE-Meta: U2FsdGVkX18M9K92mKt6CObmnRAAafkJ835bxlJviEV2Mrg4SApcVWd7Sg1JDVV5P7ha4EzbUZ+xGNLs3eov/7fJb0zQuesh+eqqmabYiy+lS3w4shb/kfKGp+Wm5hVgQm7HyGACdZkfhmpWAfRPiCJTHXO4An0HMz8UwIeloYS7dvhRB2yYpNo541rd8sZZxvRBVtaqhtej1TEsFywyaj0M5Z1HyJuxNfdHsE5Xtps7S9UUY1PsVQfnfY1WH39rnOaztppRIE2toLFBoON8be1zQs8wgpX8OX1H6oPI3OXHEkSuHdnCsrlXKkVNoZoaa+zOQf2q6pyhScrmFZHHUSaqCX2/yuGw6OWr6U5k48+EXdqY7ow1Ay4s3S1EJz7UR6VDsAxWcV1oC7r/bUPC4a0jP7DQM4a1OC4ymmmyjBg/Xs6n3eo2QI0LWAKIOn36/f99JKjgZYPIF3PxLfqxa+zVMn/QuBssnJuiIJMlmV6KwCFJLKLJdbmeF5Tzu2YQv3a5BeHEdQbHKTeGpvtn1ilt9/f3bpbtuu6peRy5zOAK4xiewOvdB8mk7upGKkT/HpXJnrKxDeL04wkA0QHFK/XgDOGCQRQmPhMUNRmvrHda3mhyEmPQQzGFuW0AEDRcDlG9Pb3Oek4eJ1XE0WxDDc9JZpP1BCfA2nNb7z3YslqinUzdAOHSWaX+ztO3XlrYmxppSF9K5Hrc0CYhysQvheAEL6pBqytlBdqOahQ/pg/ql9itI5bh9KbZZ0ECQOAzqpMBo/e9MFzLf2SxoEt5tuOaaE/2Z8RuOLlBOTZ7drbezu4nK3AwW+okHdrJnzy75CElRoIkC33UUkK+Ndu8Xl9xL2FXHvnSNzGlOxHEybKoR5LeTTVnbaXQl2Z99P/atH8lg7uVf4EmkHj5VMCiUcKJlcYztbMeFuxmK/4I6KvzOFwsnv2Zbnet+++PfvfiGd0YdMsFQmpKijTyjeZ cFdJtmcm bTgp+JcRPGaYo11jKc2x4BT+NdB368EZSq79wWFoV9igV0hrDqJyAlIQKSn3aCi2LbTUlDEJPD+pjCTSO9UK4b9fl9kBO8UaKggZ5PdYaovCxRIrBACTv71LeGhV9qbHMI3SJ4x+vl0ASO622u+K/I7lLSh97kHPIsUcN 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: arm64 does not support the soft-dirty PTE bit. However, the `soft-dirty` test suite is currently run unconditionally and therefore generates spurious test failures on arm64. There are also some tests in `madv_populate` which assume it is supported. For `soft-dirty` lets disable the whole suite for arm64; it is no longer built and run_vmtests.sh will skip it if its not present. For `madv_populate`, we need a runtime mechanism so that the remaining tests continue to be run. Unfortunately, the only way to determine if the soft-dirty dirty bit is supported is to write to a page, then see if the bit is set in /proc/self/pagemap. But the tests that we want to conditionally execute are testing precicesly this. So if we introduced this feature check, we could accedentally turn a real failure (on a system that claims to support soft-dirty) into a skip. So instead, do the check based on architecture; for arm64, we report that soft-dirty is not supported. Signed-off-by: Ryan Roberts --- tools/testing/selftests/mm/Makefile | 5 ++++- tools/testing/selftests/mm/madv_populate.c | 26 ++++++++++++++++++++-- tools/testing/selftests/mm/run_vmtests.sh | 5 ++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 66d7c07dc177..3514697fc2db 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -63,12 +63,15 @@ TEST_GEN_PROGS += thuge-gen TEST_GEN_PROGS += transhuge-stress 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 TEST_GEN_PROGS += ksm_functional_tests TEST_GEN_PROGS += mdwe_test +ifneq ($(ARCH),arm64) +TEST_GEN_PROGS += soft-dirty +endif + ifeq ($(ARCH),x86_64) CAN_BUILD_I386 := $(shell ./../x86/check_cc.sh "$(CC)" ../x86/trivial_32bit_program.c -m32) CAN_BUILD_X86_64 := $(shell ./../x86/check_cc.sh "$(CC)" ../x86/trivial_64bit_program.c) diff --git a/tools/testing/selftests/mm/madv_populate.c b/tools/testing/selftests/mm/madv_populate.c index 60547245e479..17bcb07f19f3 100644 --- a/tools/testing/selftests/mm/madv_populate.c +++ b/tools/testing/selftests/mm/madv_populate.c @@ -264,14 +264,35 @@ static void test_softdirty(void) munmap(addr, SIZE); } +static int system_has_softdirty(void) +{ + /* + * There is no way to check if the kernel supports soft-dirty, other + * than by writing to a page and seeing if the bit was set. But the + * tests are intended to check that the bit gets set when it should, so + * doing that check would turn a potentially legitimate fail into a + * skip. Fortunately, we know for sure that arm64 does not support + * soft-dirty. So for now, let's just use the arch as a corse guide. + */ +#if defined(__aarch64__) + return 0; +#else + return 1; +#endif +} + int main(int argc, char **argv) { + int nr_tests = 16; int err; pagesize = getpagesize(); + if (system_has_softdirty()) + nr_tests += 5; + ksft_print_header(); - ksft_set_plan(21); + ksft_set_plan(nr_tests); sense_support(); test_prot_read(); @@ -279,7 +300,8 @@ int main(int argc, char **argv) test_holes(); test_populate_read(); test_populate_write(); - test_softdirty(); + if (system_has_softdirty()) + test_softdirty(); err = ksft_get_fail_cnt(); if (err) diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 3f26f6e15b2a..9e4338aa5e09 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -290,7 +290,10 @@ then CATEGORY="pkey" run_test ./protection_keys_64 fi -CATEGORY="soft_dirty" run_test ./soft-dirty +if [ -x ./soft-dirty ] +then + CATEGORY="soft_dirty" run_test ./soft-dirty +fi # COW tests CATEGORY="cow" run_test ./cow -- 2.25.1