From patchwork Wed May 31 22:08:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 101600 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3215138vqr; Wed, 31 May 2023 15:25:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4zkoreVceE0oK1euvfxhjhQphABkqMjuFh84b1b0rIK4LKvSqpz3vfkkN90hMmgVqZdn5K X-Received: by 2002:a05:6830:2094:b0:6af:7e7e:d7b with SMTP id y20-20020a056830209400b006af7e7e0d7bmr3904937otq.15.1685571953021; Wed, 31 May 2023 15:25:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685571952; cv=none; d=google.com; s=arc-20160816; b=VkOAvIC9y4J1oUE9jM/mkndxr52vCRGQgpWcMQKQADDRDjMoxU2avEFvdNlk7rh6VB T1XzlSGVFwOpdktvKSnGSP17vlcDVDtqslOih19ygAXZJ6BxqC1xsE9P4zVDElMxSMrn Lcs41rCVMxWzOd5ljCbsrBqQxSRiCV2Kkj7V8SSJZtt7z+mbn9MTkOm7Jq0HnvPW++Rh 00LP/WwIMjc1UgeWLIHKvw0l2jwAoArKVMo6gl+WaE+PPKxCoCQ7ygN7U33IlkzJei3Z rrErkqunTpF8ducMX2x/hEPUZUQf5NDneokUWRk1LwzW3IVox3PU+Y5+w4r5MNxce1in skEw== 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=pDm/ZCxPHx9AYeeJr9uyqvYyWstDuMZWrpU9WcV6+zY=; b=pXHx8/jWgJowm0fLhIpL4mf3qa0unyDtuV4Z4DYbA4vqFFmT1kBDQy9X3eXrdw9jbh EDcGW9Pb3mSqcHTOfzC43ld/uB9euBr3i0GebTd5ye7YLYT1Jd6cAiwxj3xQDyHjbNgb ouDcXWSBEFAhNKYd63GpkYb21lkV7NDQssiA9y630dPMofZjA9Z73ak1KGZOCE+L6Zms ndS8VGKUlk+QnbErrZbxCflNm2ykJaeeRQmarPMRZJitW0y3ZUjJfV6+1lJWWsq15qDE 3v9gGstj4Smq4P/e2yc0TANFQvPSqERhpQOtl+xiz3lT50lqrcMf8Ca9+daxuDIRxoEi pcAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=qw8bed+Y; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a185-20020a624dc2000000b0063d5f645cacsi4414787pfb.116.2023.05.31.15.25.39; Wed, 31 May 2023 15:25:52 -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=@joelfernandes.org header.s=google header.b=qw8bed+Y; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230467AbjEaWJA (ORCPT + 99 others); Wed, 31 May 2023 18:09:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230443AbjEaWIr (ORCPT ); Wed, 31 May 2023 18:08:47 -0400 Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFD1B1A1 for ; Wed, 31 May 2023 15:08:23 -0700 (PDT) Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-62614f2eee1so2369846d6.0 for ; Wed, 31 May 2023 15:08:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1685570902; x=1688162902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pDm/ZCxPHx9AYeeJr9uyqvYyWstDuMZWrpU9WcV6+zY=; b=qw8bed+Y5biDzHP7EfFtKZs57yNm2Xtw56wpbBOlZcJdMjQ/zNwrMclm47nOYNozFu tlAKh71SIC64nmj5L4aBGSYN+57DOusiaJrtitM4FMj4SCLpKTOJ+7N14sse+z9nRXxf Dfx6iFxi0M2RgWN7VIDJsMRJrYyRrNwtzkiXM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685570902; x=1688162902; 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=pDm/ZCxPHx9AYeeJr9uyqvYyWstDuMZWrpU9WcV6+zY=; b=Z7Lpr/5gQRroPLms5TY9sFFPq8mQQO79Q3uaP8A1xW2DCHgodVWRGVSOmjo4iXxIsj W8HG1F5KLU4Isc2fcjCMMZm6ChpayTDrng6OHlpDUIobfl89mcpoYAIStqX3TmprC3lT McSdVLuYJBIG0fL8QlqmS7f15nh+HE5J8AfleSIszhDYPrvHbhB0GOwynmxbwDXjAM7l +UGoU0SX1BhTbLFy2EBjR1qkYYuCsrEPYIv4JtLNc4q1j/VZgAto/xzu5l9YYszN74cG g9b+vUmwEis04RxEvDR6VEmrUKqosu4F0XvSdxm7FyIkoZA/poy356v46F20eGMc1Lri 3K/A== X-Gm-Message-State: AC+VfDwjHQHivGrc5CEQisPCfLwD8RWD18P8F6iJP8gxit6UNzJZIV9W 3TPh3pU6CiRdhv5ZiJ1o3mmvzrbV4fi5sTbybt8= X-Received: by 2002:a05:6214:20a9:b0:626:1052:20f3 with SMTP id 9-20020a05621420a900b00626105220f3mr8694018qvd.18.1685570902568; Wed, 31 May 2023 15:08:22 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id f2-20020ac87f02000000b003f6b0f4126fsm6666172qtk.8.2023.05.31.15.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 15:08:21 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra , Vineeth Pillai Subject: [PATCH v4 6/7] selftests: mm: Add a test for remapping within a range Date: Wed, 31 May 2023 22:08:06 +0000 Message-ID: <20230531220807.2048037-7-joel@joelfernandes.org> X-Mailer: git-send-email 2.41.0.rc2.161.g9c6817b8e7-goog In-Reply-To: <20230531220807.2048037-1-joel@joelfernandes.org> References: <20230531220807.2048037-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767450296238882414?= X-GMAIL-MSGID: =?utf-8?q?1767450296238882414?= Move a block of memory within a memory range. Any alignment optimization on the source address may cause corruption. Verify using kselftest that it works. I have also verified with tracing that such optimization does not happen due to this check in can_align_down(): if (!for_stack && vma->vm_start != addr_to_align) return false; Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 79 +++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index d7366074e2a8..f45d1abedc9c 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -23,6 +23,7 @@ #define VALIDATION_NO_THRESHOLD 0 /* Verify the entire region */ #define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) +#define SIZE_MB(m) ((size_t)m * (1024 * 1024)) struct config { unsigned long long src_alignment; @@ -226,6 +227,79 @@ static void mremap_expand_merge_offset(FILE *maps_fp, unsigned long page_size) ksft_test_result_fail("%s\n", test_name); } +/* + * Verify that an mremap within a range does not cause corruption + * of unrelated part of range. + * + * Consider the following range which is 2MB aligned and is + * a part of a larger 10MB range which is not shown. Each + * character is 256KB below making the source and destination + * 2MB each. The lower case letters are moved (s to d) and the + * upper case letters are not moved. The below test verifies + * that the upper case S letters are not corrupted by the + * adjacent mremap. + * + * |DDDDddddSSSSssss| + */ +static void mremap_move_within_range(char pattern_seed) +{ + char *test_name = "mremap mremap move within range"; + void *src, *dest; + int i, success = 1; + + size_t size = SIZE_MB(20); + void *ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (ptr == MAP_FAILED) { + perror("mmap"); + success = 0; + goto out; + } + memset(ptr, 0, size); + + src = ptr + SIZE_MB(6); + src = (void *)((unsigned long)src & ~(SIZE_MB(2) - 1)); + + /* Set byte pattern for source block. */ + srand(pattern_seed); + for (i = 0; i < SIZE_MB(2); i++) { + ((char *)src)[i] = (char) rand(); + } + + dest = src - SIZE_MB(2); + + void *new_ptr = mremap(src + SIZE_MB(1), SIZE_MB(1), SIZE_MB(1), + MREMAP_MAYMOVE | MREMAP_FIXED, dest + SIZE_MB(1)); + if (new_ptr == MAP_FAILED) { + perror("mremap"); + success = 0; + goto out; + } + + /* Verify byte pattern after remapping */ + srand(pattern_seed); + for (i = 0; i < SIZE_MB(1); i++) { + char c = (char) rand(); + + if (((char *)src)[i] != c) { + ksft_print_msg("Data at src at %d got corrupted due to unrelated mremap\n", + i); + ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, + ((char *) src)[i] & 0xff); + success = 0; + } + } + +out: + if (munmap(ptr, size) == -1) + perror("munmap"); + + if (success) + ksft_test_result_pass("%s\n", test_name); + else + ksft_test_result_fail("%s\n", test_name); +} + /* * Returns the start address of the mapping on success, else returns * NULL on failure. @@ -491,6 +565,7 @@ int main(int argc, char **argv) unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests = 2; + int num_misc_tests = 1; struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; @@ -572,7 +647,7 @@ int main(int argc, char **argv) (threshold_mb * _1MB >= _1GB); ksft_set_plan(ARRAY_SIZE(test_cases) + (run_perf_tests ? - ARRAY_SIZE(perf_test_cases) : 0) + num_expand_tests); + ARRAY_SIZE(perf_test_cases) : 0) + num_expand_tests + num_misc_tests); for (i = 0; i < ARRAY_SIZE(test_cases); i++) run_mremap_test_case(test_cases[i], &failures, threshold_mb, @@ -590,6 +665,8 @@ int main(int argc, char **argv) fclose(maps_fp); + mremap_move_within_range(pattern_seed); + if (run_perf_tests) { ksft_print_msg("\n%s\n", "mremap HAVE_MOVE_PMD/PUD optimization time comparison for 1GB region:");