From patchwork Tue Aug 22 01:54:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13360078 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 6AED7EE4996 for ; Tue, 22 Aug 2023 01:55:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F64E940023; Mon, 21 Aug 2023 21:55:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 47BE6940024; Mon, 21 Aug 2023 21:55:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20D91940023; Mon, 21 Aug 2023 21:55:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 05274940021 for ; Mon, 21 Aug 2023 21:55:28 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D221E12017B for ; Tue, 22 Aug 2023 01:55:27 +0000 (UTC) X-FDA: 81150073494.24.5472552 Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) by imf10.hostedemail.com (Postfix) with ESMTP id 1ACBDC0003 for ; Tue, 22 Aug 2023 01:55:25 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b="dcsD/55U"; spf=pass (imf10.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.45 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692669326; 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:dkim-signature; bh=Axho/C2d3GxLBo+LZnFUqjVo2BRyImetugTXkfwiHhM=; b=t9lRs/GYC+XuyldasykcDEGf2dcS5BBtVjZde51P4IVAos+rTS6Z4DCRhcmElN2D+Ap8C6 CFerpQlGXwKMt6DW/adw8z4BnWhCKDbRu8RfHQqLvz/gxBsinDGaa3itoKfNHEjNV8Kolf VBqfpS35cJMMgehXg8z/JE3ql4BD9ak= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692669326; a=rsa-sha256; cv=none; b=xLYMkXkLTNFUy4mfnAA65/Re2yQU1WE+6UenBJHEr+XXZoK9FQ9RBQt0rFdnJqsYyCXUU7 vAyw7P4KJxSdhlsVP/x+N0zplZGWndLFiMR13idxjSWaDz+26u+we8xMVHcY1eJvdWPfku 73/hqEffLs0A7rixakBcONhv1A8X4/o= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b="dcsD/55U"; spf=pass (imf10.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.45 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none Received: by mail-io1-f45.google.com with SMTP id ca18e2360f4ac-7923bae7788so39653239f.1 for ; Mon, 21 Aug 2023 18:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1692669325; x=1693274125; 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=Axho/C2d3GxLBo+LZnFUqjVo2BRyImetugTXkfwiHhM=; b=dcsD/55UXOmDc6JKsWv76PEhXAR+DHegc6mDX9k2Jt5pnmj+7kdpAShITM6SWA8XVM +P0Xr5RhvhwbMxDE/FrWsVMmWu1bcOxe96a9Sj6svTHwHS6oAJLaYFyQ1ynl3xKLRc8F pQ+Bm6+1vG8lQOIPDNwuUzZJIUNfw4RUA4nHM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692669325; x=1693274125; 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=Axho/C2d3GxLBo+LZnFUqjVo2BRyImetugTXkfwiHhM=; b=lX9GJ/rASyudwHPErrR+pwSL4l15PpIGh0VszX+p8B7w+c3nPEvhNSdA58oIG3/zjX /NqAzw61+ertgGPMeMH7S8cPYcrmLD+/Z5ZEX5VSGh5n20+v7XtrkPfpoL1Xh2w+ZxM5 XWleKA2aV1JeEuIiPnr3Iz8VIZvCMm0pg8SeEgTakOgOCQchasUpAsKeJefqShQo0Eie ld7ZU9C71Ev0/7OmUgVAPwFwqUJToj0RBgCor+snwTnhHjKe9xfP+HPQeZ3UAcOCOAgX j36/Pha5IzmGKRrQk+73Zw7my8HsHonnLYBNvY39Sr7/YLvIxo203J+z7WScBZIPUBOG VJmg== X-Gm-Message-State: AOJu0YwIe6oeyz4WWiZe7RXs7SRQysIimikFx5b3uSb+NG2h5lIbWu57 /D3fOjyEEPW/0Dg4k626dGinNQ== X-Google-Smtp-Source: AGHT+IGZXIerY8NUWYReuIPpDpvFlLHcIDml9i8pszriAMC0UzQ9sup1GqyFJEY4NY5BpU4X49RLVw== X-Received: by 2002:a05:6e02:dce:b0:349:a4f8:8815 with SMTP id l14-20020a056e020dce00b00349a4f88815mr9945123ilj.2.1692669325296; Mon, 21 Aug 2023 18:55:25 -0700 (PDT) Received: from joelboxx5.c.googlers.com.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id q11-20020a92d40b000000b0034886587bdcsm2907390ilm.18.2023.08.21.18.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 18:55:24 -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 Subject: [PATCH v5 5/7] selftests: mm: Add a test for remapping to area immediately after existing mapping Date: Tue, 22 Aug 2023 01:54:58 +0000 Message-ID: <20230822015501.791637-6-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230822015501.791637-1-joel@joelfernandes.org> References: <20230822015501.791637-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Stat-Signature: z759mp1fh6sdycc6ykehweppjxpn7jqx X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 1ACBDC0003 X-Rspam-User: X-HE-Tag: 1692669325-689588 X-HE-Meta: U2FsdGVkX18dxzPPHDUVYF52/T8rNK43clepupQODRSq7K4HhZGbGX1ZVjnh6taTVIB8BOvrfIiPTEZyTWsv5zYkgK1X8UNHz2Jkz4/b2uX6SAlm04/rX4rTiIcmksvprAMNy2BsLOqZTe1zoAlR2tUAIvYUMrPdickDQq4Abhepd41ur2l4PP35A/2stPEhXPAMFiJRRIsSjDKkFUAZRXZKkmcky+pvM0hy85R/kC71UHEgI2JZDj1b1qBRSdnu1rMcwrxKBzRxApEalHqEknNb/gqOtcxnKyThMVlj1eorRyxqlNFif2E5MUM9Gft4p2ZMvEx9tNYH/J1o0KXgyZITaRWOJUDjyl2cTvnWpUA0fKRzm3C23xJx6dLPmnOmnvHyn3UkOaZ77Nk93Yb7Ov0+igOSD7SaEuSzmqdhZIwrPsJsZECbf3YuqY6gC8FRycfJsHtspUr6Jau2ClJzPtObvv75EEI+XHT8lfzsIg4EU86tj6+nKB0229rC6e3ds2MQdwyNj7S7CXsLyq1Xmd/1zZSSefR6CPfdfhP8ArwXCtrvtDx9jjD4iQf1OSAqj5HZ0haasXCBByL/JtRXZRsntqrzIgsixIC+bHnvGGH+6SJTe7/EvkBuANkXegbGwaCnRWiKrIAP7iK8cwQS8KjTk2Q9/A+Oky0ZC3Ega+/XOfR7uRZ6KA7XFPArFf6Swp+lnGhpozGC/S4jAh416Wqk5t7uzG82PmRK0T4hn8Ke2ueNH1IMP28SNmUfEMsvq1pNlasgGAcrFS//2cyjGQ05GUK/cGqFDd/3Xl/lNKJFO9LmeXCsNC/kRDN9/spfh/mSOTsKSG7uqiXrsi5Whl/ktfDVgmZJxhD1QKUBxZbPsk7JbV1l+guJTEydTxHfcowkiSvQKSDh+vYsNMD7tpMTjvHqPvI4eVo1gkluQjYBNTj7/INlfbUfOZradFGiysvAjt/l/KfziAARVee Tj+80JhP HybRSkd32qWhQCD6y4NKm4QNyQUn3S3qAD5p/bBKHM2p+dMWN9L0+sD5FrU/mpUazhSHM/gtI2KrxIvdZ5BqlthWU9dCbRg4zh9oGAaoTy7wOfwhvBDbwIxKPoPUH75ab48pA4OpLkux1D7+tg7Ti/mYKfpeMDqERYCZ6h1S5EFX8icZnMU/oIcBCIdeglvdcVB9ynF1XfYbN0K6rUIsfP/4dOakJlDjAwD3LwvTZHR4WMBcqIcrCWdhiLKBctSjkXKxeEWLNVau/mv/8qPqh5AOuZpTqi++uNT5DCYRue1OV7wsJXNRfpJsqN4R8L9ekooVMy87HubTWMqCB/1mgKSTmRTNGh3aNevNOUFKhyT6swKGlOiHs1XKSWsHN57x24M4SsvcSkFAictcjYpHSfip281vwxaa6ZSFYH84gWnFBJ4UOiiH95zOf6DCSOwGXUwB9gbKpZtrTEz/SuGzJ5xNMgQ== 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: This patch adds support for verifying that we correctly handle the situation where something is already mapped before the destination of the remap. Any realignment of destination address and PMD-copy will destroy that existing mapping. In such cases, we need to avoid doing the optimization. To test this, we map an area called the preamble before the remap region. Then we verify after the mremap operation that this region did not get corrupted. Putting some prints in the kernel, I verified that we optimize correctly in different situations: Optimize when there is alignment and no previous mapping (this is tested by previous patch). can_align_down(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 can_align_down(new_vma->vm_start=2f00000, new_addr=2f00000, mask=-2097152): 0 === Starting move_page_tables === Doing PUD move for 2800000 -> 2e00000 of extent=200000 <-- Optimization Doing PUD move for 2a00000 -> 3000000 of extent=200000 Doing PUD move for 2c00000 -> 3200000 of extent=200000 Don't optimize when there is alignment but there is previous mapping (this is tested by this patch). Notice that can_align_down() returns 1 for the destination mapping as we detected there is something there. can_align_down(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 can_align_down(new_vma->vm_start=5700000, new_addr=5700000, mask=-2097152): 1 === Starting move_page_tables === Doing move_ptes for 2900000 -> 5700000 of extent=100000 <-- Unoptimized Doing PUD move for 2a00000 -> 5800000 of extent=200000 Doing PUD move for 2c00000 -> 5a00000 of extent=200000 Signed-off-by: Joel Fernandes (Google) Reviewed-by: Lorenzo Stoakes --- tools/testing/selftests/mm/mremap_test.c | 57 +++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 6304eb0947a3..d7366074e2a8 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -29,6 +29,7 @@ struct config { unsigned long long dest_alignment; unsigned long long region_size; int overlapping; + int dest_preamble_size; }; struct test { @@ -283,7 +284,7 @@ static void *get_source_mapping(struct config c) static long long remap_region(struct config c, unsigned int threshold_mb, char pattern_seed) { - void *addr, *src_addr, *dest_addr; + void *addr, *src_addr, *dest_addr, *dest_preamble_addr; unsigned long long i; struct timespec t_start = {0, 0}, t_end = {0, 0}; long long start_ns, end_ns, align_mask, ret, offset; @@ -300,7 +301,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, goto out; } - /* Set byte pattern */ + /* Set byte pattern for source block. */ srand(pattern_seed); for (i = 0; i < threshold; i++) memset((char *) src_addr + i, (char) rand(), 1); @@ -312,6 +313,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr = (void *) (((unsigned long long) src_addr + c.region_size + offset) & align_mask); + /* Remap after the destination block preamble. */ + addr += c.dest_preamble_size; + /* See comment in get_source_mapping() */ if (!((unsigned long long) addr & c.dest_alignment)) addr = (void *) ((unsigned long long) addr | c.dest_alignment); @@ -327,6 +331,24 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr += c.dest_alignment; } + if (c.dest_preamble_size) { + dest_preamble_addr = mmap((void *) addr - c.dest_preamble_size, c.dest_preamble_size, + PROT_READ | PROT_WRITE, + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); + if (dest_preamble_addr == MAP_FAILED) { + ksft_print_msg("Failed to map dest preamble region: %s\n", + strerror(errno)); + ret = -1; + goto clean_up_src; + } + + /* Set byte pattern for the dest preamble block. */ + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) + memset((char *) dest_preamble_addr + i, (char) rand(), 1); + } + clock_gettime(CLOCK_MONOTONIC, &t_start); dest_addr = mremap(src_addr, c.region_size, c.region_size, MREMAP_MAYMOVE|MREMAP_FIXED, (char *) addr); @@ -335,7 +357,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, if (dest_addr == MAP_FAILED) { ksft_print_msg("mremap failed: %s\n", strerror(errno)); ret = -1; - goto clean_up_src; + goto clean_up_dest_preamble; } /* Verify byte pattern after remapping */ @@ -353,6 +375,23 @@ static long long remap_region(struct config c, unsigned int threshold_mb, } } + /* Verify the dest preamble byte pattern after remapping */ + if (c.dest_preamble_size) { + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) { + char c = (char) rand(); + + if (((char *) dest_preamble_addr)[i] != c) { + ksft_print_msg("Preamble data after remap doesn't match at offset %d\n", + i); + ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, + ((char *) dest_preamble_addr)[i] & 0xff); + ret = -1; + goto clean_up_dest; + } + } + } + start_ns = t_start.tv_sec * NS_PER_SEC + t_start.tv_nsec; end_ns = t_end.tv_sec * NS_PER_SEC + t_end.tv_nsec; ret = end_ns - start_ns; @@ -365,6 +404,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, */ clean_up_dest: munmap(dest_addr, c.region_size); +clean_up_dest_preamble: + if (c.dest_preamble_size && dest_preamble_addr) + munmap(dest_preamble_addr, c.dest_preamble_size); clean_up_src: munmap(src_addr, c.region_size); out: @@ -440,7 +482,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb, return 0; } -#define MAX_TEST 14 +#define MAX_TEST 15 #define MAX_PERF_TEST 3 int main(int argc, char **argv) { @@ -449,7 +491,7 @@ int main(int argc, char **argv) unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests = 2; - struct test test_cases[MAX_TEST]; + struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; time_t t; @@ -510,6 +552,11 @@ int main(int argc, char **argv) test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[14] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Dest 1MB-aligned with 40MB Preamble"); + test_cases[14].config.dest_preamble_size = 10 * _4MB; + perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /*