From patchwork Wed May 24 15:32:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 98569 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2917415rwl; Wed, 24 May 2023 08:47:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5y8+068R+R6qgJUVJ7AD0x/uSBKAGIDRK05Udka0hxKoJmX3X+dNr4wvD5e0rUin0PIYFo X-Received: by 2002:a17:902:ce83:b0:1ac:a030:c30a with SMTP id f3-20020a170902ce8300b001aca030c30amr20787000plg.19.1684943224102; Wed, 24 May 2023 08:47:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684943224; cv=none; d=google.com; s=arc-20160816; b=JfdLmDdW4VLQFVo7SS79hvV093syX70M8WBzbSG1UARRZzabMuxiFEU9a4qOJBjciy Ii7I/rhPHgKaOKcslazCWAouOfxAWX8lxTORzdg/rM41dKRT0oTEItrwEtY/QmCLC6eg 2sOBaqM1K23XeGMeiHqN62tsrrxcaRv9dc9ACtX9cjaKDtweo+yukB5yYByYbuxvHboL oeHH/hXLiaEE6Iaz7bhKl6r93BYnxp4u2dmVwjEjtYAF5vqGFTl+UskmC2Qv979s82b3 ids9r/dNFPjFxrRyPdYf05/LAH4o84XFkQ7XGGJ66Ey/RoPQzHYBbWtoqmiiOwnDpHqL qniQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8BlbglpAiZ94wJYkjhcCjsilb7jfKjCG904F6yJstFY=; b=mzWs+rhrKACqdLmOZGyfFIVe8CSwLiJHs7JdCm3+SoXZQRfPriJ+okeh+LgTeybsvT NiTDVM1234mE8qUfGnhFRr0EqU7M3VVlirZGubo5ZwfpKuDkB/o09y441EtO+FYC25xk xWJMOfkPxp8Ma/wl2ECcXeRvDYUduczrq9vtok25WuJ3h+fdRpcDZo0E1Zk5mPv0a5P2 D6qB8Y76VlaClVkHxlyqQaDP08/25HiGl6FfVIoQVg6qF/qGvuGrpHiV4unKPBgihKXw CFZZm+z/aBTtbJbzaU9NTZfllN+WIYx/hzaumMfEhC3bRHjuEOp7QDVR0IL6/LZLPG7E hB4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=M1+QdVek; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z7-20020a170903018700b001ab115a868esi2807831plg.49.2023.05.24.08.46.50; Wed, 24 May 2023 08:47:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=M1+QdVek; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236121AbjEXPdK (ORCPT + 99 others); Wed, 24 May 2023 11:33:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235935AbjEXPc5 (ORCPT ); Wed, 24 May 2023 11:32:57 -0400 Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F97E123 for ; Wed, 24 May 2023 08:32:56 -0700 (PDT) Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-74e4f839ae4so88404685a.0 for ; Wed, 24 May 2023 08:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942375; x=1687534375; 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=M1+QdVekzfaYabKgKHR4vetDn9xM5mnD1uJWBlxynPLjOJfqn9oU5l1EBrOn9cJpSz Hq98wTXJQOIQVLk3KS5/hG2Zi5acdW1WRswNIK3R6vCGj/LzIulXp3+4a64uKUCOthvR XxhMU2PzCdmfCd52I8rtjdt6QU++OhdOr5Brc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942375; x=1687534375; 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=JCC3wKj7ykG3Ph0m85HDHYUI3ZORcHp30fMFPfHbh7hreutFngu9dF6UcVPrf+mIcZ 04Quo19CgRrigPGu+9BUUhJvBEVnLovb7eOHt1QJBsswWHDO7JEAL7RW+TBta474hMKN ZwEeqPyGxEC2RPPh2oPOeyl8ma/a0lfla5DoF0o8YbFYmVy6Mrf37W6rPeiPcy4iMAO5 Xn29KApekvGpmdKadVG/+f+bFd8yHzYQVl5WcQOa5LyEzAP/Pz+1Q9VT3iWRD43cDcZW PCcLGKWqXCd4fnMFf1U8SEfCGN9RA1oBgTwuKX0YmupxSpl5eV3/jjBAQeUk0lQcFA2v 5EtQ== X-Gm-Message-State: AC+VfDzTYVQ/iLVfxxuyexgbionB1eDMTohLsn8mCBvLfC05ItFaskNR inRp8kqiITaD/67yEMJdeXDRkE6y7tulmPyQ9iU= X-Received: by 2002:a05:620a:8d0e:b0:75b:23a1:3680 with SMTP id rb14-20020a05620a8d0e00b0075b23a13680mr6261791qkn.65.1684942375456; Wed, 24 May 2023 08:32:55 -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 v18-20020a05620a123200b007590aa4b115sm3296906qkj.87.2023.05.24.08.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:55 -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 v3 4/6] selftests: mm: Add a test for mutually aligned moves > PMD size Date: Wed, 24 May 2023 15:32:37 +0000 Message-ID: <20230524153239.3036507-5-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230524153239.3036507-1-joel@joelfernandes.org> References: <20230524153239.3036507-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766791026101945265?= X-GMAIL-MSGID: =?utf-8?q?1766791026101945265?= 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"); /*