From patchwork Mon Jan 2 16:01:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13086793 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 53637C3DA7A for ; Mon, 2 Jan 2023 16:01:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D4BF88E0002; Mon, 2 Jan 2023 11:01:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CFA4E8E0001; Mon, 2 Jan 2023 11:01:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B9AD58E0002; Mon, 2 Jan 2023 11:01:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id AA57C8E0001 for ; Mon, 2 Jan 2023 11:01:29 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6E2B6403E3 for ; Mon, 2 Jan 2023 16:01:29 +0000 (UTC) X-FDA: 80310323898.17.21BD0C4 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by imf17.hostedemail.com (Postfix) with ESMTP id 6246F4002B for ; Mon, 2 Jan 2023 16:01:27 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=RITuLYwQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672675287; 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:references:dkim-signature; bh=3fbTyAxoInHpM3PlpaAKvahpo0JX/Bn7dW9s7hcyPsU=; b=gnZcqkLccPu71E0Y4FfIG/I5/EMrGBaI1CmvMQrpuCeBNcI6Jt5fPiy6FhmDnbsB9fBEXf WR4T3mDoFOS9fZ15cCeYUnp+DjsK86h7P12LAnitDNHCVQ/Nm1tvHNthcfkOnH/QFrtCPC 7I5iVeLCHMawsqkk+L1OqTptFhwc5rY= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=RITuLYwQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672675287; a=rsa-sha256; cv=none; b=lCbatUCCCJiQdPgkXy2mal7g6DxUTAA8W+afpLIYXBtvXcMyUjQhCdEmhPVC91Kq6itVY7 3IyogNm5eSXSAOSbWuYslyXz7N0QFZK9Bg/Fc1hAAGYWUfXp9IOYDaZztc04ZTzlzNQWD+ mbe3tWwCX3exE37XcJyxadhdYoFiVvk= Received: by mail-wm1-f43.google.com with SMTP id i17-20020a05600c355100b003d99434b1cfso10723703wmq.1 for ; Mon, 02 Jan 2023 08:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3fbTyAxoInHpM3PlpaAKvahpo0JX/Bn7dW9s7hcyPsU=; b=RITuLYwQHBn66bLLAzHn48KVaVNVMqxFJ+9iX1c/R919Zcd44H8nfvxVTly8N3jL8w H5gvSgBhOgd2wXYHyoyn8nEupqilrP7HnO72dCgJink37Gg0gRdiT1SvgYhfhwilX/mb adQnL/b/Uyt24D4QKoXDJk4vCasNz/J9Xhkjovz4ussNQs+n+5xoQ5ytA7G6IxwYuAsl GEVotFyyYumhG4L+SL1N3KFO5mKM0hK7Ap1Y762byDz248t/mA7cM3EcjHyo7NUmW9vU I0VQZ3c3DpbuOQEIW8N9JCRtgI+QOqrvXnblj5jwQo8q99lOaAk5g2cSA3ynEuTPTQx5 fWMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3fbTyAxoInHpM3PlpaAKvahpo0JX/Bn7dW9s7hcyPsU=; b=x1hKNJd+cZypENRRC6nWZugCDsZJ0jNFsXFLdHy4FrGfvVAGlPt5TT87aO4xRJLWab KsjTIRXCgEGqtZPGAImxO3wCzGs15+zlXpMDKaOai7aNeZcqJJ8V6uMcK+/c3hY9xzrL H80VSCfb3Opb8ISihNh54YPA/Fd14HCTbFX1uKZ+dd8CoGhaVmmQQMxzh4KUz4eLurfp VjJGPIWZlxS7yMf/jrCbd86Lj+N/R4ANfX+YmL4baxFnITZ7ANLDD9NSQrYw0wOHEilD ZbMAxvLsqkcV+FhXzkG9u64NKcRi1wAJdXK4r0sMMc0qiupx/M+9IYWCboEzvIzDtXI0 OpUA== X-Gm-Message-State: AFqh2krprpVvAlqoavTIxQnC3rh0aKZCsprceELwZJD3f1mEeEEKJFnH RLmbRWrfVaQ/hLlqs5A1zGIUj+A9q2Q= X-Google-Smtp-Source: AMrXdXsyGoQJq8cyVA9DbEttRiL43mnPDCf/cnYerHTvuHFyUWdKw5tWrRV/82BrpM4HY0fPaxBFqA== X-Received: by 2002:a05:600c:13ca:b0:3d3:4427:dfbf with SMTP id e10-20020a05600c13ca00b003d34427dfbfmr28527703wmg.5.1672675285414; Mon, 02 Jan 2023 08:01:25 -0800 (PST) Received: from localhost.localdomain ([2a01:4c8:469:341:d1e1:a149:58ed:f096]) by smtp.googlemail.com with ESMTPSA id bg40-20020a05600c3ca800b003b4cba4ef71sm48482610wmb.41.2023.01.02.08.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jan 2023 08:01:24 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vlastimil Babka , Jakub Matena , Matthew Wilcox , Mel Gorman , Michal Hocko , David Hildenbrand , Lorenzo Stoakes Subject: [PATCH v3] selftest/vm: add mremap expand merge offset test Date: Mon, 2 Jan 2023 16:01:18 +0000 Message-Id: <420e491062db9151504aef5661c8a2d928ef6bd7.1672675224.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 6246F4002B X-Stat-Signature: aog7i64sndjtg36cdwnxub3isuk4n1pn X-HE-Tag: 1672675287-73773 X-HE-Meta: U2FsdGVkX1+wVNgFMrULAqRrvgO82I83EfO6jyAgFnko60cL/adMVpyyVk+anKaGIrwB8n9hGpOqU4VBR7IJg+cpMInhHcFsBfpaKS5yYZYcZbkUQwW3wZFt5m3mE2Bvqi/DUCKCpPKy793EqT9HV92fvlWf/wpXN1v+8JbrpmNEKcWim+PbB5JQzhXsSMDTyBTDVxWb1pUlB1MYfqJ+qpeqNMyTBRhUI5Vx3S7biPjZtbIdEph2hs7q9PmhBmvQnUnJZ7f4vvrawp7Ctb566WpttnygYp/uJVXs5C4MjI0gpd80201fRjhJ5CQYkfCN9i9I+9kIeqjrr3mxNc3wqC7ioKXrqZ0LLfRx8yWLH6uQkMat2LIrE8teF74oW6i2fOEgn4Wz1SrGQ69AGxGqH+CuA5nCUQmq3fQ6D4Evfqjjzn5r4e9HGx8G5Rx/UBy6ikmT5GiRWWDaGxAyidhOM7niGTA+6DrF3MamG/0qMQ1m4O0EUrmHWM/HW1Af4FDoUUchy4DYZljwxtVHqvhyDjcZUSlPx3eENgRRWIhRpYPcTm0vTc8dwk/NlL72wobZfbkpO8RBDHJ2F+g7Yzqirq/VGu0Pf+aOOKNhXmb2WS7g4+RsFLbF4YrX9RG4dKf38kseLx5U8BB84T80aZFUuzCx53qUHJkzSlhLZCqlTl2y0LSp3TZAPiGRxXOt1ZxXqt5TciYOAhqbHQPyWhG3Vu3myB4HD/0PUOmCVMgyCKEBzaqwoqmbyjQ8c1X/4oRU1XbJ/6O0u6XZEhxPo4Abgvu4NQwhbWVcUmyrdvoXGmvQqEzoHkkcK2q2SI9cOkPxhDO70Djoojeptk8wl7ggsKisS+Fh4OKxi2NHRWL2uoARPxrFAzFuH6gCzL/mYvDK/fTLCeOMADdnqJDGVOtDXRhce2IH+W3/v5QADyTFECIjnRi5dUXa/70sOyE3JYiWDrAQgl0d+gFEuNOaMJH r90BFjKJ R94EhLPebXBlyui9wAPR6fj/TrX66vz6n3ej8GMQGZhdEcIqGoNBCR1yv+KLWOKTtnrvtXm5tvOPkYE7CGpyDYhJ2gU9kd+UWYx9QofAlHlJvX6NGMPk8pE111zI/mxCkh0PJ 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: Add a test to assert that we can mremap() and expand a mapping starting from an offset within an existing mapping. We unmap the last page in a 3 page mapping to ensure that the remap should always succeed, before remapping from the 2nd page. This is additionally a regression test for the issue solved in "mm, mremap: fix mremap() expanding vma with addr inside vma" and confirmed to fail prior to the change and pass after it. Finally, this patch updates the existing mremap expand merge test to check error conditions and reduce code duplication between the two tests. Signed-off-by: Lorenzo Stoakes Acked-by: David Hildenbrand --- tools/testing/selftests/vm/mremap_test.c | 116 ++++++++++++++++++----- 1 file changed, 94 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/vm/mremap_test.c b/tools/testing/selftests/vm/mremap_test.c index 9496346973d4..b8e427b2538c 100644 --- a/tools/testing/selftests/vm/mremap_test.c +++ b/tools/testing/selftests/vm/mremap_test.c @@ -119,47 +119,109 @@ static unsigned long long get_mmap_min_addr(void) } /* - * This test validates that merge is called when expanding a mapping. - * Mapping containing three pages is created, middle page is unmapped - * and then the mapping containing the first page is expanded so that - * it fills the created hole. The two parts should merge creating - * single mapping with three pages. + * Using /proc/self/maps, assert that the specified address range is contained + * within a single mapping. */ -static void mremap_expand_merge(unsigned long page_size) +static bool is_range_mapped(FILE *maps_fp, void *start, void *end) { - char *test_name = "mremap expand merge"; - FILE *fp; char *line = NULL; size_t len = 0; bool success = false; - char *start = mmap(NULL, 3 * page_size, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - - munmap(start + page_size, page_size); - mremap(start, page_size, 2 * page_size, 0); - fp = fopen("/proc/self/maps", "r"); - if (fp == NULL) { - ksft_test_result_fail("%s\n", test_name); - return; - } + rewind(maps_fp); - while (getline(&line, &len, fp) != -1) { + while (getline(&line, &len, maps_fp) != -1) { char *first = strtok(line, "- "); void *first_val = (void *)strtol(first, NULL, 16); char *second = strtok(NULL, "- "); void *second_val = (void *) strtol(second, NULL, 16); - if (first_val == start && second_val == start + 3 * page_size) { + if (first_val <= start && second_val >= end) { success = true; break; } } + + return success; +} + +/* + * This test validates that merge is called when expanding a mapping. + * Mapping containing three pages is created, middle page is unmapped + * and then the mapping containing the first page is expanded so that + * it fills the created hole. The two parts should merge creating + * single mapping with three pages. + */ +static void mremap_expand_merge(FILE *maps_fp, unsigned long page_size) +{ + char *test_name = "mremap expand merge"; + bool success = false; + char *remap, *start; + + start = mmap(NULL, 3 * page_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + + if (start == MAP_FAILED) { + ksft_print_msg("mmap failed: %s\n", strerror(errno)); + goto out; + } + + munmap(start + page_size, page_size); + remap = mremap(start, page_size, 2 * page_size, 0); + if (remap == MAP_FAILED) { + ksft_print_msg("mremap failed: %s\n", strerror(errno)); + munmap(start, page_size); + munmap(start + 2 * page_size, page_size); + goto out; + } + + success = is_range_mapped(maps_fp, start, start + 3 * page_size); + munmap(start, 3 * page_size); + +out: + if (success) + ksft_test_result_pass("%s\n", test_name); + else + ksft_test_result_fail("%s\n", test_name); +} + +/* + * Similar to mremap_expand_merge() except instead of removing the middle page, + * we remove the last then attempt to remap offset from the second page. This + * should result in the mapping being restored to its former state. + */ +static void mremap_expand_merge_offset(FILE *maps_fp, unsigned long page_size) +{ + + char *test_name = "mremap expand merge offset"; + bool success = false; + char *remap, *start; + + start = mmap(NULL, 3 * page_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + + if (start == MAP_FAILED) { + ksft_print_msg("mmap failed: %s\n", strerror(errno)); + goto out; + } + + /* Unmap final page to ensure we have space to expand. */ + munmap(start + 2 * page_size, page_size); + remap = mremap(start + page_size, page_size, 2 * page_size, 0); + if (remap == MAP_FAILED) { + ksft_print_msg("mremap failed: %s\n", strerror(errno)); + munmap(start, 2 * page_size); + goto out; + } + + success = is_range_mapped(maps_fp, start, start + 3 * page_size); + munmap(start, 3 * page_size); + +out: if (success) ksft_test_result_pass("%s\n", test_name); else ksft_test_result_fail("%s\n", test_name); - fclose(fp); } /* @@ -385,6 +447,7 @@ int main(int argc, char **argv) struct test perf_test_cases[MAX_PERF_TEST]; int page_size; time_t t; + FILE *maps_fp; pattern_seed = (unsigned int) time(&t); @@ -458,7 +521,16 @@ int main(int argc, char **argv) run_mremap_test_case(test_cases[i], &failures, threshold_mb, pattern_seed); - mremap_expand_merge(page_size); + maps_fp = fopen("/proc/self/maps", "r"); + if (maps_fp == NULL) { + ksft_print_msg("Failed to read /proc/self/maps: %s\n", strerror(errno)); + exit(KSFT_FAIL); + } else { + mremap_expand_merge(maps_fp, page_size); + mremap_expand_merge_offset(maps_fp, page_size); + + fclose(maps_fp); + } if (run_perf_tests) { ksft_print_msg("\n%s\n",