From patchwork Wed May 24 15:32:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13254189 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 C8778C7EE2E for ; Wed, 24 May 2023 15:32:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 35563900002; Wed, 24 May 2023 11:32:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F4FB900007; Wed, 24 May 2023 11:32:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F37F1900002; Wed, 24 May 2023 11:32:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DC07A900007 for ; Wed, 24 May 2023 11:32:56 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A6A87C09F4 for ; Wed, 24 May 2023 15:32:56 +0000 (UTC) X-FDA: 80825541552.24.49B53B6 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by imf28.hostedemail.com (Postfix) with ESMTP id BEDCBC0014 for ; Wed, 24 May 2023 15:32:53 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=On7I5ayO; dmarc=none; spf=pass (imf28.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.182 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=1684942373; 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=TYAWyrxgPtqWXYxm6cJhdFwBx5wHciPZ/aYd0labdNY=; b=BMMGGCrlORCilfn/NP1v3qTPlgbAkieCL+tyD+zVggqEVIUQ8ILu3Jya64zcAAmE+8KETt bcJMEIt/QQVLSZiC+otvhwc/T+D26f1PTR3NMQu3oe4NLA1nw3D1rI26DbTqzPCBIISXQs PCdzXZ7XEgIbBxiL7dOD/p/7nLxnFWQ= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=On7I5ayO; dmarc=none; spf=pass (imf28.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.182 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684942373; a=rsa-sha256; cv=none; b=Qt3UnNg62YzkUG/IxKac9TMc2lf4xKUgY4+zFsZoIdwIJ87pnQZM4Iun/wzJlBurVHxqMQ gcpAJJspSfMyVQC/TW97IrCAStWT5VIqNreBMgcS/dQNLII+HUjuYdCOTG4rAG2VnaRuBb rAQ2Xey7ztMV9sZj9wliiiVGYOi5LLI= Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-75b04e897a5so152586185a.2 for ; Wed, 24 May 2023 08:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942372; x=1687534372; 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=TYAWyrxgPtqWXYxm6cJhdFwBx5wHciPZ/aYd0labdNY=; b=On7I5ayOaYhi5YG/GPdB9nxaPm77pHmMCGllRGYcQUbOR9RaWe8+E1kwIyz/Gm1IO2 lzlpVKQhkPTjP/JCXbURVFFWQ3jgbHYHGgepr9uzBOnTK1CeaL3pkQv0Y3ntC9d96Fw5 Q/V2PreQmRTT8rUh3sL+unZfL9jgCw+Ofoan0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942372; x=1687534372; 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=TYAWyrxgPtqWXYxm6cJhdFwBx5wHciPZ/aYd0labdNY=; b=EtlN3cxPZO68aiK9+5XrhgFJHa/ZaesndaV+MDR/n+XfgNtPzs7Pqmvu6GUqS6IDg/ b3qYP4FeaSLKftnYwvoXArLWUNGq3oVVuPfQklmLZrqWMTNVHVJJ1Xuwi/CpQA4G9c6V YZCQBP1tuYHAiMm2JsPjf2tS4rQVoSYjbaWJyPYD9Uhbsk23DSRBMWiGW2zyG3SfQ4B5 RSPNMLHQQITIm8tolj0an5mork8H2GwDMGi0KNnSVYbjGky0vkukifxgJvz2Dm4AL3CL IKtywCgzmWXZgbwSVOyXTLgOIY8ZB0FUzR4nEPBGvTVk2Fo+Numv7HxL8GVSKyRgCnj2 6C4g== X-Gm-Message-State: AC+VfDyJAFi+yJ5JasTzgCqCWVFXieEIQSWrMQ6v+9Jgp1Orp1KmhiNh QKgVs+BJ+dLP3hgqv0Sffx82bA== X-Google-Smtp-Source: ACHHUZ5whL3pswyeHoY7J7ITOmoL7n/+ckLUp2U8dIz21/Y207+W8uQinoe+VqHo2CMLKpf+5MBPGQ== X-Received: by 2002:a05:620a:172a:b0:75b:23a1:3634 with SMTP id az42-20020a05620a172a00b0075b23a13634mr9248078qkb.69.1684942372538; Wed, 24 May 2023 08:32:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:51 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Linus Torvalds , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v3 1/6] mm/mremap: Optimize the start addresses in move_page_tables() Date: Wed, 24 May 2023 15:32:34 +0000 Message-ID: <20230524153239.3036507-2-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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: BEDCBC0014 X-Stat-Signature: tatcmqcuepi73bpkacyegzzzdk1hkt45 X-HE-Tag: 1684942373-925510 X-HE-Meta: U2FsdGVkX19UvgFWS9UEJZ6vCwzbLKGaLx4FUHrvXgKKBl6/B6qAsSg9LbEyBRwSm1JYx1S99m7P5vVLNDo9gB7SAhPdC9uhCqPC6ND1hAZbK7zvD/wZXIvbgS2g4w5qaLME/3pTmLRfqcDK358EpfD+IcdqK3GUKu1xilVgFjC/IGVbdef+bv8m0UUFz61591jo9Y0bzI5pyiaE6M2GcDTP7wRiCWZY6e/f5LyC+ZsrXQTABQ+yxD39sDv141AzYdfs7YGUVD1skDK0aJGL4/SyEZxewMwrkfboUozvWDMDp2pqXFbvAMJGgJy3+H77RrkVLAIQpdZcHRngE4q4cxWg/8RIGVlO89DVs959rvTeQKrIHBtYQWn8BS1Q0LeklbGdaLLssnzCiA8m7XevOHcptLsyPDxwlZN2RxGlIDGR6mAPu2od5VwM9S8icxZJQzEmc2U4mbnAa2HASJHVemLG/ptIWLie1GwSoTfmJzOjvvqs8qSg3ooa2YnrAqwq0KtT4yRUS9x7lGJOA1hdXWwzQJJw+QF+Wey3/j526PtOBKm5+VBWJF8HA4d23UbgqkrPhqjblbpKqVnesUBUoIEh4qKnrK5az0DU7BiK3i6FJ5SDiwOPtxr6HYu2UfxdPZUUMfgw/jd393CRxRYlJgNHow38EBiCzgNlZbUDUElY/MeogPqwJf+4Q1soCUp8aE0Fw55Q+5IoQ0LON5j8CmnifMb3Ni4d+YqYLljrCsd7owKXCHNYHMG5Q3pA7nf5mU9cGc1W0pVMAHdXjv309FHNgPTyC97Z4iNQX6jM16CNgBn4KjzIg9lUr4HoQvraQE/P0Q1cAJUhHEx/1EhefjNcUadcOmrV/dxRed1SvjB+GfrD55bqMGJKgxRTFEONiWPKK5whA2oNT3SMnMrbL4QWzp7ts6s7Gp45VimyIQEy8MgC5XvQKOJe1lIWm3UPdm+Aldym+QopwMPGd1b fQga1gJf uO0s2yf5SH5YDWgKKWThSy58qrMyZMCaiA9TDYdwn5MLhsN6xKSDZPF58/GY6wZV5UNe9iSaKHs3+ZPnU78T9d7Sh8W4l4JdrmWsCybM4iMTitnmgviRcAkLa087DVlIiNUXU5yjTHWS5gxyenPiOqFibJl/kZR08Sj+oZo3ry57PlXnUvrghvEqyBAZQztoPz74EdpzZJCKnwcCohojTWVXSyAVrpdy9aN4Ttk2ChZdSYHXnoGNqkCdG+0Xns+s6vrNF1h6Kq8jvnSorfpcpgD5gkevwVO/hKlxPZOPYWZ7VF4G4jwZ+Ulj2oHTtjjKk32p7zdWC9KswVi1N2QGhRCNUBRO7EjomLodJ80i+SCOP86LST4jkqwhXq9VWjGGbr+ajbhvcHAgkRFPxCtZv4mg3Pi4RS/MiSUrIG61atjkrAyOel7yon29CtQhzQx4Rl4r65oq375FABc7qFk77P4/EmcPNeonzLRMJ2GbDh6/UrxJZy1WBcOZYKgd+wFOmGBinZ7Sl8IrHg9idynmXqUIr44EtuehHQ5XljXEQ7FASX/LoB5nyS5yY9YV2JEn6l+jDMcgMYeHgFtoVGrYFWEw7Bw== 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: Recently, we see reports [1] of a warning that triggers due to move_page_tables() doing a downward and overlapping move on a mutually-aligned offset within a PMD. By mutual alignment, I mean the source and destination addresses of the mremap are at the same offset within a PMD. This mutual alignment along with the fact that the move is downward is sufficient to cause a warning related to having an allocated PMD that does not have PTEs in it. This warning will only trigger when there is mutual alignment in the move operation. A solution, as suggested by Linus Torvalds [2], is to initiate the copy process at the PMD level whenever such alignment is present. Implementing this approach will not only prevent the warning from being triggered, but it will also optimize the operation as this method should enhance the speed of the copy process whenever there's a possibility to start copying at the PMD level. Some more points: a. The optimization can be done only when both the source and destination of the mremap do not have anything mapped below it up to a PMD boundary. I add support to detect that. b. #1 is not a problem for the call to move_page_tables() from exec.c as nothing is expected to be mapped below the source. However, for non-overlapping mutually aligned moves as triggered by mremap(2), I added support for checking such cases. c. I currently only optimize for PMD moves, in the future I/we can build on this work and do PUD moves as well if there is a need for this. But I want to take it one step at a time. d. We need to be careful about mremap of ranges within the VMA itself. For this purpose, I added checks to determine if the address after alignment falls within its VMA itself. [1] https://lore.kernel.org/all/ZB2GTBD%2FLWTrkOiO@dhcp22.suse.cz/ [2] https://lore.kernel.org/all/CAHk-=whd7msp8reJPfeGNyt0LiySMT0egExx3TVZSX3Ok6X=9g@mail.gmail.com/ Suggested-by: Linus Torvalds Signed-off-by: Joel Fernandes (Google) --- mm/mremap.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/mm/mremap.c b/mm/mremap.c index 411a85682b58..184d52f83b19 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -478,6 +478,53 @@ static bool move_pgt_entry(enum pgt_entry entry, struct vm_area_struct *vma, return moved; } +/* + * A helper to check if a previous mapping exists. Required for + * move_page_tables() and realign_addr() to determine if a previous mapping + * exists before we can do realignment optimizations. + */ +static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_align, + unsigned long mask) +{ + unsigned long addr_masked = addr_to_align & mask; + struct vm_area_struct *prev = NULL, *cur = NULL; + + /* If the masked address is within vma, we cannot align the address down. */ + if (vma->vm_start <= addr_masked) + return false; + + /* + * Attempt to find VMA before prev that contains the address. + * On any issue finding prev, assume there is a mapping and return false + * which will turn off any optimizations. Yes, we're conservative! + * The mmap write lock is held here, so the lookup is safe. + */ + cur = find_vma_prev(vma->vm_mm, vma->vm_start, &prev); + if (!cur || cur != vma || !prev) + return false; + + /* The masked address fell within some previous mapping. */ + if (prev->vm_end > addr_masked) + return false; + + return true; +} + +/* Opportunistically realign to specified boundary for faster copy. */ +static void realign_addr(unsigned long *old_addr, struct vm_area_struct *old_vma, + unsigned long *new_addr, struct vm_area_struct *new_vma, + unsigned long mask) +{ + bool mutually_aligned = (*old_addr & ~mask) == (*new_addr & ~mask); + + if ((*old_addr & ~mask) && mutually_aligned + && can_align_down(old_vma, *old_addr, mask) + && can_align_down(new_vma, *new_addr, mask)) { + *old_addr = *old_addr & mask; + *new_addr = *new_addr & mask; + } +} + unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len, @@ -493,6 +540,15 @@ unsigned long move_page_tables(struct vm_area_struct *vma, old_end = old_addr + len; + /* + * If possible, realign addresses to PMD boundary for faster copy. + * Don't align for intra-VMA moves as we may destroy existing mappings. + */ + if ((vma != new_vma) + && (len >= PMD_SIZE - (old_addr & ~PMD_MASK))) { + realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK); + } + if (is_vm_hugetlb_page(vma)) return move_hugetlb_page_tables(vma, new_vma, old_addr, new_addr, len); @@ -565,6 +621,13 @@ unsigned long move_page_tables(struct vm_area_struct *vma, mmu_notifier_invalidate_range_end(&range); + /* + * Prevent negative return values when {old,new}_addr was realigned + * but we broke out of the above loop for the first PMD itself. + */ + if (len + old_addr < old_end) + return 0; + return len + old_addr - old_end; /* how much done */ } From patchwork Wed May 24 15:32:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13254188 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 A398EC77B7C for ; Wed, 24 May 2023 15:32:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA36F900005; Wed, 24 May 2023 11:32:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C520F900002; Wed, 24 May 2023 11:32:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B18E1900005; Wed, 24 May 2023 11:32:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A37E3900002 for ; Wed, 24 May 2023 11:32:56 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 692F01C7739 for ; Wed, 24 May 2023 15:32:56 +0000 (UTC) X-FDA: 80825541552.25.E53BCD4 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by imf14.hostedemail.com (Postfix) with ESMTP id 8539F10001F for ; Wed, 24 May 2023 15:32:54 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=wlQ8v0bs; spf=pass (imf14.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.182 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684942374; a=rsa-sha256; cv=none; b=S5htdsRgd+Prh1spNoxVITCTDi6ltup4vBrdtzZtFtJgJT0nuKei/gBlQvJLyYjDodY3b0 YrZuRPIRVarupcu2CNMkc+rpdXA6GukO+b6dWcttJFBl6wQZaFV00r3NvNih9D5CGTevvm Q2I1tbI/NvFGoKYfFbzJV9yt5g+ZcoQ= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=wlQ8v0bs; spf=pass (imf14.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.182 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=1684942374; 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=KHeROvIq4CSC2FMFzmeiM0i6iG6dvZWzuyFWS5s0CDs=; b=OZ+1PMLNzT8iugK6BCCOZcildS6nN0ids7KcJco0hLhLzRvFZg4S5W2l5tXrgbo2aXkYBm iR7uTqhQcQm1usS3eaXIT+PPXHhyjx/USbwH46Wj7IO8O9ATdl2qmw230OIVNNiwKBVmnS md5Dgid4yqpl62ekXls9rEeMplLDhAM= Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-75b00e5f8e4so87981185a.0 for ; Wed, 24 May 2023 08:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942373; x=1687534373; 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=KHeROvIq4CSC2FMFzmeiM0i6iG6dvZWzuyFWS5s0CDs=; b=wlQ8v0bsuOA9hOIgsHnV0xzgFyBlbO7E6j9Va6zOMO1Lq54V7yVfco94su2p9uA3zT GAryTJuE/eyHkMObMXy25pmdmQHP7wJqp+4j8yOi3nIDdmPVuWoRz9/X7tM7FdDjEOMh Zp+su0joqmuWavruN1PE8gqEZA6j486QyZYcg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942373; x=1687534373; 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=KHeROvIq4CSC2FMFzmeiM0i6iG6dvZWzuyFWS5s0CDs=; b=C1y4ksgyvLOaaK4XIvU5dCrheRcXJftlSMZWJoVVXsqIyob5I1+SjFDlUuOeErNhg/ XZ8NrTgXDfhGyUIvZP6e0Srjt6FgjVk0zommlw8ywFnDchh3W56O5fi+5f5j7BCaUE4K VUuplg7QWBeTjx2OQqoLQsaug4pQVCzWnsIX4Lazf6BJOcfBwihVJNqcii4Nbu59IiLk 9e9CZLuhCAeFSC0AKNGYi3+hDzwg7/nq4MesqLSCvjvASp4wlTpH/6Um4X8YnXgGUHO2 goSpz7kogXSQ+fFGWPsCQ1KRgl6t7McCoAJZOHHXbKayyhWpk2LSDrWCOiqUKjLZln2k J2nw== X-Gm-Message-State: AC+VfDyUxsSETK3+SvdnaI326Wp4Fl5R70zs/dTn6lthLAJdpZra3A09 86eOhimD14QBe4TyG5oiMTZ9yA== X-Google-Smtp-Source: ACHHUZ6ycnNF8Yd16rVGJYGcJx7BXDIL8yb88KqwcCKd5ph6scnPX3adlemcGYKPU680bLYJm4BkEA== X-Received: by 2002:a37:856:0:b0:75b:23a0:d9d5 with SMTP id 83-20020a370856000000b0075b23a0d9d5mr7619005qki.43.1684942373514; Wed, 24 May 2023 08:32:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:52 -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 2/6] mm/mremap: Allow moves within the same VMA Date: Wed, 24 May 2023 15:32:35 +0000 Message-ID: <20230524153239.3036507-3-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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 8539F10001F X-Stat-Signature: f6bw9p3aade4s1moq8fezo1pmjrpew6d X-Rspam-User: X-HE-Tag: 1684942374-534548 X-HE-Meta: U2FsdGVkX1+X2T6l/skZ0g4kxQW5X3enVs8+ZELTme/x9kixQ3nHyIVrKemsaL2j1HJlS6MEaZgVBZiSfFpsYQodfd75VayoeNIX/la5j6RxeQp+xcWnhxYDCRGYyMl0g22stc3lwH1zwCEzSwAgOR7DW1m+5X+FIkXSya80vWvQfTNriGoLmrWEjnCxUBwp609MjeCzuu6wdriXyQiJoKr+ZgzzcvFO7bnNkXkhMDqo6QtK92BhMWD2yFdJFggl/mS8qQxoY6yNgTMz+uZh8ECFikfOTm/WgzqB2YERMFFamGolnSlkvMf+ZsjRGO43aYYpjQ8dr2u4QP6ZmIbM0xcm7XIidhKz/2BzV+wU5F+PQJInsOJYYJfjbSbwCNHboPjj08W0a1znzkGsH+T37GjZPYVl9yOYA6L7bMloRixG7E1yKmj/h1EyY9vq0sKzP7StPEksz98nQU6yg91L7wmpgPX30AsyB57ZAaAy9QcwgVEKa05IM+Nmvw1IXjr1o0x28RT4k6j30wO+6kJ4mUTF92ZmdMEwCNX6MeiBoHV6Cnj6I4sz/CkIbVmEG8rwjNbR+Ws96V1tv+axnd4iDtlyzvwFVVXYrzfwzIeFXgpPNsQf7QiezXBHrBGPDRy+xPzBv1BlkNsPEnD/olGhX4a8Xz1N5sJI/8pxLQgtpYrODWtkcsdST49LuXLBEZWHrn48CkImIKKnk/yoApvmZlThdc9zhaXhABD7BO5eK1RVunzYtz36QXzUCFYZdYOEM2JqAF4B9rmnANPDM+ybLTvaomEOrxYAr5jt1DTF8aGFCsThiySrzbM3MCEmoC4Ntf97QI37VYJMkGalfGcL4ApLCggibKiVeVeisRK58/GEAmr2MRT6XJAOTwixx+54I0VszPQeRHH4c2C2oHdz2ZDTDac9/+eKcAYSJ1VP+aC+aFRMR4e6nwp5vn3/FzlNpwMeTksFjpaIuN3a/ME xjC/JOkB rEmpETy1+YkppRyRQAzzPQSOcd/+jgBlupaQBnQFu52hVrnMnrJVDT67JHDfqIywWHJ2xUtR9vYoVuhp5AQ9p6enROtYBx2/36I8BwSDvj6EPoFoa9x5WjKqDEu9EYGRyFNnNn3c2NynGsbJG0dZ2w/+vI8IF9oOAGIqEiEEAConcrWIgHtsAVaY5i6g7OhCoKdElW/w9O5DJxikvWMN5nYht4jXhdTihLySfBfPwym80MbEeqenWBcLswE8xK5gjFoE6enoyNEuLlOG0zoyx+KCLqEeZJpWV1PnS7+qakabtr5wuL5B7LO3IqjzsGr+i8lLtFHqO+1XtwWc5Ed5pO1YUwPny4ndt0UwwOg+pq0bj90gTRIRVA82aDAuLAFNTVmot2zWzXMYnmoNkKOBgpXQ8nw== 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: For the stack move happening in shift_arg_pages(), the move is happening within the same VMA which spans the old and new ranges. In case the aligned address happens to fall within that VMA, allow such moves and don't abort the optimization. In the mremap case, we cannot allow any such moves as will end up destroying some part of the mapping (either the source of the move, or part of the existing mapping). So just avoid it for mremap. Signed-off-by: Joel Fernandes (Google) --- fs/exec.c | 2 +- include/linux/mm.h | 2 +- mm/mremap.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index 7c44d0c65b1b..7a7217353115 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -707,7 +707,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) * process cleanup to remove whatever mess we made. */ if (length != move_page_tables(vma, old_start, - vma, new_start, length, false)) + vma, new_start, length, false, true)) return -ENOMEM; lru_add_drain(); diff --git a/include/linux/mm.h b/include/linux/mm.h index 1f79667824eb..dd415cd2493d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2265,7 +2265,7 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen); extern unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len, - bool need_rmap_locks); + bool need_rmap_locks, bool for_stack); /* * Flags used by change_protection(). For now we make it a bitmap so diff --git a/mm/mremap.c b/mm/mremap.c index 184d52f83b19..323c3b94216f 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -479,18 +479,23 @@ static bool move_pgt_entry(enum pgt_entry entry, struct vm_area_struct *vma, } /* - * A helper to check if a previous mapping exists. Required for - * move_page_tables() and realign_addr() to determine if a previous mapping - * exists before we can do realignment optimizations. + * A helper to check if aligning down is OK. The aligned address should fall + * on *no mapping*. For the stack moving down, that's a special move within + * the VMA that is created to span the source and destination of the move, + * so we make an exception for it. */ static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_align, - unsigned long mask) + unsigned long mask, bool for_stack) { unsigned long addr_masked = addr_to_align & mask; struct vm_area_struct *prev = NULL, *cur = NULL; - /* If the masked address is within vma, we cannot align the address down. */ - if (vma->vm_start <= addr_masked) + /* + * Other than for stack moves, if the alignment causes the address to be within + * its own @vma, we can't align down or we will destroy the current mapping. + * In other words for non-stack moves, the masked addr has to fall on no mapping. + */ + if (!for_stack && vma->vm_start <= addr_masked) return false; /* @@ -513,13 +518,13 @@ static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_ali /* Opportunistically realign to specified boundary for faster copy. */ static void realign_addr(unsigned long *old_addr, struct vm_area_struct *old_vma, unsigned long *new_addr, struct vm_area_struct *new_vma, - unsigned long mask) + unsigned long mask, bool for_stack) { bool mutually_aligned = (*old_addr & ~mask) == (*new_addr & ~mask); if ((*old_addr & ~mask) && mutually_aligned - && can_align_down(old_vma, *old_addr, mask) - && can_align_down(new_vma, *new_addr, mask)) { + && can_align_down(old_vma, *old_addr, mask, for_stack) + && can_align_down(new_vma, *new_addr, mask, for_stack)) { *old_addr = *old_addr & mask; *new_addr = *new_addr & mask; } @@ -528,7 +533,7 @@ static void realign_addr(unsigned long *old_addr, struct vm_area_struct *old_vma unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len, - bool need_rmap_locks) + bool need_rmap_locks, bool for_stack) { unsigned long extent, old_end; struct mmu_notifier_range range; @@ -540,14 +545,9 @@ unsigned long move_page_tables(struct vm_area_struct *vma, old_end = old_addr + len; - /* - * If possible, realign addresses to PMD boundary for faster copy. - * Don't align for intra-VMA moves as we may destroy existing mappings. - */ - if ((vma != new_vma) - && (len >= PMD_SIZE - (old_addr & ~PMD_MASK))) { - realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK); - } + /* If possible, realign addresses to PMD boundary for faster copy. */ + if (len >= PMD_SIZE - (old_addr & ~PMD_MASK)) + realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK, for_stack); if (is_vm_hugetlb_page(vma)) return move_hugetlb_page_tables(vma, new_vma, old_addr, @@ -696,7 +696,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, } moved_len = move_page_tables(vma, old_addr, new_vma, new_addr, old_len, - need_rmap_locks); + need_rmap_locks, false); if (moved_len < old_len) { err = -ENOMEM; } else if (vma->vm_ops && vma->vm_ops->mremap) { @@ -710,7 +710,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, * and then proceed to unmap new area instead of old. */ move_page_tables(new_vma, new_addr, vma, old_addr, moved_len, - true); + true, false); vma = new_vma; old_len = new_len; old_addr = new_addr; From patchwork Wed May 24 15:32:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13254190 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 B85B0C77B7C for ; Wed, 24 May 2023 15:33:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C4F2900008; Wed, 24 May 2023 11:32:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 501D6900007; Wed, 24 May 2023 11:32:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 32D3A900008; Wed, 24 May 2023 11:32:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 18141900007 for ; Wed, 24 May 2023 11:32:58 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A4479160A61 for ; Wed, 24 May 2023 15:32:57 +0000 (UTC) X-FDA: 80825541594.12.4B16E5D Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by imf08.hostedemail.com (Postfix) with ESMTP id 88BEC160025 for ; Wed, 24 May 2023 15:32:55 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=fkkfqnJ5; spf=pass (imf08.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.172 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=1684942375; 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=t64UzVHVroabp76Xd4g1LLeTmZtqX+n8nvVYbfjxh90=; b=kOxiMxp7wsajE5NxaP1Y494SaUnS6WeG8wuGCexUtUdHM3VOlN9B0q6uXhnFrwsSae1wG2 gmc+y2ItJTVRJ3c9BAy+5qGuSIvdp57qN3B7uhX9ohcOxgUy63pws+AyQn56kjOubHOLyM WXWRjK35PsOmdZFWXnziNOnaeluLtRk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684942375; a=rsa-sha256; cv=none; b=YEDNbY4zuDPWxPGEIZPH9rkeGEdpxHBZcxcFEOHHYjUrSX0IUZaT+/SvJAz41Luz+eKRBN xancjQNrHzuIqkBqbQmrPr0iBx2jhDGk+7zEqFnmsRao5eYU5qRtUI3cow15Se29Y/BO8+ By7f89EmlXXK9jQjBQWlDO3F9k8JtAw= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=fkkfqnJ5; spf=pass (imf08.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.172 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-75b064451d3so90697385a.0 for ; Wed, 24 May 2023 08:32:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942374; x=1687534374; 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=t64UzVHVroabp76Xd4g1LLeTmZtqX+n8nvVYbfjxh90=; b=fkkfqnJ52t84oMcKxKF0Qg5EIe+H/e5iNykQYFnHWz3Bf1EAvgahlIVxTsm8Z0hi4V OFp1GA5hnGMxdsdMdpwgJqewYy3Q6MuKpYhOgU1MBi6rBu/XAAnTNc41obMlD1z1fxX9 KRxzh5JbqUbMmqvEK2VKJEfhsUNZsUg4KU2WI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942374; x=1687534374; 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=t64UzVHVroabp76Xd4g1LLeTmZtqX+n8nvVYbfjxh90=; b=jzl8RtqphCaGwg5fUbBK2ciU3aE3Cqlqo8V9PfmZSaBXxNByOf+h8ZKkwiUdTgBFzl 12+g+rc9+QE2k526HxYfgioWvlckoySOWAQFixO8EtoqoQmCW09fhDF2ezv/GRnhNvor Nf2BYtCMmQXHpJw8HjMNwBBTuHdX9qAu+1NZVSrH/wypUySW4dr7oCTQAEIXbIkp2QAg RCT/zy+G+wlwdjorfw0E2vBGA0s8LGxfALN7sIitEOzhQOapfszlSsZjriL8VpEJawOO SeBRQD+KIsYUqkhBR5KQrBVQ7XBG9hhQTAlyhRblHlkDa+wPcpgtYQlvEi2vxQF+ULHX yugw== X-Gm-Message-State: AC+VfDygYNNIcFKWBpVWFFJtyM/keO1cFpdeQyPAw1fhTQBC+A+PVGht moWDyzDryjoMXf8eEEeSh1kudw== X-Google-Smtp-Source: ACHHUZ6ZgaDuURo3rp7ZvQW0Zz7zS3AwUT/I5tC0ZTN1H3Ry0XxZjW7459XHwomEnb2GkqkgzGnC9A== X-Received: by 2002:a05:620a:3d14:b0:75b:23a1:8306 with SMTP id tq20-20020a05620a3d1400b0075b23a18306mr7101918qkn.1.1684942374473; Wed, 24 May 2023 08:32:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:53 -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 3/6] selftests: mm: Fix failure case when new remap region was not found Date: Wed, 24 May 2023 15:32:36 +0000 Message-ID: <20230524153239.3036507-4-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-Rspamd-Queue-Id: 88BEC160025 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: n9zkymd5t36a47sxbhrj99i14mqb9oin X-HE-Tag: 1684942375-377259 X-HE-Meta: U2FsdGVkX1/Ru2NVObiSr/6vUDhS7MQH1Uaxc7RsE+hHedQY0WtJA2DUgED0VsWJxkgdnhFSgNePlAV6yzgmPjfQdWzP7M2e1fSHxkZaLDKBVC8hqkcY2MzadGHFtAkZlUjGrlps4XImhZBBM0SOLR3ONrMRYfnNzwkUutYCMlceH4M0WBBBLCZ8QRoyO5OxKpZuOap+tl/a3D9WX0rj/NiNkqCj2d/sZ6KODHO+NOWuCKUWq2mQDjFMsEZxeHZMKrmxSrGTQVC1bqgkQHIFe4bsGXNty0fRs129dF8YO9ytLSkIPCFQ0rdIyMfDKGXByGyFkEiOZGHDWqS/+2MPvh9Ymh1FakKOLNjLFJkIPMp2JyuPro7wsHSQAFG/KKJy5oyMQ4T+bXg3Q/vf1dyEA/nUXt6LVa8miVdTF0CdnrIi6wgqcZUcxQZrdsSF9/r7dBDGIOUBgxUYNmv0DEdJlBXfJiSJTmb8tzqaHcgHjZTaCe5t9oGvIwtKZs2ptydXkql/8I5o3LxFDsYDBxLFPRSg1OwEy7uhFZ0Zjmr4dY7N55yS/LuavnP8TlaeEtypVPbeaG24DYoqbnDTXPIzAnzBdCEQrmM58gFjbNPkV32TdcU9pTkGFq+x8w0U2bxM77vhouMpk7XeKPi46F/F7q4fFMche59hotx4pirbFaD2vbFQcvhg+BrAWjwcfwlVG1QbEVayu1ZPtAdl1zVpZeydnDRVDYgYSaXeSpAh4rtRGldZxa/RW22V949o8zfZrg7a1ulKhFfVGrIjq+GN4/b5eN9nAAQGFpupKcNAEC2ggde86iTkAOXUa9roWZ7LZYrmBRseO3tG6pVaMfoURvxppApqPhUIhobBPXSTPxre6LVh3Td4QyQrNh/GTl6MQzIXA4NcCDl0O8ujQKOW5ccgrLHfHqaYYWmDWbyN/lDME1wQuaO8hDLh9wEmA6YfNwF/Z7ApSZcpdvyMsXE sYPy3PRZ YowwDEH46ZPXnSPB2Zuqh/5q84SYtXh4Td2UX4VyvUukGaL/ARRloL2i8dC5a9AD1Jn9nHP/qziuL+lC62Je45SLoM+aUv+iLoCjTo7XwQLFUkncUnVLWruWfRrMEf7GG7Rf2U+6q+RcYt8FiF1F31JnfI/uSr1fnfGL6JXOJhnq+b2tD0EZE8gxJbavN4XLblzmXTQre8wASnU/D6/5SHs7yEChKu/2lDWJF2bvluQRHRnCEn1/VxJP7ehqKvzstXzlL/vV8M5Oz8nuiclnGVAIxPkQVAcOzYk+uL8rABsGcucvGkMxN4MkBoOrEyrucXbwPCwI62vG/7/QeXMqTC75IQrfAxc1oD0AGigiW1SbLkfL8gjs9ibSYgEMTq/fP4Wf8MC4wST39KTUnixrX2Mm1sL2ZiTJc3Jjusi07WQv0/6E= 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: When a valid remap region could not be found, the source mapping is not cleaned up. Fix the goto statement such that the clean up happens. Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 5c3773de9f0f..6822d657f589 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -316,7 +316,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, if (addr + c.dest_alignment < addr) { ksft_print_msg("Couldn't find a valid region to remap to\n"); ret = -1; - goto out; + goto clean_up_src; } addr += c.dest_alignment; } 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: 13254191 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 1DCD9C7EE2E for ; Wed, 24 May 2023 15:33:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 21B23900009; Wed, 24 May 2023 11:32:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A4B5900007; Wed, 24 May 2023 11:32:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F111D900009; Wed, 24 May 2023 11:32:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E4501900007 for ; Wed, 24 May 2023 11:32:58 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B23BC1C786E for ; Wed, 24 May 2023 15:32:58 +0000 (UTC) X-FDA: 80825541636.27.249D338 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by imf12.hostedemail.com (Postfix) with ESMTP id C69E040005 for ; Wed, 24 May 2023 15:32:56 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=M1+QdVek; dmarc=none; spf=pass (imf12.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.171 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=1684942376; 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=NeLo+1v5QVrlgRBXg5xtPAbcixHJGEJ5KqvLkh1zFdZ5SwiBAkEI8oWoKBth8UnvYKgSbm izQVLFq//zHDe8C1Jqmf9QYMpgmG2umA/lPyRV+P9phs42tQMtc8K0X+hxxsh5z1MIFXfT ewc/kgC2o640UcpecT43H805+FeRwhw= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=M1+QdVek; dmarc=none; spf=pass (imf12.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.171 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684942376; a=rsa-sha256; cv=none; b=l1f2H5YGbZUjCFxG0pl/WuXa3/EYkZoPhu1ydiWeMETEmUeDCID5RiGhZW3J67rbYtt/as wAFtL+QAPQaNsmRaKJtQ/+Y4zZR/nl9mpNNx+ts1rEU5Y/hldhH5iSDEN5QNkxpScRGZpo 5UBIayAtkSQATZWdCOJMhpvLSN/Sj3o= Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-75b2a2bf757so86945285a.2 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=WgPbFsXjkrUXN7M8FUv02zR3DIOIE4JZmxKnGe70AVsnyzt/AaNOPCE2YcYdMNVmi0 NWsrM/wpwEqmAXiVMRKb7cU3K6NRN5EQmNsNloCgaEy3VZ79L8Gp3tyOSXm1Vb+LFYNu Bdgm3f/cBwh5noSbDZGb47DmZ7dGs5Of3vnwazpfCRIitdic9GnwxMn6CdUXTFkt8dmA bUD530xt9cJ8+yqQPww5UBVqDodWQw4C1uomd4U5QXKQw7g+XEuz/AjGeNH50i2Jb4FJ 0JEUxVo5jtnk8Rnh/yQszg8abLO2fbPF+heGZ5nj5WffeCW7oIegYN6B7xRFXUyMf6bA zpGQ== X-Gm-Message-State: AC+VfDw9hDqLJiRg5QpSsh12tZxE8t6p9YABEMzmrM0KtW1kW5UL9Tc3 KQHtvyCMdfeIO+1V15g2bs89Fw== X-Google-Smtp-Source: ACHHUZ7pGnIf2o9ajIrHimtsY3ZVo0AwxwHuV3J27Cvh7vb4ofkI3lzj/qbuT6W4fOkb8sK71jM2Aw== 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-Rspam-User: X-Stat-Signature: pgraounsazsq7bfajr56khnj51akk5hd X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: C69E040005 X-HE-Tag: 1684942376-984184 X-HE-Meta: U2FsdGVkX19MhuNqGJdfwK1ah+bV4YZYDVDi8PXXgfhB3RUeHKY5/sh3Tv6dQ+EPUdbYf6KWj9BKU/oK1axegcZlTt/DtFh2gN/Ar0GySFrugFKtz+rOzV/V2jU3rurj+A0VER4KP2dv9IHjTsv21ImIGvdNivSQFWSsbyM7kPkvm4LHqVEQsv34vvqTAdnnuXBnBXGGDNLf8mgkJgxgVbG2BF3bFHWCxM5sb8D7+MvCXFdQsGu6hqv8YNnLF3jmtxsNp8o0zNNfkhTBAppOph6jUnGmfS5dZwGCTjefp9f5Xf6yRpwjzanFQqc1s1dzafDbt43HRwTz3RJYLcZxYyOO+wHSm9U43dkOtm17I1IqldDcGg0GwVNNDISSnxdKqMnqQVjFvJya3Gf9yvRUz0A/lwePmHfRrEsxdFonZMfmvGVBIjK21RH6DdkJDWhCf6BQh32b+KHRApCJ21AGNkWK2+M0cPrwMOHLmoFt1V8w0aASToocAcY5k/8CWTBhvsVTswT6Zt7nHAG9sjs1CMv/RWX8sSKMAHmK77rzBq1sT0Bk4UaUyDoRvvSnQuUlzoNM8AB5eSHhWxabwE+bMbgWzgCY+0SFVp8nTD1xgNR8WLkUSlx4bQRxWsfC5D4ZhA5i8aHNfskkxHim3JHJRAnjP2uTJQ/qwPG6uA5hg0IauAuHvSyVo/PIjjXVhI5P/Zgqc2CnQnpNXNNUHhIzCYuNEdB0ww6KN47jZ8ENsXIFIs5xg77JNauDqamG4ypV+ENqPYtQYdVZgNDBVy+QMY3MWx21jnYwIQjEshDLW05Y+SOKsriyH4PclIzg3w+Mh1lZgjxX0u1gEKS814XQlj6I5KcNtS9jV04c4r9WrcqDMbO578vqggga4sbLezAUVjIdsAj+G4FNuq/EMxlLV3/+RelPNRxkA+QTtY2uOSWUwOlrnJ4VABI7AYNboteyH8g5p8iRL3Jw6vpOVPX M10O9tLK wR2kB7teUByEu4qvDMS8Ody1BObOrFmSqhROYgvoIR0hOdAwEup6N5hUzl1KZLfwLRpcypMafBSniN3PGv1PwlGi03GKf1a0zSACXuBDoqGKrMPCOf3ECueaN3wTgDP+Bm3MzMXAYn3jBKXTEkBQ0yp1RAn+tQ9j3GLkFSxxadlJ8F9QNWKqLsnLyG7svjOg5TrgTl2NFBQlQNLqC+BJXzGkCXjzIaEoj58l2Ikc7AJ9Tq6anOefHSdutvh2+HItxhPwiRWBhNsarVt6Bq2zBOovRRmNYcswOl1Q2jTe14d4yA0FUbRtY9Fz8OJrBkblX2g3uLREcBS5+ABwrCLGaMrxhbU6h5c2r9bwK1jptHvQViyUOjc0DMVLkNnMoKeaTwoiZgL2KvHITifJ0mS6blqNhjQ== 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"); /* From patchwork Wed May 24 15:32:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13254192 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 296A3C77B7A for ; Wed, 24 May 2023 15:33:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA08290000A; Wed, 24 May 2023 11:32:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E2982900007; Wed, 24 May 2023 11:32:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C52D990000A; Wed, 24 May 2023 11:32:59 -0400 (EDT) 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 ADAB5900007 for ; Wed, 24 May 2023 11:32:59 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8327F1407E9 for ; Wed, 24 May 2023 15:32:59 +0000 (UTC) X-FDA: 80825541678.17.27CC019 Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by imf30.hostedemail.com (Postfix) with ESMTP id A494A80017 for ; Wed, 24 May 2023 15:32:57 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=WXmStX11; dmarc=none; spf=pass (imf30.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.219.50 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=1684942377; 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=O0tjYXHW6XM/uedvUXhXTuxPHgCneWCEnRUXzUjK1Qc=; b=AaN2kWbXaiEKNc+KEpj2yqS7XnDIkgLRnlQheKLbT8SZ+JPoDRgwXPbveAyU5sw1OOKV/t mMxU3I+tL1nyz44XL5Hfo8riNv6A45AfHDPIUp9HNiPtqepI48w/2+6OLyfKTUjomKSDbO rodWoNqILwz7rHpvLus0Bo6TtEYoeWc= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=WXmStX11; dmarc=none; spf=pass (imf30.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.219.50 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684942377; a=rsa-sha256; cv=none; b=GNkU1nmGPu5Hu+F1y/x+UG2ATt2miEhv/LhTwA6PqCbA5+Xfh9T1P751SFxb2mM9PjlG88 QTXW8qZm57rodxWBG34o2OBasJVLR+U2lzUv3nUC2B6yHCUfoWeqN6dYXwinRvIgFyM6nm sRdSxSYDo2UlnE09Qi4qD1k/Y2aAMdI= Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-62382e86f81so5753716d6.2 for ; Wed, 24 May 2023 08:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942376; x=1687534376; 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=O0tjYXHW6XM/uedvUXhXTuxPHgCneWCEnRUXzUjK1Qc=; b=WXmStX11/lcotVWec4XBydhg1nwkR8cil5DVP3/cqlxA53iGKbBlq2LBmZ8kmIS4/r a42WEPdEz0veNSLGKQQUgS5H4SFzZ1A3H++srImE6xmN96tt9QD+wjWYUpBgUjbRleFp 6NoSUE5RS+7ygUhpinyFf0tBZWIFpnBydFpVc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942376; x=1687534376; 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=O0tjYXHW6XM/uedvUXhXTuxPHgCneWCEnRUXzUjK1Qc=; b=NUsH07XS/A8g4U5Vx8k5DiAcGeK83KeOBsWtMiEATXDT7zWqOpO+02xONBaLEtZgPk A0vFEcznLp7rooR6KqIzZqvRvQMkua7Z8GhjVeT6gCVXqgQf8UnCjWWBGjqExY+YMHMc AomBsmBllR5mDTR9DMh19NM4jaPoJYDSRFXoTy91jqkE5AChe4UiXO77IvWY1paKv3KM EqU/U646yyUCAnQHCKw89TfcAcjCLrIZrJlYaWrwFXRA4Fb3NyZ2F9AxAWDhYxx8UAt5 i33V4HtgrfhDPObjhBinYFCDJ7BIoo6LwUZJvJIDkR6lQl76oyBGuMIyg3IrQ5SfWjYc /i3g== X-Gm-Message-State: AC+VfDwguvxG/bjWzW+rBvgSTjnn0LLVeIXyuiXvzer12vF+2oatE6O0 P2cNCkChMT46VSypxAYBfOj0LA== X-Google-Smtp-Source: ACHHUZ4AwVIelEKkuW8s2dK/dZksnx8tZkorF6LbPrQg4YdcjW4lVxTGTr5no8OzVcwrd3wM8+TwCw== X-Received: by 2002:ad4:5942:0:b0:623:86a9:7696 with SMTP id eo2-20020ad45942000000b0062386a97696mr23247464qvb.5.1684942376578; Wed, 24 May 2023 08:32:56 -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.55 (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 5/6] selftests: mm: Add a test for remapping to area immediately after existing mapping Date: Wed, 24 May 2023 15:32:38 +0000 Message-ID: <20230524153239.3036507-6-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-Rspamd-Queue-Id: A494A80017 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: mwmddmf1af1wokzm8886u4yb369ik3qs X-HE-Tag: 1684942377-363741 X-HE-Meta: U2FsdGVkX19MjC/LN78osPBhtQHLy/hZAsbO7qmbINQTJr/Llza/VdBoD8fptkUxtSenk5Qvdl2NstMBTR5L1u2P0QHevuPHTToThoLPXcfOdp0cHM56ELT+KPhGDdtuoWN9/KbZopcJPKCFv3van2rb/c6vt09ROYpUlSg0kITW8ycBulxEGbPXtQRKsDNz7DkAxLYycjUMXzv15laF+AnESUf4dNSDq+TOaeBNZ4RxH7Pp1a+1nnfxVMjm64oqvDqXE+l3zqZRUTpkITzba+7mDnuawhPbCD79yf8a5HRzEadTs67YtwvTLI6RM+o6Ws9Yv6wtOQ9F2b2SRWmcUnIDGQRkcnjK80zapvl5plVDd3MBCCg866MNmmXLVN6z80jQcRSVadDTXwxXRN9VCw5xda+Myp4dHMziu0fxxWOm5zCGBQthEW3xc8SqB8b/KK6uSIWEzwlcqAhFIlrbRV0O9WLkidSNY46+dcFLWYv2MBCPhP71eUtnbojO5lck0HMxsaw2RZOleRlSVw0COsJcWObGbmxrclF8R8a23PSp0TVWWSb03sBFYdoiugT87TSTlAkuDaW+ZEwbxu5Lq2TlKzuKDnLTXdOh55r7V6D2fjFf0FP8CnaV2hehVxzFGszMcaZsSHwgWBNmJLtYh4JH+TyxICmeZ1BxQyvInca7n8fIfNVvkWk2F6PDJrw55lKiVO7U1DWs+HQBJJnl3TFN1x9i9s6y6IyhZrr5g89K3KJO/GIIgc5i0XAhU11kgJ6MAv1Q93hhRHJzu//3pjZcFUGm7k0cHlrwljEc5foe68ewWGh1LJOIikvg8PTaLjyVa7GKocb7+AMc5I/y0aQDCC2n1PwoClBgYcU5pVLRr8DpX6/iK9HgNC/i6Mkr/bSULSbZ/hKhW1eFAdD08T7hQra1IaXfMkQQC2ZtFQDAblNokeTwj78zokQOlD0S/KnJptlUPb8uKPjAoUU cfjAevjf sE1+j0VGsbI4O+MYoVT+Q/DEkInobNVF59PZ1kg6/gNUW5Z0rGcqutRQOomBjA3crANoQF4MVA+LuzihUdwaSavnTaVx81KFsRIEckR6PVlTYql58Ai+30E4/ac1fqTi8rxUE9DMBjSsrvwVhR4c4NGhVFzU3VsuqmihKx0AK1Xfa6v8v1XRARP3z8ePe1YrBFANtlnpZzwThcBb/T32vzjsxb4b2m68jk/PhvvKHjNRcCOdtaD6hLKBser0HCWGBm1VPGHwPvrVsuNIhKh0yWermxh4Yd+H+3EMHElGd3y9ZjkBbDxoT0H7k6m4cir9I9ulDPCNtUOsFEgQlRfpYlJyyckpPYi8fpR402yuRZWZ2sQ82NJ0pv5L9Tme4hyRDEtYT576QwCo8L80JoLsx5wR9sNvtL9u4nekeAFks9DWKVUIeo25980mRiZRPhaycYngJKACTsJ96JIYKG1G5LwaPuw== 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 support for verifying that we correctly handle the situation where something is already mapped before the destination of the remap. Any realignment of destination address and PMD-copy will destroy that existing mapping. In such cases, we need to avoid doing the optimization. To test this, we map an area called the preamble before the remap region. Then we verify after the mremap operation that this region did not get corrupted. Putting some prints in the kernel, I verified that we optimize correctly in different situations: Optimize when there is alignment and no previous mapping (this is tested by previous patch). can_align_down(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 can_align_down(new_vma->vm_start=2f00000, new_addr=2f00000, mask=-2097152): 0 === Starting move_page_tables === Doing PUD move for 2800000 -> 2e00000 of extent=200000 <-- Optimization Doing PUD move for 2a00000 -> 3000000 of extent=200000 Doing PUD move for 2c00000 -> 3200000 of extent=200000 Don't optimize when there is alignment but there is previous mapping (this is tested by this patch). Notice that can_align_down() returns 1 for the destination mapping as we detected there is something there. can_align_down(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 can_align_down(new_vma->vm_start=5700000, new_addr=5700000, mask=-2097152): 1 === Starting move_page_tables === Doing move_ptes for 2900000 -> 5700000 of extent=100000 <-- Unoptimized Doing PUD move for 2a00000 -> 5800000 of extent=200000 Doing PUD move for 2c00000 -> 5a00000 of extent=200000 Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 57 +++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 6304eb0947a3..d7366074e2a8 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -29,6 +29,7 @@ struct config { unsigned long long dest_alignment; unsigned long long region_size; int overlapping; + int dest_preamble_size; }; struct test { @@ -283,7 +284,7 @@ static void *get_source_mapping(struct config c) static long long remap_region(struct config c, unsigned int threshold_mb, char pattern_seed) { - void *addr, *src_addr, *dest_addr; + void *addr, *src_addr, *dest_addr, *dest_preamble_addr; unsigned long long i; struct timespec t_start = {0, 0}, t_end = {0, 0}; long long start_ns, end_ns, align_mask, ret, offset; @@ -300,7 +301,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, goto out; } - /* Set byte pattern */ + /* Set byte pattern for source block. */ srand(pattern_seed); for (i = 0; i < threshold; i++) memset((char *) src_addr + i, (char) rand(), 1); @@ -312,6 +313,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr = (void *) (((unsigned long long) src_addr + c.region_size + offset) & align_mask); + /* Remap after the destination block preamble. */ + addr += c.dest_preamble_size; + /* See comment in get_source_mapping() */ if (!((unsigned long long) addr & c.dest_alignment)) addr = (void *) ((unsigned long long) addr | c.dest_alignment); @@ -327,6 +331,24 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr += c.dest_alignment; } + if (c.dest_preamble_size) { + dest_preamble_addr = mmap((void *) addr - c.dest_preamble_size, c.dest_preamble_size, + PROT_READ | PROT_WRITE, + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); + if (dest_preamble_addr == MAP_FAILED) { + ksft_print_msg("Failed to map dest preamble region: %s\n", + strerror(errno)); + ret = -1; + goto clean_up_src; + } + + /* Set byte pattern for the dest preamble block. */ + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) + memset((char *) dest_preamble_addr + i, (char) rand(), 1); + } + clock_gettime(CLOCK_MONOTONIC, &t_start); dest_addr = mremap(src_addr, c.region_size, c.region_size, MREMAP_MAYMOVE|MREMAP_FIXED, (char *) addr); @@ -335,7 +357,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, if (dest_addr == MAP_FAILED) { ksft_print_msg("mremap failed: %s\n", strerror(errno)); ret = -1; - goto clean_up_src; + goto clean_up_dest_preamble; } /* Verify byte pattern after remapping */ @@ -353,6 +375,23 @@ static long long remap_region(struct config c, unsigned int threshold_mb, } } + /* Verify the dest preamble byte pattern after remapping */ + if (c.dest_preamble_size) { + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) { + char c = (char) rand(); + + if (((char *) dest_preamble_addr)[i] != c) { + ksft_print_msg("Preamble data after remap doesn't match at offset %d\n", + i); + ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, + ((char *) dest_preamble_addr)[i] & 0xff); + ret = -1; + goto clean_up_dest; + } + } + } + start_ns = t_start.tv_sec * NS_PER_SEC + t_start.tv_nsec; end_ns = t_end.tv_sec * NS_PER_SEC + t_end.tv_nsec; ret = end_ns - start_ns; @@ -365,6 +404,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, */ clean_up_dest: munmap(dest_addr, c.region_size); +clean_up_dest_preamble: + if (c.dest_preamble_size && dest_preamble_addr) + munmap(dest_preamble_addr, c.dest_preamble_size); clean_up_src: munmap(src_addr, c.region_size); out: @@ -440,7 +482,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb, return 0; } -#define MAX_TEST 14 +#define MAX_TEST 15 #define MAX_PERF_TEST 3 int main(int argc, char **argv) { @@ -449,7 +491,7 @@ int main(int argc, char **argv) unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests = 2; - struct test test_cases[MAX_TEST]; + struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; time_t t; @@ -510,6 +552,11 @@ int main(int argc, char **argv) test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[14] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Dest 1MB-aligned with 40MB Preamble"); + test_cases[14].config.dest_preamble_size = 10 * _4MB; + perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /* From patchwork Wed May 24 15:32:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13254193 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 5EB23C77B73 for ; Wed, 24 May 2023 15:33:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E9F4C90000B; Wed, 24 May 2023 11:33:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E4EAB900007; Wed, 24 May 2023 11:33:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC79890000B; Wed, 24 May 2023 11:33:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BB041900007 for ; Wed, 24 May 2023 11:33:00 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 758E0C0A0C for ; Wed, 24 May 2023 15:33:00 +0000 (UTC) X-FDA: 80825541720.03.74ADB88 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by imf17.hostedemail.com (Postfix) with ESMTP id 8AF3140017 for ; Wed, 24 May 2023 15:32:58 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=fTepg2gL; spf=pass (imf17.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.170 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=1684942378; 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=h61GjzCXvltES23o4poVmjSYAXp4vZcszjGp5xgEGZ8=; b=zgriaPQHFdexHkSrgq0NXITrnwABaeVKSZzpuTHFCrzgzgJi/orGA9IkhcYB6wi5TKVfLR ozOwk5p657Owl0htA9M//vMhIDCy5OVB8YWKYvtA0qD8rvzyD1yttAOmsyXIBQEUHg8wqN gaHdXzDp6yXi8i8o/zApkp/ZvDjWF9c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684942378; a=rsa-sha256; cv=none; b=G27R2RdNAJiQYb9DLiwHKwDGFyL5IxVe0pKg/zSjoAw0gfa6Nz4lln+YeV3s1+zBwbwRfK CEfw54FUbIBbstQeV5O7XguILdEPDabCC/MEVYvWBlFea/4bbD+hKIJC4qM8KkOBv8JFDg 4Y+NSUAYyc0UPp3UcHtFrjMISMvEVPM= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=fTepg2gL; spf=pass (imf17.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.170 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-75b132ad421so152862585a.1 for ; Wed, 24 May 2023 08:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942377; x=1687534377; 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=h61GjzCXvltES23o4poVmjSYAXp4vZcszjGp5xgEGZ8=; b=fTepg2gLXsKRDSS3n315I2mTd5hD9c2GRRNGC2wT9Pv1umTd8fob7wD+9EmKEHSy1U JFE5UVfGrEPXsXiFMq89EduNO36oib/1iEtT3SWY+v0Hr0/YukGkb/aj1tsd+gq3+KKs qg5EKhyLZjkSGWEFRvLD5HeTCqPaTdbo3r53A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942377; x=1687534377; 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=h61GjzCXvltES23o4poVmjSYAXp4vZcszjGp5xgEGZ8=; b=PLz+qp4lo+QzdoM77411/5HXFCNpfEhpjmf9lkPWx4oTDCkYuzEcnyrYs6VgG8diR/ cwERiRTqjhYeWDjUxUGFlGaYmpg4erKxiFQ3KxARznffiq4uS2JTmJ+8liHVEDRkfzNZ 4T3BEBdBn4uBoF4wdTfCQ4VOII8zDCRLTkGZl1OuQ26Cff8y9XuDJg9NbDqJL3U4X3tL c0P1mFzH1HPEuCSFwxAeRtjo64PpIJeZ8/rYpj43/Ac7GPrP9HeGr+yrcowYs3WFdPcN i91menDLRAAVVia3VPjZM8DlhknVBjn4+SS4QgD23ZDutvjwwT7g21FfpHcikXyidhrR TOig== X-Gm-Message-State: AC+VfDwxRy+X19xqOZ4G47si4Ce81YgGm0omsIDhhZT8LrQriuh0eY8i KSt7/pgwTFzIZi7FqGJFTWKDJg== X-Google-Smtp-Source: ACHHUZ6AChzGe8zj3ATmmPA39ZihGAOgH+d2JvfKahlPyGoIVsVd15lvAmevdImu0XtiQQY9/yyQKw== X-Received: by 2002:ad4:5949:0:b0:5ef:46a9:15d2 with SMTP id eo9-20020ad45949000000b005ef46a915d2mr27143817qvb.7.1684942377556; Wed, 24 May 2023 08:32:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:56 -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 6/6] selftests: mm: Add a test for remapping within a range Date: Wed, 24 May 2023 15:32:39 +0000 Message-ID: <20230524153239.3036507-7-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-Stat-Signature: w8wegp6barm6asztbkgxhwbm96gq3w5o X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 8AF3140017 X-Rspam-User: X-HE-Tag: 1684942378-39804 X-HE-Meta: U2FsdGVkX19SVENnSzlFYqAEd/B5Nm+Yj2MVuxJC82HtknnmjpYcE4zc/1BQR0HFdYA6c/eAD0lkJ9N9dUr1quJwuVCdeLMscouJHiMW2HfbwYZebmJrzMWg1gp45IQ5OTm2G5O0lu0fZ/8t7Le36yJgo0QVkvL/uLup0f06CDVpz4BXB9AZd+pJJQMblrIFZCIdAJpL4CMFiyd8U14HjaqQn0gFlHDbn0br1EYFPQ5JedLSQS5RxxrFtNnu3bghtQEvyDEnaD38A9hA4SBI5hOkRr/KO4QacjgZ9eFC2TKiLVDPBhD3pOcOOpSEUN6cM3YLaBJgRyyDQe0/8hRPMWONVHTcjUlDSaVRkudC7iuSAcT2o90E1aWVeQeeoG7qZrAxaiy99/LxylYjlnEgEaqbGWpgetuFFsvwWT4cE3MSphhJyiYlN0E1/YtVn88pAjir/pFqMxVLHj6yleSEXof8k+DRitWJGogtPtM5idNOdPzz6Rgdz45G3/nKGI3gQbPIeYXlTyBsM6m5UEto+9JeNwYDJBQ8jiK9Cfdlg/fIprjHgWcpIwtDdIsVVV77QYLLT+g2xNX0uPylwm3nkplx6wUEmmYOwE2Q7vqbn+MyWpUy5WNWmNZJBmqG5tu3FOmhOca/Eafdy42lZEq1JM+Cfxamk/jkiPh2MK8kmo4YMUIzPGEYSHp7ZXMTqRj4STX8b+CJi/s8cqjoiJeKodQv1JuXrREy11sA2l7XvILpImcY+t9Jb5en7eWRtI+H+0RZjUktLWji2yY9vEEqUfUgVouSaf+YHqnxpA0hSF0Pw9cA5DrLdOUruA2VAj63NdXFQw8I3h2oJ1xMIAs3AiXjlLLfrU9EDqIEGsyzE1aMxUdCLGIPNR9OfMGnX3DDWN50L2OVrxgrUFSJ1I6et/wiRaWNh4F0ZZobb9QuHMijZHL9Vwk3nHvzeOxkdcNuGcf9ha9AiORg2hgN0g6 Z4DJJQSn kfXueO64nEkl1b7dmNqGRw1e5MbXE6E7sx6dhnApXmIcYsEWbQ3PjGT+xZV+WMIP2+CuO7rRamyUUPz0w+Q6Vj3GCBFzXF9rSDbKmcWCdHp72czIRwBTXddDMzO7FGeicg0AisVC4KlwTwxZ76DTTrqzYpenRx/q9QQMnqGGuOa2+sDvZhmKNHhAbci5rlQT7h9TFoTIkWWdeuBh1zezLGtbVkDrQM9yRt2gtDXYcoxCB00tVn2upnpIQ/BXrA1ddgkwvK7wi/sgQ5MQou2P/hqc0869P+HnkbaUfIV3CZO9Rqn/NfJitsZpvnP/ccvtQj6uj3IJJK7WQPg8WhZsuRjtXSKx9WPMtsQaETXTJmiKOoPcsk5YhgY53VMXllq50Ziu/Z/xmRvp1H0BIG+rwfejNqXfLVOcjV4/JXdB5mcVPSQDYw5tpE0KNgBBRYPR61z0iuV+eEoa26NqWMKZBBSVzgqbp1F5sLsbp 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: Move a block of memory within a memory range. Any alignment optimization on the source address may cause corruption. Verify using kselftest that it works. I have also verified with tracing that such optimization does not happen due to this check in can_align_down(): if (!for_stack && vma->vm_start <= addr_masked) return false; Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 79 +++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index d7366074e2a8..f45d1abedc9c 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -23,6 +23,7 @@ #define VALIDATION_NO_THRESHOLD 0 /* Verify the entire region */ #define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) +#define SIZE_MB(m) ((size_t)m * (1024 * 1024)) struct config { unsigned long long src_alignment; @@ -226,6 +227,79 @@ static void mremap_expand_merge_offset(FILE *maps_fp, unsigned long page_size) ksft_test_result_fail("%s\n", test_name); } +/* + * Verify that an mremap within a range does not cause corruption + * of unrelated part of range. + * + * Consider the following range which is 2MB aligned and is + * a part of a larger 10MB range which is not shown. Each + * character is 256KB below making the source and destination + * 2MB each. The lower case letters are moved (s to d) and the + * upper case letters are not moved. The below test verifies + * that the upper case S letters are not corrupted by the + * adjacent mremap. + * + * |DDDDddddSSSSssss| + */ +static void mremap_move_within_range(char pattern_seed) +{ + char *test_name = "mremap mremap move within range"; + void *src, *dest; + int i, success = 1; + + size_t size = SIZE_MB(20); + void *ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (ptr == MAP_FAILED) { + perror("mmap"); + success = 0; + goto out; + } + memset(ptr, 0, size); + + src = ptr + SIZE_MB(6); + src = (void *)((unsigned long)src & ~(SIZE_MB(2) - 1)); + + /* Set byte pattern for source block. */ + srand(pattern_seed); + for (i = 0; i < SIZE_MB(2); i++) { + ((char *)src)[i] = (char) rand(); + } + + dest = src - SIZE_MB(2); + + void *new_ptr = mremap(src + SIZE_MB(1), SIZE_MB(1), SIZE_MB(1), + MREMAP_MAYMOVE | MREMAP_FIXED, dest + SIZE_MB(1)); + if (new_ptr == MAP_FAILED) { + perror("mremap"); + success = 0; + goto out; + } + + /* Verify byte pattern after remapping */ + srand(pattern_seed); + for (i = 0; i < SIZE_MB(1); i++) { + char c = (char) rand(); + + if (((char *)src)[i] != c) { + ksft_print_msg("Data at src at %d got corrupted due to unrelated mremap\n", + i); + ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, + ((char *) src)[i] & 0xff); + success = 0; + } + } + +out: + if (munmap(ptr, size) == -1) + perror("munmap"); + + if (success) + ksft_test_result_pass("%s\n", test_name); + else + ksft_test_result_fail("%s\n", test_name); +} + /* * Returns the start address of the mapping on success, else returns * NULL on failure. @@ -491,6 +565,7 @@ int main(int argc, char **argv) unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests = 2; + int num_misc_tests = 1; struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; @@ -572,7 +647,7 @@ int main(int argc, char **argv) (threshold_mb * _1MB >= _1GB); ksft_set_plan(ARRAY_SIZE(test_cases) + (run_perf_tests ? - ARRAY_SIZE(perf_test_cases) : 0) + num_expand_tests); + ARRAY_SIZE(perf_test_cases) : 0) + num_expand_tests + num_misc_tests); for (i = 0; i < ARRAY_SIZE(test_cases); i++) run_mremap_test_case(test_cases[i], &failures, threshold_mb, @@ -590,6 +665,8 @@ int main(int argc, char **argv) fclose(maps_fp); + mremap_move_within_range(pattern_seed); + if (run_perf_tests) { ksft_print_msg("\n%s\n", "mremap HAVE_MOVE_PMD/PUD optimization time comparison for 1GB region:");