From patchwork Sun Sep 3 15:13:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13373273 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 6614CCA0FE9 for ; Sun, 3 Sep 2023 15:13:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32CC2280013; Sun, 3 Sep 2023 11:13:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 30412280012; Sun, 3 Sep 2023 11:13:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A48F280013; Sun, 3 Sep 2023 11:13:43 -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 05231280012 for ; Sun, 3 Sep 2023 11:13:43 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CB2A7404B1 for ; Sun, 3 Sep 2023 15:13:42 +0000 (UTC) X-FDA: 81195630684.16.208EBA2 Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by imf29.hostedemail.com (Postfix) with ESMTP id 0C27512000E for ; Sun, 3 Sep 2023 15:13:40 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=LwN1aYr4; spf=pass (imf29.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.51 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=1693754021; 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=3i4JKzyyHPJXK5xbz9I2FYDU9mp4fFQ0BqGZeRR+IkI=; b=ZzD/1YTa8X76wJtPg0PKZ+Zmbk9vTt8O2oUSYBs6ED01NxRcvg2jI3Osu1iYQURZepc50j rCMHtZZGBmYNxMclpYPMnE161aAzuckulIDPH/UmMfHQ1T31aD3dR15PWzNaAHhehVTXCc 9N1D0ngE6uDPwycF9l7b1PAHBpvtIaQ= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=LwN1aYr4; spf=pass (imf29.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.51 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693754021; a=rsa-sha256; cv=none; b=ochvZaqzEjNha6IqSSKnFV8F4aRkFsWI42Q7UuLUhl8VxeM+SEjVToM8YQYKlTuVCKY6f+ OjXyVShyOzRP+lJrk4Nf3/84BQi7dZnSzRSV/AW54UX3O2qV0bV810CRRHLEqaj3enB7aH NU/qiZIpVycFNJc6vYAfkQLNw6+UnD0= Received: by mail-io1-f51.google.com with SMTP id ca18e2360f4ac-7928ba24936so18811939f.0 for ; Sun, 03 Sep 2023 08:13:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754020; x=1694358820; darn=kvack.org; 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=3i4JKzyyHPJXK5xbz9I2FYDU9mp4fFQ0BqGZeRR+IkI=; b=LwN1aYr46E+gQtet8Qxr/ZpVakSoCubM820PK+50D4Tk64m4iJtpWAL2aQEQo8jeas JyKXOvB2v0z/aggt3xqeg+9srtPqbk0zGihZ9akgAVrrVRlqXW4cD8fGYZdfE94ziOxU TzWufDJcj6ei+swYOpPUdcx39+PDV9CvhyE/k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754020; x=1694358820; 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=3i4JKzyyHPJXK5xbz9I2FYDU9mp4fFQ0BqGZeRR+IkI=; b=BJywdDzhCOZDOwtUwvk02T2RxlwPeg1jGZbAbJaf+953oDDsMpBTWT0ynTlXmzj5wK /gV0yTe5xgNePCaGBa38xEtaaOM+4HO00taQf0LVDbOvUYqjAOGhPN8WWAUoExxGHBv+ qgynT9VyghFCFf0Qc+Ka1JIy0LglnBi7Rz/LPko9SCR7vsr1x8EOF64OBeYiXWskKJ1V MazzYtdgJxAYSwsNnD5OTzRTKSur1ae3GtjIfa/69srHEzFl6Yg+cBHo20eL4xBbJGBV SuMVcPHWua/WDRxCAYJINDzqRc1r8+QVPvg3eGkn+lMvmUXI2AcMfciZdmPxymXzwkLM bdjQ== X-Gm-Message-State: AOJu0YypwJtffgKWCfs8N968dUPra17LUPU7xqINdNf4CjJDEm/r2y0M mLaLZvKJSFF0c339PAlkzMNmZg== X-Google-Smtp-Source: AGHT+IHONBzFDHNEJj9fUdFbCOcAZGQgCkRLbDItObOX2Jewvf4Oe2vlmaZIITxIM+/izWF1P0j3xg== X-Received: by 2002:a5e:aa0a:0:b0:792:4d29:ecc7 with SMTP id s10-20020a5eaa0a000000b007924d29ecc7mr7910869ioe.15.1693754020233; Sun, 03 Sep 2023 08:13:40 -0700 (PDT) Received: from joelboxx5.corp.google.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id f5-20020a6b5105000000b007835a305f61sm2605897iob.36.2023.09.03.08.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:39 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Lorenzo Stoakes , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v6 4/7] selftests: mm: Add a test for mutually aligned moves > PMD size Date: Sun, 3 Sep 2023 15:13:25 +0000 Message-ID: <20230903151328.2981432-5-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog In-Reply-To: <20230903151328.2981432-1-joel@joelfernandes.org> References: <20230903151328.2981432-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0C27512000E X-Rspam-User: X-Stat-Signature: g74aomqhadcbk4u66brh1yph6g1xnap9 X-Rspamd-Server: rspam01 X-HE-Tag: 1693754020-633795 X-HE-Meta: U2FsdGVkX1/oh9FTDyT+4XoeRqs25sgJDpkXGTr4GNPotikj4eSk28ESZQMsuvd1gT5i0bXsWuq+jHbkejYrHgYVKnjwIMCZ6XkD7zvQjtxmthDcgeEaAajtQ9p9TgpoR2d5bnp45qkhCgcAZTpek5EHUw+caM2dfzFWm6iIw97MEZ/kPQN2HUOpq951RNx+lGXwWCcI6jPHHuPHu7CKrmnbXGUtDiVFjZyobXCyLnQzGlsTT3VUD1FMoHUGoa99iXFT8IZ3zQiriqwabigIBWnIr8eKJw6+zvCW29BL6P/gIrhAH+NY+xrSbTK+UB5kR9VBwVUFyrBfQMNT1J/mwb4I6JaMbNKjbWi2lKBbgFldAKEP2QxkXtoEceatcUKlijFU5CgWwmmxycik3IfoEHBshFxbOIs2GhMPNDVUCwrSnkacSi1mZ4E8eXeYsHg5udgnKjYnGq0JEH3wVU2vXZOm3jkAsCIYj4Z8lhh5xFrAIBj9jL/o28q7WMZ5AEAl0TO/CNSMQZwFmxWdqYgGES9pj7ujSYqlqgjhsFmngUrq1J8Dx/cTQt8K9OZhFipUiJkkyG8wg5CPuDDII6xpbRR8tCAWco0e3zVgc2kNnC1aIwAK3/y9sfT45hYTkY0byvaKuNHLnLcw9TTkSrHeliPjPNMgekWrbg06tazD6igLGVKVAnLM9gDOd9It90diqmUjpCcA6qXc4UR89toiAUTXvAs/Iuqc7S12Pa2euYXmrvS9RhsWEvSCUqTVqWMRZYZJ3X/MN/UZg2871bsfkWvMyXV4i0C0dTuBZb9tV/A+WojCgzXDCPWDrseqR5Jpr9QlfZxRdvm5wwIYIPtTX0paxkkZGTpcBJ4r7mHc8Zdu3U3JTTgh3NaLE2EE/OKAHFW+MFvD1paQLMl88DOJ9iJoL4NH+G4UucwrSXqSo0GzAPrXR57FZpVeLLJGp02nz4EwOVw3lrnRLwNolP0 SJvaH5qm girSdaYuEN3IC3qu3b2UdHkQ5ed8AlKIUoEkJkpVAOXneFwnAgYOlr7Vh6OaipSsGkNb8DZPO6Gqw1uc5ytQB8Hb7hMDgC6OgaDTqA+QWTlPwql5VmmiZIoxWEaAucAFnGszm4RDvmrZjOuiDaGzSJmdZIals+OCciwICmXgKFVn5z9Ebs4JZpl1Jntdvu+ISRPdWkk1Mtfl0kcvQ9CnR1JTd0bBZ/51kS1w8NYPq1oQNkLtvoE4po8AFX3832LXWK3DkxgcIYF3IJoAkf1l5s7zPfhzBsCj9efpz5/UJ7LppVd/Gy9/lbi/63TGkb6n9xb4bLdyx5QPMM3sJRdk4GY/cjhSY5J6YVePMyc5stEjbPzIXfGGMYEHUH/EqaEEsGlbjt/ipTzVL2Yn9gQBzEmfcZp/JqFBPE4E7E8h9MChhSaE= 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. Reviewed-by: Lorenzo Stoakes 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"); /*