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 97AEEC83F2C for ; Tue, 5 Sep 2023 06:49:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F08F8E001F; Tue, 5 Sep 2023 02:49:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A03D8E001A; Tue, 5 Sep 2023 02:49:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EAB0E8E001F; Tue, 5 Sep 2023 02:49:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DAEB78E001A for ; Tue, 5 Sep 2023 02:49:02 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A4D1240A7C for ; Tue, 5 Sep 2023 06:49:02 +0000 (UTC) X-FDA: 81201616524.05.D7BC367 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by imf19.hostedemail.com (Postfix) with ESMTP id BEC521A0017 for ; Tue, 5 Sep 2023 06:49:00 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=QgPjBL4n; spf=pass (imf19.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.208.179 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693896540; a=rsa-sha256; cv=none; b=VEI0oxFCHQuOLpbjMFOJxXWD9uEWvsM+9AJASAviIU/FFIQX6bvnygNOYUK14hfmBTiEQE DWTdqHAVxzcsadlpGApUkx6z4xAUCuV8c2JdTgJmBvW1xR2Do94V+i6h1U40aQMGQH1WaV Lmb1f1i+nkaQapa0mSIWw4lMnMuinWU= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=QgPjBL4n; spf=pass (imf19.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.208.179 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693896540; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=L0V9fvZ6KeiIyqTMjNId9LoUH5rIq4jr71Tfkw0JRCI=; b=m3ztz+6YjheBUHuDKEE7HxF3LUcEeIfF8hssLLfBRIl0T9bRja4u9WY2S3zXMNG/fJ4509 5CCucB8ujQZWLw45BNmIJ6vpVlt+F14fJST8jMZmoi3cYZD8WO7vUwr+O2uhDsftL+fWts 3D+uxy6DqJfJ1RK1ODYTaHFLNN2gA+s= Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2bcde83ce9fso34987561fa.1 for ; Mon, 04 Sep 2023 23:49:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693896539; x=1694501339; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=L0V9fvZ6KeiIyqTMjNId9LoUH5rIq4jr71Tfkw0JRCI=; b=QgPjBL4nArY5G9gEITtNP5DH7ISaXfdJfJ5QGU/21CAR4eFia+rqIdKlZmYKA+jWSN QKW5xdGX57fNDuCWqxefJDUebXst9pVSFjkl+7grxqWg9xOMXYUnsEjI2ItQaGRCZtv8 9BKLcpDlAkmgwuFVZVjFxG5S4u/z11yXp5DA2J/SNYTVw+Yi31ZwI/OCerIUHSahdnfx 4VAc3ne7uv3nlgK8lBED8lh1L9GAkZFxBXxiBHsYYWTGouUPQmkuJgek+RjWXrTddkc9 +rFmkRSvUwH94rc+yYwhXOKYa0zbpVWHilmwWFbkqLC1smzI665RTFbuVZA1PFtvr2K2 vrfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693896539; x=1694501339; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=L0V9fvZ6KeiIyqTMjNId9LoUH5rIq4jr71Tfkw0JRCI=; b=f3pHQW5tl3AVIs4CBgOvzRFIgyUzTy7HJf4WUsZHqUcRB7G8VnHEDh8AuizMaBYwzP M4dgYavHiQB4bTlPV1b5uIlwiMjwCvkSveL+OnmYrbcCjVpqOemtJOhbPWczlfwgJKvM okbFYE6jNpcXDgjBtP4Eh4dyRGHAnQf4SIuAW6AWFiBiYPfYEJFnMEqiroU3/mLTzARP +R90nqTTLa+3h4vA45vRnD1LSB29GVBGhsF2YeV/Eacw0IaMn5pwbspmkccGmAiqwwbO 90T4bncJhrlniv7jXel2c6shvSSsYNqVM76C8oZ0e60wzvTMLVIARdpRap8DtMRD9LmZ DG5g== X-Gm-Message-State: AOJu0Yx2cc241vdi4MIIfzukLeKqItcf70ZBumliP6HYy/QVUwHsFam7 JZgxRQrtxTSDVdklaq7knHI= X-Google-Smtp-Source: AGHT+IF8sEXakLG1Yc8xpCvA0ZI2StCmnPPaa0d4wXFMXAAo9DHrNczicfwS81JFM8/vCSoY3isvcQ== X-Received: by 2002:a2e:965a:0:b0:2bc:fe17:693c with SMTP id z26-20020a2e965a000000b002bcfe17693cmr8406328ljh.30.1693896538583; Mon, 04 Sep 2023 23:48:58 -0700 (PDT) Received: from localhost ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.gmail.com with ESMTPSA id r12-20020adfce8c000000b00317afc7949csm16373092wrn.50.2023.09.04.23.48.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 23:48:57 -0700 (PDT) Date: Tue, 5 Sep 2023 07:48:56 +0100 From: Lorenzo Stoakes To: "Joel Fernandes (Google)" Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: Re: [PATCH v6 6/7] selftests: mm: Add a test for remapping within a range Message-ID: <2bc8a939-5d98-4129-9cc7-ff6c8aa8493e@lucifer.local> References: <20230903151328.2981432-1-joel@joelfernandes.org> <20230903151328.2981432-7-joel@joelfernandes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230903151328.2981432-7-joel@joelfernandes.org> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: BEC521A0017 X-Stat-Signature: c1ptzc4h7wpe4o3ckbt9ti8j3cy88733 X-Rspam-User: X-HE-Tag: 1693896540-893762 X-HE-Meta: U2FsdGVkX19bWYPxbVehotIKcKvYsQohuB611kcOyGVrgYOS3Wkkp/TekIHdaVsfN0oq3o3F1deHBupm+kR1ZlPpxmrZmMfkmv04Q/96RhL7GjQxsXlFTznQwf54UVlh5BaCedbTfsbx+Z4UKR77xxYsrm6G5g7dqXHqDM86w3wXS8G+lWMmyEcINHSv7mLkZ/Rp1UaYHwAAQylXV+ZHQ8lGZRcgpR/MbnHXb8fj4ENipNMgfoBnsEEX6SB1i88sCKnYT6aoiABYSyKQUn9OM2RH8bmoYcoq1FxNhCHPiaIvdkeLapugPukbgIzzBGXuyBM0TwBMR5+1RQN+6myvlf13L7LVdPwPlqSAmPzOj8jIYrg9Mqr8bJ2D/kI6IuUG+B4NOgX6o5XMfvssBj/sOuRKNWfi6a0rR4OxXoDUVD61NsrZLVR8xRfiGMCs8n6bW88kSGQEQ+S8MQR4XAU12nFH4M8j/qowqoHtID9GAzZT9epdMkxcPfBeROw+kHEur25zLP4t1rO3u8GAFLlwnFDKC0+L9EB2NVJmGybqCQxpot4Pxu57JPCC5VvHTrZjZ/NI7eaab2Spi178fI3MpB31KMNBmQKbgPPCvuKJBVDICkYH53w8Enuxsg18Le1W0FlmtYMDgotlnbXSmXX8FFtk3NWhFAIWyaAT82Yiw0PKt7NIiuL8QaZFiG9VKgaO3LcYP63HxQHRQUos75G8oqMzYMbTOqNgk7T+RszIp9ad7P+NghyKFMGaIJ70Rofdh2dV9LzVewuUPwzCwrIicvAQBNQX0Npz+sAXV2yvpeJjqVcAmHuK+kKRb8RaFvBFlLn3T0h39VGlmgtqV/N4h2CidyDiKbCCeFfMP2n73HR/FPbJXDXbFTRm7sRT7dQeVDD4fcRHNTwgmDIfyEkkNAIh42Y4Y2msABnZqe4/yTqYDWDlieyRTeBxqTaWgrt+jop3WvXhm65f0jT4swK JkkmVnu1 ZBIbEPC5vNY3QZTd5Pdh6QfzCfqPF5QtG2GxEh0v3jk1BR0TbebvwpgpG4Y8xkSIJ0xfOGNxr4s8QGOoPwP6jZwqXboC4YSbXyv7g7SD6XMQ8DWdO4F+lwlPg6Ova9pMF89VmGTkOcokZa1CD7YP349x8WEVXeyuP0HtoqrREgE4TTtRgw4WrQiJbUfP7Yv1VwBHWUXc8eahEJdokdJUR0igi9vqR2er/w7v9ThYLfNtDrchJZr3s2O1l8jrkSII+LK1QISExBmf0K1Tlxd1j7b36ouSJD/83e/tFSsB7v6aDqvmkRb7t9kCJestkUv9ImyiJDVyvP658XhFg/mamJM8TIWSpH0lm0Kkb8tzhYEJMo4vfvCoY9opEif3uPetEmbL8VHdJsfJovhBRiwspXnAo3QyPWCsAWohwyzfLk0S/lfzwiqExoeZolZ2M7b0ImJcoaKPy2FWw++DoojL8yzSurLYK0kVAR0NqatlZh3tKATg2KPIfBjRnzCg7nMIOdte1A38bvennMGhI6yb1adL1cghtp1Yi5Z+8WkZ3m1teXp0= 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: On Sun, Sep 03, 2023 at 03:13:27PM +0000, Joel Fernandes (Google) wrote: > 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..12a095457f4c 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 20MB 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:"); > -- > 2.42.0.283.g2d96d420d3-goog > Looks good to me, nice series in general! Reviewed-by: Lorenzo Stoakes