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 7F8A1C7EE29 for ; Fri, 19 May 2023 19:09:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCA2B280001; Fri, 19 May 2023 15:09:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C538D900003; Fri, 19 May 2023 15:09:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ACB4A280001; Fri, 19 May 2023 15:09:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 8AE78900003 for ; Fri, 19 May 2023 15:09:51 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6A7ACC0AB2 for ; Fri, 19 May 2023 19:09:51 +0000 (UTC) X-FDA: 80807944182.20.29A6FE3 Received: from mail-ua1-f48.google.com (mail-ua1-f48.google.com [209.85.222.48]) by imf11.hostedemail.com (Postfix) with ESMTP id 9007C4000D for ; Fri, 19 May 2023 19:09:49 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=x8ZyDrw6; dmarc=none; spf=pass (imf11.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.48 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684523389; 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=8BlbglpAiZ94wJYkjhcCjsilb7jfKjCG904F6yJstFY=; b=S60D7lzR1dYqvW7k7/i2eL9XECNKBzPLgUcc2fIZ9Ji6F/alWnGVfEyOuVtW7uc9DUeKA1 ZmxTA2wPjGxPxp2C0P1H0/T4fnnQ0QRwDKhyC5FwrYcf/rWlZFaowO+9SJUJ9kn9Xy0aqF O4EkNeJgRACo9KZs09tAkdUiJc/WABI= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=x8ZyDrw6; dmarc=none; spf=pass (imf11.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.48 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684523389; a=rsa-sha256; cv=none; b=3ALxjxZ6h1Za/0N6QLDrDDFmKIBZ+5Dhbv/tIsdRBuhIDm1hpgSM7osK2XTKKLHV0Axjcz B2RbLOoWksfo7YglLqBSP96vWY8WhWMax6F9m+VcRLlEf+3NmhXNarFu9G0eVTiErwQTix TYDlm+2A0L6LpRFZfNMyXZdetmOPZJo= Received: by mail-ua1-f48.google.com with SMTP id a1e0cc1a2514c-77115450b8fso2251941241.0 for ; Fri, 19 May 2023 12:09:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684523389; x=1687115389; 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=8BlbglpAiZ94wJYkjhcCjsilb7jfKjCG904F6yJstFY=; b=x8ZyDrw6ni184t1nPUu9gHzYGnCU4QMuz0CHgZiJdJSkGolahQopXIQzMHUKRX1tuL Sk9VbgqX2HUtPxhGHeN4FRXjhKh1tAahRr6lwwpWuDo763W0ExapWgKq8ZNizk5D6Nj+ cwyjlwYVFmQ1N0AvIKfGAIKpy+GRM3WOTBx+U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684523389; x=1687115389; 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=8BlbglpAiZ94wJYkjhcCjsilb7jfKjCG904F6yJstFY=; b=EOwyoHPRERo6NSPweh3yelHwGH09W3MXJwzaxun5ywl5f5VW4EmFZBmln3+8VqnzVz j1bQZRS+DTx3AQdD2J5diN3KFw8O9b5fItq0aB9XxpIgJ/s56I/VgbJdg3HCRWDtZQ5Y CygGhu2/Gv8jLoALJGXGYvwkpxRtJZHbPG5EmkRgNbDIK9HKxiE0dEejPhtcQ+S7f9T8 i/f43OrVyDfEpQMInbnZd8ZKwgX15aINrzINwkOKjLfdIHiJ3rHX+abrJomuBZiB25ku E09hwEaG317mxMbFD7OvuTGrKxDkSKAduqmkgLG8iSUT0SlGLbILP2bV7vewD3AGgyEZ MgCQ== X-Gm-Message-State: AC+VfDxSZucA+tPMDWzd1i2pYnMMKvo6f2gLOhrc4EiqKcGUVL69ZGD3 PIa3toErC2RW3spF6syb3iS3Tg== X-Google-Smtp-Source: ACHHUZ7k2Kr/gJkiN5S1M+tfEjayIP8g2cDy6n/x0srwgMQ1712z1LJILIPD/wMAeXbKBNfnKX869w== X-Received: by 2002:a1f:5901:0:b0:43f:ea80:e8af with SMTP id n1-20020a1f5901000000b0043fea80e8afmr1449033vkb.4.1684523388940; Fri, 19 May 2023 12:09:48 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 12:09:48 -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 3/4] selftests: mm: Add a test for mutually aligned moves > PMD size Date: Fri, 19 May 2023 19:09:33 +0000 Message-ID: <20230519190934.339332-4-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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9007C4000D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 85zc1ooieyqz5xndcox8p5wdfxujsbkh X-HE-Tag: 1684523389-670988 X-HE-Meta: U2FsdGVkX1+ioO2g7HNRT/+ROE1KlHEP+7Ke0/bbZSY2gwYtFfHNoMJKkPNoG3eGAAze/rm/ACvgt7AHEDd42f2gdWjRugI3szZE8suBf88zHENnHVrCSBbZnHydLi6k35adfKqY8ewnuTMTyrSRU7VydW/RZqp4ni/OlQU7rOHdG7Gg48V0ssQHXgma9oMNX+dqiZEfFlc00UAYs4LCpYMiXv6SFLpo9M6RzYxCAjoANlUIgsbgSb9svHrT/E76eW2L0WLnyq/bnqAPvuqUXss+Yt7sD/57akTNmXmL960sSCqlsdweoiDI17JMc20r1wkgK9V5pDrzErGBs9mY0afDapmmvQj+w8AMYORlDiaxhupD2+pj6wQsO65b6wySg8e9zgFXkO8lCv/gOMmlHrajOmsKyrjTSG6SYLkZH9J/dnwQFdXV7MvcRu+ueXAwPfAtDp87TKDNNcdtF4ZOMNHMH46Jm1iC4WICUy1nWxV4OjfWZ4/wvcy4h7c24OPFvTwR4ZoPiublnHLmNit4mFP29W1JyAaj1nlxRX0mREHCNBAiSlNnXfVGlek5Q/81acXcua9XRKFRCYspbMqICyyyXD2nMXgZbgSAFfYW4mdSv9USt83ZTKUuxagkMLY1aFmvQkLfhr7EJBArl86A6lJcI932vNMmbacQJSjtzoM+eJQLVKVWJWB2wEcLgnnou+9Bnlr3oxHqli4NjNUAv16ftxqexaEYdHmy4/PqQCr4Bl0lQ9Iviss6VgGgHsv/kFVszhcvvyMkiAHmbuvetDrkSZC49DQTAqZxakMBDTpWHV059R741i5qUJLw3EPuM5qyxo5D8LsYWH8bjG38otpJEYeXy3VaLHOqrKyBGdeca/L99WBOkmx0lSL1FroF98P9LRXZFPB8ywzk5U5eTmziVVT6IX4mq1Bwy2Oux+q8pHE1wEbnbvikKOyJYd5qpq3LGaNk3rml6iJq5Uk mi2q9E2G sNnVXXfZaTd8HRwntwSS2QB4C3Lm2dwezo0tPt/iLX+t5ZY3f8kbQ2clnQb7ffDW441bsWKEJ+Re5LutGefsImPZNRxHhjyToLY13UWAtwP5BCRvslhStBQpta2A6KS77DC8QSsMWicT+lvWXWUiIXP2+Qm0xTG341n0uwhQNNOuYf3W9apXIKVDJXrbeX/sHSOZdjhxkJzJAP49o0iXqCyrBS1znScAXvsfyG+8eygO5YmmP4XMTa5WKMW7UPefoXp6iaaAWKM9+tQBrLs19RRzA3/s3N5GtQZQ+jjMrZ9lctlVLmNZvMTX7dSsTXwHZsAWiOOwEdDaHSPEBXKSs1jz1135f9vbV8oHzvcOvq8StT+o5FZ2ZfD3fJu3oRImW6TgXW++Fibk9+LpkOuiliyZcPQ== 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 a test case to check if a PMD-alignment optimization successfully happens. I add support to make sure there is some room before the source mapping, otherwise the optimization to trigger PMD-aligned move will be disabled as the kernel will detect that a mapping before the source exists and such optimization becomes impossible. Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 6822d657f589..6304eb0947a3 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -44,6 +44,7 @@ enum { _1MB = 1ULL << 20, _2MB = 2ULL << 20, _4MB = 4ULL << 20, + _5MB = 5ULL << 20, _1GB = 1ULL << 30, _2GB = 2ULL << 30, PMD = _2MB, @@ -235,6 +236,11 @@ static void *get_source_mapping(struct config c) 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; @@ -434,7 +440,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb, return 0; } -#define MAX_TEST 13 +#define MAX_TEST 14 #define MAX_PERF_TEST 3 int main(int argc, char **argv) { @@ -500,6 +506,10 @@ int main(int argc, char **argv) test_cases[12] = MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, "2GB mremap - Source PUD-aligned, Destination PUD-aligned"); + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /* -- 2.40.1.698.g37aff9b760-goog