From patchwork Tue Aug 22 01:55:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13360080 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 C2601EE49AA for ; Tue, 22 Aug 2023 01:55:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E6C2C94001D; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DFD91940025; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF6EB94001D; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 997BA940025 for ; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6DB911A017F for ; Tue, 22 Aug 2023 01:55:30 +0000 (UTC) X-FDA: 81150073620.17.198BDCF Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) by imf04.hostedemail.com (Postfix) with ESMTP id 62E3F4001E for ; Tue, 22 Aug 2023 01:55:28 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=hB3OrYAb; spf=pass (imf04.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.175 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=1692669328; 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=XSp2RkE7WNDbZkDSniptEmg1knVa7eiFGdAlEcTCYXk=; b=6roOkxLET015Iy5xPOuLchNxlJJDTLRjKBgRnYDsfqXh89r18nJ3na0xk92utlxOeA/2ex ptBTz8ob+/OK8wifXwF1g2cUFPqzQyBLIvPKAtHqUld23+QImSGDjXnnmfkVNoSqI7FktU I7F6WzV0uXaVXKzHYctce2TB2lzd3g4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692669328; a=rsa-sha256; cv=none; b=i/Xf+acrM8o0cA7u6fkPHF4B1phvttPge8H2C8BUSKsImCZe09MhwlrBSR73QuxLtB3xBf A2G1zM9+e1Bm4bdFFVHSwk6vV4DyIYmS5LVuENIdUe3dy0NGOncc5z80BEcIpjh/jpeQsA LSt9BraC60byqBZJJEzBhkc9BKHpxtE= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=hB3OrYAb; spf=pass (imf04.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.175 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-34bbc5eb310so11406135ab.2 for ; Mon, 21 Aug 2023 18:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1692669327; x=1693274127; 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=XSp2RkE7WNDbZkDSniptEmg1knVa7eiFGdAlEcTCYXk=; b=hB3OrYAbWCivFEMRY0ZLiMpZipo0ohQ9va0ALoFrxF3N6j0sGBBJlAMhPCHbROrmOG MMW9Vz6sZFa1UpuJWvtJjqpcBgMy1oMCAqHWjDG602AT6TI0cyy2YQgsTV3s8EI+m5+o Y3Mr4kc1PezfoD+BPHuwn4CF5Y65DFcuRKn00= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692669327; x=1693274127; 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=XSp2RkE7WNDbZkDSniptEmg1knVa7eiFGdAlEcTCYXk=; b=ZBfS/PkKP47WVWqIo1CT/1vy7/iEtMqZvVl8De0EdiwxrwR0l6+Dg/+JFATducGr1J +xjvGztKuWCUGTcWiqhTAecRFszTO0MRWiz6sW+0BCXBsXQqjDtW66ZDT1aD/ipLTsXH ORgdioxRUes0lgfnqgwHMH+btJgJ0VGPjEAlN9malxW3nyHYWas0sIiavtDgxvXd57+/ NiAoIv9zj8obWGdouVrLp7pSF1NdjNDo5Xgce3+gb0BC3KNMlTi3cuYJDtCtVzWZYSih jn/d6ia5B7gkZdVouemwtUzQ6qyiQ/lKpkraZ+s6LzdzOqLinkrXwdhLXW23izbC83fM 8J1w== X-Gm-Message-State: AOJu0YygCy+Hz6/POpkC7UUwG41SFzO1qxPIdy+R0dO5sy1UR+kQ1Bi7 VbMhGyXQbyy3L4CPQyuJqEHR1A== X-Google-Smtp-Source: AGHT+IHh2CBbyhDqgwo/dvz/3E91EJeozSUIuQC8LNJTxnm78FkGwumtTjDlvLHNyDKvyt16yZrJFg== X-Received: by 2002:a05:6e02:e02:b0:346:5e80:bf67 with SMTP id a2-20020a056e020e0200b003465e80bf67mr8883734ilk.21.1692669327493; Mon, 21 Aug 2023 18:55:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 18:55:26 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: Joel Fernandes , 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 7/7] selftests: mm: Add a test for moving from an offset from start of mapping Date: Tue, 22 Aug 2023 01:55:00 +0000 Message-ID: <20230822015501.791637-8-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-Rspamd-Queue-Id: 62E3F4001E X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: pkym1iw8dwn6zbkzzdrn8o7ea1op9ns1 X-HE-Tag: 1692669328-781215 X-HE-Meta: U2FsdGVkX1+Qsvk1gC7oBWeHKuXQiF+lR8MDAV6qr3GJEYFlt3KbAHN/NvWdBz3HoVcCaTWUbZKexJOGScbihursQreRXPZd8KAJYIvdsGhkqjmgjf0TYEj/zHz9f7JRUqszyiXip/U95v+tMO5zdnmCKEH4nYOhrFd6sGhvO11MBOpGD1UC2deBcLgLmbxA7HRPa6SJtNhOhHVDrnua2upbR9sD+6Q0V26mtXhoNTj4jqArV1hPnJn3feH7mof7AZ1cm0t+sZ+5ej/gV/GDiLSq7ghXUwixa7yQtY1LlexjeZLIukDIe7UR4RfYwygAi5clICX+4UtbZ3XtFnBzDj+ZUGmoFYtvEIW+2yRQITeo3tJQP9GRYUgDvXE8Bez0dn4sXv8WRrrW+XAAolUwHCqonVLEYlxCXV9sr3IEc9A6y6EpfTS/VKBQYlly++ElozviC0p+LCkRsnp9Auhd7v7IJ/pV7/5dJ89YUzA/dDmMauGQ/Xgm8jdM36W+7SH3IZTLiQ25ONSBhlx3wK5QfCOSGCVWtpZHJPOKQ0rgDBWfPe+Yv6YVXjKB6+6M+p8vLX+tPpe1cviCSFk2zg/ySesXNhrz54Q6WKmZASm17kdRA08gw2G2BPwWlDovFZ80nYLuBWxtUd/+KtD22opaD9dGxhok43tC/wHaxe5WiZr9jWKdrAFT4t2HnzLPy4o7O+Syi+ZLbsF1t6Giv9QVmfMoU5aGvleBHLFWMzJRuNzHDvo2ZWHwqjA6iwVfS7KDHKFe066VubsyN4Guc0UMaPdkuQPTWWEwsFRBe6bq2yZyXYf8O9yh/xtPvol2IM9VKc6Tua3xhRb229a2ZIpGqyhQfNhBibIMOf4DJl6yjfiClXiLaKnuQriHqkyTVDm5snYSgE2JQK4pI5w+Xx+CSJyeX3uz7iURGiTKdKzsHM2f6Oke0J88TI8GGUNeMivmQjo5bYHMEbWGHlV3XYq OILBj0M+ WytHXh6ytHlCWESsPMjVdPGMZJnmsMjTJR1XkboBkV7E7oJ36oeqbgjn/DxhbaAx7vT9MGPVb1GhR2tlIBU8pBpA5xsE+TpCZsybZR2xuw+1xG2HTtiqOY+/NYzsUnSNRsTVPPL/Vz9/p/OBNsWtFeXzBRJg7gob9hX713LbKDgjmMz0aLaf3fDjwrX6s1JYzP9u5w+HFcBumLFTpGfrWIdzX+m/IEds1hbadCStDJhVYWt+EI3dXBsMgYaZHcXiVRsQ+GAJ9UxwAHHzpzVr7LD2ulT2ovoPp22QHCEud2vbMI36wHLqqjLGVCsp06p0BNNLVPe3wod8u1Wlw2HXNk7izSgLlutUkdM6QmQeyTqTFht5g7DoTmkhIMUlqbCbLRbXytNduVDaleIWgSuNxQwlDm5fah9LQ5TlglwfOZ9Y9qdpimBS2aV02RVGSm6mk2xB6nekmbNdKwO4PmsqA6C2zcVtZ7V0IrV/U 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: From: Joel Fernandes It is possible that the aligned address falls on no existing mapping, however that does not mean that we can just align it down to that. This test verifies that the "vma->vm_start != addr_to_align" check in can_align_down() prevents disastrous results if aligning down when source and dest are mutually aligned within a PMD but the source/dest addresses requested are not at the beginning of the respective mapping containing these addresses. Signed-off-by: Joel Fernandes (Google) Reviewed-by: Lorenzo Stoakes --- tools/testing/selftests/mm/mremap_test.c | 189 ++++++++++++++++------- 1 file changed, 134 insertions(+), 55 deletions(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index f45d1abedc9c..c71ac8306c89 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -24,6 +24,7 @@ #define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) #define SIZE_MB(m) ((size_t)m * (1024 * 1024)) +#define SIZE_KB(k) ((size_t)k * 1024) struct config { unsigned long long src_alignment; @@ -148,6 +149,60 @@ static bool is_range_mapped(FILE *maps_fp, void *start, void *end) return success; } +/* + * Returns the start address of the mapping on success, else returns + * NULL on failure. + */ +static void *get_source_mapping(struct config c) +{ + unsigned long long addr = 0ULL; + void *src_addr = NULL; + unsigned long long mmap_min_addr; + + mmap_min_addr = get_mmap_min_addr(); + /* + * For some tests, we need to not have any mappings below the + * source mapping. Add some headroom to mmap_min_addr for this. + */ + mmap_min_addr += 10 * _4MB; + +retry: + addr += c.src_alignment; + if (addr < mmap_min_addr) + goto retry; + + src_addr = mmap((void *) addr, c.region_size, PROT_READ | PROT_WRITE, + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); + if (src_addr == MAP_FAILED) { + if (errno == EPERM || errno == EEXIST) + goto retry; + goto error; + } + /* + * Check that the address is aligned to the specified alignment. + * Addresses which have alignments that are multiples of that + * specified are not considered valid. For instance, 1GB address is + * 2MB-aligned, however it will not be considered valid for a + * requested alignment of 2MB. This is done to reduce coincidental + * alignment in the tests. + */ + if (((unsigned long long) src_addr & (c.src_alignment - 1)) || + !((unsigned long long) src_addr & c.src_alignment)) { + munmap(src_addr, c.region_size); + goto retry; + } + + if (!src_addr) + goto error; + + return src_addr; +error: + ksft_print_msg("Failed to map source region: %s\n", + strerror(errno)); + return NULL; +} + /* * This test validates that merge is called when expanding a mapping. * Mapping containing three pages is created, middle page is unmapped @@ -300,60 +355,6 @@ static void mremap_move_within_range(char pattern_seed) ksft_test_result_fail("%s\n", test_name); } -/* - * Returns the start address of the mapping on success, else returns - * NULL on failure. - */ -static void *get_source_mapping(struct config c) -{ - unsigned long long addr = 0ULL; - void *src_addr = NULL; - unsigned long long mmap_min_addr; - - mmap_min_addr = get_mmap_min_addr(); - /* - * For some tests, we need to not have any mappings below the - * source mapping. Add some headroom to mmap_min_addr for this. - */ - mmap_min_addr += 10 * _4MB; - -retry: - addr += c.src_alignment; - if (addr < mmap_min_addr) - goto retry; - - src_addr = mmap((void *) addr, c.region_size, PROT_READ | PROT_WRITE, - MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, - -1, 0); - if (src_addr == MAP_FAILED) { - if (errno == EPERM || errno == EEXIST) - goto retry; - goto error; - } - /* - * Check that the address is aligned to the specified alignment. - * Addresses which have alignments that are multiples of that - * specified are not considered valid. For instance, 1GB address is - * 2MB-aligned, however it will not be considered valid for a - * requested alignment of 2MB. This is done to reduce coincidental - * alignment in the tests. - */ - if (((unsigned long long) src_addr & (c.src_alignment - 1)) || - !((unsigned long long) src_addr & c.src_alignment)) { - munmap(src_addr, c.region_size); - goto retry; - } - - if (!src_addr) - goto error; - - return src_addr; -error: - ksft_print_msg("Failed to map source region: %s\n", - strerror(errno)); - return NULL; -} - /* Returns the time taken for the remap on success else returns -1. */ static long long remap_region(struct config c, unsigned int threshold_mb, char pattern_seed) @@ -487,6 +488,83 @@ static long long remap_region(struct config c, unsigned int threshold_mb, return ret; } +/* + * Verify that an mremap aligning down does not destroy + * the beginning of the mapping just because the aligned + * down address landed on a mapping that maybe does not exist. + */ +static void mremap_move_1mb_from_start(char pattern_seed) +{ + char *test_name = "mremap move 1mb from start at 2MB+256KB aligned src"; + void *src = NULL, *dest = NULL; + int i, success = 1; + + /* Config to reuse get_source_mapping() to do an aligned mmap. */ + struct config c = { + .src_alignment = SIZE_MB(1) + SIZE_KB(256), + .region_size = SIZE_MB(6) + }; + + src = get_source_mapping(c); + if (!src) { + success = 0; + goto out; + } + + c.src_alignment = SIZE_MB(1) + SIZE_KB(256); + dest = get_source_mapping(c); + if (!dest) { + success = 0; + goto out; + } + + /* Set byte pattern for source block. */ + srand(pattern_seed); + for (i = 0; i < SIZE_MB(2); i++) { + ((char *)src)[i] = (char) rand(); + } + + /* + * Unmap the beginning of dest so that the aligned address + * falls on no mapping. + */ + munmap(dest, SIZE_MB(1)); + + 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 (src && munmap(src, c.region_size) == -1) + perror("munmap src"); + + if (dest && munmap(dest, c.region_size) == -1) + perror("munmap dest"); + + if (success) + ksft_test_result_pass("%s\n", test_name); + else + ksft_test_result_fail("%s\n", test_name); +} + static void run_mremap_test_case(struct test test_case, int *failures, unsigned int threshold_mb, unsigned int pattern_seed) @@ -565,7 +643,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; + int num_misc_tests = 2; struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; @@ -666,6 +744,7 @@ int main(int argc, char **argv) fclose(maps_fp); mremap_move_within_range(pattern_seed); + mremap_move_1mb_from_start(pattern_seed); if (run_perf_tests) { ksft_print_msg("\n%s\n",