From patchwork Tue Aug 22 01:54:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13360068 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A25ADEE4996 for ; Tue, 22 Aug 2023 01:55:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232200AbjHVBzr (ORCPT ); Mon, 21 Aug 2023 21:55:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232177AbjHVBz0 (ORCPT ); Mon, 21 Aug 2023 21:55:26 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E36E613E for ; Mon, 21 Aug 2023 18:55:24 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-7923dbb66aeso35049839f.2 for ; Mon, 21 Aug 2023 18:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1692669324; x=1693274124; 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=u/QIpV5GdoUntyQD+YAulEqEr5HWAYhIt+wE2vL+NDs=; b=XkzwrKY2BPO8OgeQrtUkfRLAKPdqR5M18ZKGU4FGFYxvzWBQw/eRILHendM5mzgczx BYc3zziDMJlYLqaCnwu/53EUEoReNctpO9RDz4aY9+4UOxQi20TdBSerToh1EPXlQG2U E93hf56fnUcks90HI5CRHcJwgSm33hqntG3Xo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692669324; x=1693274124; 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=u/QIpV5GdoUntyQD+YAulEqEr5HWAYhIt+wE2vL+NDs=; b=AZB/RsZqMVXeFCv1uvn7mrHrefxkGbquhPEZJwFT0pYNmZOn135csaGKQynjZxp0yq 7eiYmnEFaojP0+e3F6JZeYcAlCdqwkeRRVBKhjcQPgGLABoLLu8YdiiAaYTtHRMu1kZU bQc6gnhS4d8cKJYq1tYxZQU+FmOQrYGn2HAtpHqrzJ8fgbwyTFMFQtCcuTZcFEPJcCyp rAdU7UmsR6Ot0PpA6hJJdRflrfFSxl7xPcAu/rPml9E/2U5wzNYO6lqHPNva+1M3l2Pp ECNVQqv/QbwJ05LG4iUjEQEqNUmz7LY8Z7WZLZ1yNFSQcYiTPrAkqWe/7projUg7JCm+ ZXOA== X-Gm-Message-State: AOJu0YzJYfUMjvxSgkNP/JIXSaKgRtWARKk+ZbCMRfAfUztBGWJz3xjP AU3uMeurZfTHOZdt1IuiRn0idQ== X-Google-Smtp-Source: AGHT+IH/MZvRRV4VaPoT76ACeI7st3J3G1ER7zfxqE1rsoOojx8UWxh8tAIJJ7hX3Eu9rNxe5sWekA== X-Received: by 2002:a05:6e02:2189:b0:349:2bab:9e47 with SMTP id j9-20020a056e02218900b003492bab9e47mr10720872ila.12.1692669324214; Mon, 21 Aug 2023 18:55:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 18:55:23 -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 v5 4/7] selftests: mm: Add a test for mutually aligned moves > PMD size Date: Tue, 22 Aug 2023 01:54:57 +0000 Message-ID: <20230822015501.791637-5-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 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org 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) Reviewed-by: Lorenzo Stoakes --- 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"); /*