Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1250731pxp; Thu, 17 Mar 2022 06:08:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQtnzUKTxbkhubiNbB/dx/pHPakXPCk10H/xU2NW5hL2dvAqGLicmXfRCJ+U6ASRdB+4bH X-Received: by 2002:a17:906:80d2:b0:6db:40bf:892c with SMTP id a18-20020a17090680d200b006db40bf892cmr4320892ejx.726.1647522493192; Thu, 17 Mar 2022 06:08:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647522493; cv=none; d=google.com; s=arc-20160816; b=JRvBqLzIkfoBYLWAmc3xTeWFTDk8AK666TuceA9gMsgvrcVgF4MMJkvlU638379CQU DNZ/5qLZ0ZGfKHYwOC9i6k+Pt+lebJAMMq0fLcNPray05/lcQOFsG9lcDc2MWDa6jroc F5awcVtb8sCjRMFcl3sa6pMOiV+5TScMos9DiR15jKbP9sJwAg6uxmBf4EanxIy/takp Ds4/IrEylI08V1FxjZRnbsnHXm/7UW+rnEd/tSXPdOK+fifPTMhiEYGPviV0XlFyzo0e ODSkZIgvY1OOBtZS0FjlQy0WfDzEPzVvl1W7pvDDIBkHRs7BZ8/WXIYkz/n8UzIV/f/p 0GtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KIwBDdTs58V74GC+kgUig3XnbSvk579fI61O0N0oM1Q=; b=F8Josnj+mjNibqU3hW0Iz/d8bF6I69svkzckPGoZesjdfQ1Yo/qVJFpdxqPpLZK31s BWfNPqt8GJS+5zTv/MFqyt9hRLRK7fvVDswMIYcZE++iLh06qeeQ7nZ2e5uZcjMlAU6n 9eyiYEKzdhCc7qagKDFNcCPsyNP8JNdGZyeXPbWWYmPKYQJt6uIvPGy9me7xxW1J83v3 1TTtxwe0BO7W2Ir/K/fTVE2afSg8bdrnB21VDKvhfxfV0DjmOZQKQJNc4lpPimBRImRq I5nDeAkarXkq/N2NCzGke7B0JdCIv5Ym1kUKWBC/Sfk1HJ6UEoflFk3ybs3xnX806zZV yRFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jFH5ZndP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h7-20020a50c387000000b00418ef140f1csi1563558edf.502.2022.03.17.06.07.47; Thu, 17 Mar 2022 06:08:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jFH5ZndP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232616AbiCQKf0 (ORCPT + 99 others); Thu, 17 Mar 2022 06:35:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232615AbiCQKfT (ORCPT ); Thu, 17 Mar 2022 06:35:19 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1040BE6160; Thu, 17 Mar 2022 03:34:03 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: usama.anjum) with ESMTPSA id 7D6511F44CCB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1647513241; bh=rI9DZ9jsH6eaZI5FatE4QcNepkJ88+Mje76GPlYvw8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jFH5ZndPzsVi2tZw5UDkJLE1ixNvmShub6JnU23RGhysdZD2I/pLBby5g3s5LtBDh H8x0XFC9jcOeiFSWeNfSCgkqWpj0gdom4elq0xw/0Yn6q2rkPYhtbEa0blIiylvJSE w1HcAAaHnCyua7D2oLxOVrUGyhMjXCZnrOY+XWy8RflvKcTmiFIkVWdU4YbXBSzUp3 wUHbZ8pAF6ttmAEkZaIEtEKQjeIlq/tCzVzRrASGCU1as72E9E2Kehj7eRFm6nz/n5 9SpiS9s7l15/4lYdwU2wnoInspfRsCfDCrUJtGDnQUq6L73F+YNLpoHenXo8ldva8o GYZm3Fv71dFTw== From: Muhammad Usama Anjum To: Andrew Morton , Shuah Khan Cc: Gabriel Krisman Bertazi , usama.anjum@collabora.com, kernel@collabora.com, david@redhat.com, Will Deacon , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH V5 2/2] selftests: vm: Add test for Soft-Dirty PTE bit Date: Thu, 17 Mar 2022 15:33:22 +0500 Message-Id: <20220317103323.94799-2-usama.anjum@collabora.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220317103323.94799-1-usama.anjum@collabora.com> References: <20220317103323.94799-1-usama.anjum@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gabriel Krisman Bertazi This introduces three tests: 1) Sanity check soft dirty basic semantics: allocate area, clean, dirty, check if the SD bit is flipped. 2) Check VMA reuse: validate the VM_SOFTDIRTY usage 3) Check soft-dirty on huge pages This was motivated by Will Deacon's fix commit 912efa17e512 ("mm: proc: Invalidate TLB after clearing soft-dirty page state"). I was tracking the same issue that he fixed, and this test would have caught it. Cc: Will Deacon Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Muhammad Usama Anjum --- Andrew has dropped the V3 of this patch. Changes in V5: - Correct indentation of macros - Tested by reverting 912efa17e512 and one sub test failed - Updated the writing values to the memory and added a comment Changes in V4: Cosmetic changes Removed global variables Replaced ksft_print_msg with ksft_exit_fail_msg to exit the program at once Some other minor changes Correct the authorship of the patch Tests of soft dirty bit in this patch and in madv_populate.c are non-overlapping. madv_populate.c has only one soft-dirty bit test in the context of different advise (MADV_POPULATE_READ and MADV_POPULATE_WRITE). This new test adds more tests. Tab width of 8 has been used to align the macros. This alignment may look odd in shell or email. But it looks alright in editors. Test output: TAP version 13 1..5 ok 1 Test test_simple ok 2 Test test_vma_reuse reused memory location ok 3 Test test_vma_reuse dirty bit of previous page ok 4 Test test_hugepage huge page allocation ok 5 Test test_hugepage huge page dirty bit # Totals: pass:5 fail:0 xfail:0 xpass:0 skip:0 error:0 Or TAP version 13 1..5 ok 1 Test test_simple ok 2 Test test_vma_reuse reused memory location ok 3 Test test_vma_reuse dirty bit of previous page ok 4 # SKIP Test test_hugepage huge page allocation ok 5 # SKIP Test test_hugepage huge page dirty bit # Totals: pass:3 fail:0 xfail:0 xpass:0 skip:2 error:0 Changes in V3: Move test to selftests/vm Use kselftest macros Minor updates to make code more maintainable Add configurations in config file V2 of this patch: https://lore.kernel.org/lkml/20210603151518.2437813-1-krisman@collabora.com/ --- tools/testing/selftests/vm/.gitignore | 1 + tools/testing/selftests/vm/Makefile | 2 + tools/testing/selftests/vm/config | 2 + tools/testing/selftests/vm/soft-dirty.c | 146 ++++++++++++++++++++++++ 4 files changed, 151 insertions(+) create mode 100644 tools/testing/selftests/vm/soft-dirty.c diff --git a/tools/testing/selftests/vm/.gitignore b/tools/testing/selftests/vm/.gitignore index d7507f3c7c76a..3cb4fa771ec2a 100644 --- a/tools/testing/selftests/vm/.gitignore +++ b/tools/testing/selftests/vm/.gitignore @@ -29,5 +29,6 @@ write_to_hugetlbfs hmm-tests memfd_secret local_config.* +soft-dirty split_huge_page_test ksm_tests diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index 4e68edb26d6b6..f25eb30b5f0cb 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -47,6 +47,7 @@ TEST_GEN_FILES += on-fault-limit TEST_GEN_FILES += thuge-gen TEST_GEN_FILES += transhuge-stress TEST_GEN_FILES += userfaultfd +TEST_GEN_PROGS += soft-dirty TEST_GEN_PROGS += split_huge_page_test TEST_GEN_FILES += ksm_tests @@ -92,6 +93,7 @@ KSFT_KHDR_INSTALL := 1 include ../lib.mk $(OUTPUT)/madv_populate: vm_util.c +$(OUTPUT)/soft-dirty: vm_util.c $(OUTPUT)/split_huge_page_test: vm_util.c ifeq ($(MACHINE),x86_64) diff --git a/tools/testing/selftests/vm/config b/tools/testing/selftests/vm/config index 60e82da0de850..be087c4bc3961 100644 --- a/tools/testing/selftests/vm/config +++ b/tools/testing/selftests/vm/config @@ -4,3 +4,5 @@ CONFIG_TEST_VMALLOC=m CONFIG_DEVICE_PRIVATE=y CONFIG_TEST_HMM=m CONFIG_GUP_TEST=y +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_MEM_SOFT_DIRTY=y diff --git a/tools/testing/selftests/vm/soft-dirty.c b/tools/testing/selftests/vm/soft-dirty.c new file mode 100644 index 0000000000000..3153ebac6909b --- /dev/null +++ b/tools/testing/selftests/vm/soft-dirty.c @@ -0,0 +1,146 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include +#include "../kselftest.h" +#include "vm_util.h" + +#define PAGEMAP_FILE_PATH "/proc/self/pagemap" +#define TEST_ITERATIONS 10000 + +static void test_simple(int pagemap_fd, int pagesize) +{ + int i; + char *map; + + map = aligned_alloc(pagesize, pagesize); + if (!map) + ksft_exit_fail_msg("mmap failed\n"); + + clear_softdirty(); + + for (i = 0 ; i < TEST_ITERATIONS; i++) { + if (pagemap_is_softdirty(pagemap_fd, map) == 1) { + ksft_print_msg("dirty bit was 1, but should be 0 (i=%d)\n", i); + break; + } + + clear_softdirty(); + // Write something to the page to get the dirty bit enabled on the page + map[0] = i % 255; + + if (pagemap_is_softdirty(pagemap_fd, map) == 0) { + ksft_print_msg("dirty bit was 0, but should be 1 (i=%d)\n", i); + break; + } + + clear_softdirty(); + } + free(map); + + ksft_test_result(i == TEST_ITERATIONS, "Test %s\n", __func__); +} + +static void test_vma_reuse(int pagemap_fd, int pagesize) +{ + char *map, *map2; + + map = mmap(NULL, pagesize, (PROT_READ | PROT_WRITE), (MAP_PRIVATE | MAP_ANON), -1, 0); + if (map == MAP_FAILED) + ksft_exit_fail_msg("mmap failed"); + + clear_softdirty(); + + /* Write to the page before unmapping and map the same size region again to check + * if same memory region is gotten next time and if dirty bit is preserved across + * this type of allocations. + */ + map[0]++; + + munmap(map, pagesize); + + map2 = mmap(NULL, pagesize, (PROT_READ | PROT_WRITE), (MAP_PRIVATE | MAP_ANON), -1, 0); + if (map2 == MAP_FAILED) + ksft_exit_fail_msg("mmap failed"); + + ksft_test_result(map == map2, "Test %s reused memory location\n", __func__); + + ksft_test_result(pagemap_is_softdirty(pagemap_fd, map) != 0, + "Test %s dirty bit of previous page\n", __func__); + + munmap(map2, pagesize); +} + +static void test_hugepage(int pagemap_fd, int pagesize) +{ + char *map; + int i, ret; + size_t hpage_len = read_pmd_pagesize(); + + map = memalign(hpage_len, hpage_len); + if (!map) + ksft_exit_fail_msg("memalign failed\n"); + + ret = madvise(map, hpage_len, MADV_HUGEPAGE); + if (ret) + ksft_exit_fail_msg("madvise failed %d\n", ret); + + for (i = 0; i < hpage_len; i++) + map[i] = (char)i; + + if (check_huge(map)) { + ksft_test_result_pass("Test %s huge page allocation\n", __func__); + + clear_softdirty(); + for (i = 0 ; i < TEST_ITERATIONS ; i++) { + if (pagemap_is_softdirty(pagemap_fd, map) == 1) { + ksft_print_msg("dirty bit was 1, but should be 0 (i=%d)\n", i); + break; + } + + clear_softdirty(); + // Write something to the page to get the dirty bit enabled on the page + map[0] = i % 255; + + if (pagemap_is_softdirty(pagemap_fd, map) == 0) { + ksft_print_msg("dirty bit was 0, but should be 1 (i=%d)\n", i); + break; + } + clear_softdirty(); + } + + ksft_test_result(i == TEST_ITERATIONS, "Test %s huge page dirty bit\n", __func__); + } else { + // hugepage allocation failed. skip these tests + ksft_test_result_skip("Test %s huge page allocation\n", __func__); + ksft_test_result_skip("Test %s huge page dirty bit\n", __func__); + } + free(map); +} + +int main(int argc, char **argv) +{ + int pagemap_fd; + int pagesize; + + ksft_print_header(); + ksft_set_plan(5); + + pagemap_fd = open(PAGEMAP_FILE_PATH, O_RDONLY); + if (pagemap_fd < 0) + ksft_exit_fail_msg("Failed to open %s\n", PAGEMAP_FILE_PATH); + + pagesize = getpagesize(); + + test_simple(pagemap_fd, pagesize); + test_vma_reuse(pagemap_fd, pagesize); + test_hugepage(pagemap_fd, pagesize); + + close(pagemap_fd); + + return ksft_exit_pass(); +} -- 2.30.2