From patchwork Fri May 19 19:09:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13248782 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 E09DDC77B75 for ; Fri, 19 May 2023 19:09:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 46422280002; Fri, 19 May 2023 15:09:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 414A6900003; Fri, 19 May 2023 15:09:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 24105900006; Fri, 19 May 2023 15:09:53 -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 09D13900003 for ; Fri, 19 May 2023 15:09:53 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CFAEC120814 for ; Fri, 19 May 2023 19:09:52 +0000 (UTC) X-FDA: 80807944224.09.C79E1FC Received: from mail-ua1-f46.google.com (mail-ua1-f46.google.com [209.85.222.46]) by imf21.hostedemail.com (Postfix) with ESMTP id CCCE51C0011 for ; Fri, 19 May 2023 19:09:50 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=TcMQgiml; spf=pass (imf21.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.46 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684523390; a=rsa-sha256; cv=none; b=3uhtfXwhBqPZzcW/lJGszReOPPjiR61qqYqCMSmY5fq3eZeEluwAQZU+xqhKZFmcnjieYd 1b3Kw1QcM8SYLJCSWPA+0CEaVwS8+PFhMYqnXre+DhglYLPs4Oj77Z/s5K3wIWUm1kb0Xg LcTfaiHkLdUs3JJnbtEzFsNcg5RaNHQ= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=TcMQgiml; spf=pass (imf21.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.46 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=1684523390; 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=SWo1p3DpVmU0T9mj5qOdTODFP5dx/UDqRA4JPzC/zFM=; b=EfyQjPEuwAGq8IvJULFQMouqNh0Vj9VtlLvUBUE78jHYxiZaQrC79B/88C8NQ2abFzyNMz EjvMUWsuHoaSpSCGsNJ8QW0Cegw/Rvpkum0koc+PqSNYVFNH4b+NjChXGZkysDKsuBxiYM yHJIj0yQH9yW/g1eeYPknu+A6YvCBWA= Received: by mail-ua1-f46.google.com with SMTP id a1e0cc1a2514c-783eef15004so1198944241.3 for ; Fri, 19 May 2023 12:09:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684523390; x=1687115390; 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=SWo1p3DpVmU0T9mj5qOdTODFP5dx/UDqRA4JPzC/zFM=; b=TcMQgimlGvWiy+Yq9tzs5x+tIAK1mp22aFzOi9aGMKUkP8PwsWwCwhComvsSo4eIKL T1d/hEYoCC9WFsUyijPJFPrQAANt3Hi+H3ilcgnn0iAghrq2U37nMJFcBIWziF4XZgdK 7bKnjZnjYy7fZ+3+sj1+U/9UYLbq0lSUVkjRY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684523390; x=1687115390; 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=SWo1p3DpVmU0T9mj5qOdTODFP5dx/UDqRA4JPzC/zFM=; b=bP4BsJxFghUtHnfS47MAINQwwnlW6raFXsZj5ujOVjNrZsRAkowA4DSArr9JL2zPJK 0dkIvNbi34gJ+61y1WsEEZ47SMwXZ2u2BBcnrTQo8O/iPQuhiYYavAJPksvfBPK/rzoB pB8RuZaPa0Sub3MTDXYFH5IXYMNKsFC5RvHaXO6eez9UQGnQd0zXwIvliJ6iLqI4UKxM eKZA9dqk+zi8O4qRz3kJ8Ji0bNkqHLvxhS8f91LImLTBg1byzuQBKXEfKyI6es08WLgi fQQEKHZQFBUBwIrgdj1mfTWeWowakKJU6tWfyHiXsyI5y0/4mLZzdJw+QxQxJrVqY5ol DN6Q== X-Gm-Message-State: AC+VfDxNLLMI2TnjKMxPhNyvG+y7D+gVQFoFou8AA/Fw1uTnU228ifN5 I8woD9NDYuR7mG/ceavBUG3S4A== X-Google-Smtp-Source: ACHHUZ5Yk4gah/ju4JKpHlXFRbbbY0acrjXAxd6nBOFP7q9w3aEit22E9N+b9+SyAwAbuG1o5wr0aw== X-Received: by 2002:a67:f101:0:b0:439:30df:6bb1 with SMTP id n1-20020a67f101000000b0043930df6bb1mr202282vsk.1.1684523389774; Fri, 19 May 2023 12:09:49 -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 q20-20020ae9e414000000b0074e1ee30478sm1317611qkc.37.2023.05.19.12.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 12:09:49 -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 Subject: [PATCH v2 4/4] selftests: mm: Add a test for remapping to area immediately after existing mapping Date: Fri, 19 May 2023 19:09:34 +0000 Message-ID: <20230519190934.339332-5-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230519190934.339332-1-joel@joelfernandes.org> References: <20230519190934.339332-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: CCCE51C0011 X-Stat-Signature: rp49ozgur1rsededsnjc413kk7y3gx5d X-Rspam-User: X-HE-Tag: 1684523390-975507 X-HE-Meta: U2FsdGVkX18eb4mp7YldvBp7AFHMwldqzkXYAkJVzDZxt60G7DDHIxd3Jrjzk3iSVG1oiOYJvJC73ISaYNHM0S/p+KKAiVn4Q1qlZj7w67yO6poKgqGVEfjG3IZkOSpIdDrac4nx69puWwU1n8fdeOBfPRQpQMRc7odo0KHWcf4SlWWkwmmsxCwGVWOcHXnNqqlzle1QkvyXTd+VtUGN39kwa3FkTkYejxxCo97h5JXb5cUOW8C01oFHd+h928f3iCD9Xvr0yWGtGF1AqQGdnJJbwXNwwtUOCSPuzF9me+I/OqSrBb+oD8LarfWo86IxRnXr9RrDHL+3D/N2kcMal9EaeS6+U5dlAMRVn6KCeQPXfE0sYXcAYnw6t0Y3/nOK+vHgcBytTmvJ5OfupDASLrc5yybLh9EvcGLQRkknQCsfmvfQoIuzJjera2DVX3bpjXhJgz2llJHmdy1vHICx3S+ERaajwZUe1t1VwBIuRwb5QKAbrY8TAMuKc/Z5lwVn4zeiqgw3+iF6d0CO/DN+mrYOubhtx2C+/+9w05beSAQd0Q4DTi+Vmfy1amP4kJVRj9FCrNvlsXLzj2qQ0htI/gCM/zipXGPKsPjODwtniuDKtgU0cfGf+NPOVmmbOcQdg8R+KQA0Gkhayim5bQz4Op7XOSy3faGdfGZS2UJk0aw7NCveLV1nRqS1MffsYJyfUwOsqoBbqGAuenVhjZuNtss8pR2bUxWWlOKSlSjSQ1l5G+FxeFjsTwp54yyCDq0nkwp8VozqKyGGkvC41To7vab+vwEXy0+sMkwIzT+YoJtr6Mw2wqxd8VSx6pCKud1ysb/sTSQjXxNpFzL/lS4P2mARwbOflJ9tXzljfJLPbMhhPLBBOmSt4XCqSRxteqOOaPR9LXp7lP2yesFxyLuBbsOR5Ql+hepnV7qFZuKlh9jCD7taAa5T2jmQ+ENPdBer2V0fj1ppUwbTYQ3ryQl O1tooas7 YWm8l8LItjGAhmA6qhh+iFxQaR5P5VKOtYGGcqa8WAI8xpAaFkHzwTOhKTZ0a8JX+h5Z+IJWekugTMTBVoyHLE9K7gY9b73FQjoOfmwuP/OZGiNRwMnL7VbU1285yDYkpOowMamwmN0IY+HVU96QkoFrT9LRA2diAQbDq01lCNT2OSBBexvDCcwZotedONKq/PsylYxkkt7z+bZ+gpx9GnZM6AHriDaq0lUyw0T2ZrV3GfBLy+Ra2NXB/sDRzmZpeSM6mQLQRD9l14mto74ojUNgjZyToofmfNO44t4VY74rZ/UM2eeUaEAPvI/84bX5GDcmUIUqv3quDJ0YrIpB7AQ1Tqrm4My/p9Gm1y3bhb3vt1FnlVevVgl1kFu34F2kQSurdM5yvF9rrOUIceB+tctJ0QOWnZth2n477u4EhDND6NDv5pf/HwAfAXwvxGg+3Fxy61i7JRFiHv8pe94+nhxcvgA== 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). check_addr_in_prev(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 check_addr_in_prev(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 check_addr_in_prev() returns 1 for the destination mapping as we detected there is something there. check_addr_in_prev(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 check_addr_in_prev(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) --- 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"); /*