From nobody Wed Dec 17 10:55:41 2025 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 9263AC83F2C for ; Sun, 3 Sep 2023 15:13:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243454AbjICPNo (ORCPT ); Sun, 3 Sep 2023 11:13:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231787AbjICPNm (ORCPT ); Sun, 3 Sep 2023 11:13:42 -0400 Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E22FAF for ; Sun, 3 Sep 2023 08:13:38 -0700 (PDT) Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-77acb04309dso33395739f.2 for ; Sun, 03 Sep 2023 08:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754017; x=1694358817; darn=vger.kernel.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=L4plAmoxt0TIZz59K3TwGGgNGB354bzgqE5y3am6jPM=; b=tbXIpgfSOxUppfhpAF7YQgdPvus3o7YClNsvbLqZx/mQ8FFCPpJy04oAAYHKT1RV4v 28vSItNSLvFZRcXsXoXE4T5+du1AgR/xS6fVSUa8ssmDzUgDmY2NHWbXnjgmqlYnTCLK S1smp78E/XNZEB90mQ/TTiAWlphEjTRNSnCi0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754017; x=1694358817; 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=L4plAmoxt0TIZz59K3TwGGgNGB354bzgqE5y3am6jPM=; b=QEL8LdMN22YtkWs/6mQ6iRUGk2hNX6/sNzyUD9yZwPk6cycn24UPz9T8GfprKQL1zk 817yTzCec5Ur6OSwhsc5dFESY6gRn/GkVOg3mNBYfFr0EZxX59D+XP5Gn34X4t5Gq2mm 5wMCfOecp0WVuog1/sZ2lX0UpU1jHN0tCPB5Rdh1gDCNAFyxmOy6V0SG97mrqy9zigjI Eru2ECDMD7i2GkwaRfM45bOtM+fbaIFz1OJQpCr+EXUAAAPE3SjonxymV6FLazU+pJy0 yJL2Uabgpkq1NNlG2McS+RcQ5LaNnqt3sAQXTTI1ga9JeWjWkvDPSbvWOZxQ6+bi/6Eg f2xA== X-Gm-Message-State: AOJu0YzyxnHaf77ZdZINSRgRrXCYDd/iusi0Ard1PtVtjnOUf9IelTV+ BASnKR4s07ugSNlyXMBXOLH29WeNqnr/qJJGSKg= X-Google-Smtp-Source: AGHT+IHJGQrTQCQWJADO7oGCiqQCRPPFaXSY0O8+5g3/GiBjHqRcTCt3H4l78vIVACIFoG7YASx0Jw== X-Received: by 2002:a6b:7f46:0:b0:791:2db5:c779 with SMTP id m6-20020a6b7f46000000b007912db5c779mr11231804ioq.10.1693754017569; Sun, 03 Sep 2023 08:13:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:36 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Lorenzo Stoakes , Linus Torvalds , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v6 1/7] mm/mremap: Optimize the start addresses in move_page_tables() Date: Sun, 3 Sep 2023 15:13:22 +0000 Message-ID: <20230903151328.2981432-2-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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-=3Dwhd7msp8reJPfeGNyt0LiySMT0egExx3TVZ= SX3Ok6X=3D9g@mail.gmail.com/ Reviewed-by: Lorenzo Stoakes Suggested-by: Linus Torvalds Signed-off-by: Joel Fernandes (Google) Acked-by: Michal Hocko Tested-by: Zhenyu Zhang --- mm/mremap.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/mm/mremap.c b/mm/mremap.c index 11e06e4ab33b..1011326b7b80 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -489,6 +489,53 @@ static bool move_pgt_entry(enum pgt_entry entry, struc= t vm_area_struct *vma, return moved; } =20 +/* + * 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 =3D addr_to_align & mask; + + /* + * If @addr_to_align of either source or destination is not the beginning + * of the corresponding VMA, we can't align down or we will destroy part + * of the current mapping. + */ + if (vma->vm_start !=3D addr_to_align) + return false; + + /* + * Make sure the realignment doesn't cause the address to fall on an + * existing mapping. + */ + return find_vma_intersection(vma->vm_mm, addr_masked, vma->vm_start) =3D= =3D NULL; +} + +/* Opportunistically realign to specified boundary for faster copy. */ +static void try_realign_addr(unsigned long *old_addr, struct vm_area_struc= t *old_vma, + unsigned long *new_addr, struct vm_area_struct *new_vma, + unsigned long mask) +{ + /* Skip if the addresses are already aligned. */ + if ((*old_addr & ~mask) =3D=3D 0) + return; + + /* Only realign if the new and old addresses are mutually aligned. */ + if ((*old_addr & ~mask) !=3D (*new_addr & ~mask)) + return; + + /* Ensure realignment doesn't cause overlap with existing mappings. */ + if (!can_align_down(old_vma, *old_addr, mask) || + !can_align_down(new_vma, *new_addr, mask)) + return; + + *old_addr =3D *old_addr & mask; + *new_addr =3D *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, @@ -508,6 +555,14 @@ unsigned long move_page_tables(struct vm_area_struct *= vma, return move_hugetlb_page_tables(vma, new_vma, old_addr, new_addr, len); =20 + /* + * If possible, realign addresses to PMD boundary for faster copy. + * Only realign if the mremap copying hits a PMD boundary. + */ + if ((vma !=3D new_vma) + && (len >=3D PMD_SIZE - (old_addr & ~PMD_MASK))) + try_realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK); + flush_cache_range(vma, old_addr, old_end); mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma->vm_mm, old_addr, old_end); @@ -577,6 +632,13 @@ unsigned long move_page_tables(struct vm_area_struct *= vma, =20 mmu_notifier_invalidate_range_end(&range); =20 + /* + * 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 */ } =20 --=20 2.42.0.283.g2d96d420d3-goog From nobody Wed Dec 17 10:55:41 2025 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 C5D9CC83F3F for ; Sun, 3 Sep 2023 15:13:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233689AbjICPNu (ORCPT ); Sun, 3 Sep 2023 11:13:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243295AbjICPNn (ORCPT ); Sun, 3 Sep 2023 11:13:43 -0400 Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75A9111A for ; Sun, 3 Sep 2023 08:13:39 -0700 (PDT) Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-79289fefdbeso37418139f.3 for ; Sun, 03 Sep 2023 08:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754018; x=1694358818; darn=vger.kernel.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=Oa7N2sPH/lilO/UwWqLMR+jDCHXNj+j722SD4+8DAS8=; b=p3ecb/r3Oez3FeX0zxpD3f9Ziln558UEzDLpuqh8HNXSknzOxmT4SPodW6rM8VjH8D Azrhc/vJThEJlKmycWClmEDvDZx4Giojf1un9nRL8S2WIhPxg8+KOoamMha3GHXFz0Wo +qIziE2JNDpIejHJ5haC6paenH8shfjHOMx2c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754018; x=1694358818; 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=Oa7N2sPH/lilO/UwWqLMR+jDCHXNj+j722SD4+8DAS8=; b=WnXIpZooua9EJKsQxXMnpt6Z5tSrrFOvUQPXNoR1jbCMl7E4FFrH513TtrLye6Uxwm KNrsxoaaA0Xt2uIKbAF6dAPxxtxWGDZCEFfU/Tenl+5fbIpNrHTkUf3uz+s5gkm7HCGz 6b333p4W0QH0NiP1ITK7FXlaXwbyfP8DP9pYTncRBGTwank0sMkM20ieGnaRTDfebHhf KYBIsotUXjjhg1XA70yJYP2QQZrZMZ7TZ46ZjcFkK2UJ7kv5OyQYPH+SzOnlQW4rC53M zdZkMSEYUk5b7fNthSmKvd1ES9ypr3PFcjAlKufSrPF0rjWthfp5Nhg+6Mqgj6NqsePK 7Qsg== X-Gm-Message-State: AOJu0YzuU9JJKNGnbB4t/kE1UhtecE6Bkmzmo14TsL+CCiHHM9rS8JQq yhCFO2hpE4h/2Crgsb3xJeBKIABUv8S8HWdqAs0= X-Google-Smtp-Source: AGHT+IGTBN7+8BUOuxu3HzD4jDZmr/y5lg4NupMcQKdCe0g07b+paLWsn6FtLb2h4fhMmD0ruozikg== X-Received: by 2002:a05:6602:210b:b0:787:169a:927 with SMTP id x11-20020a056602210b00b00787169a0927mr8408605iox.20.1693754018437; Sun, 03 Sep 2023 08:13:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:37 -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 v6 2/7] mm/mremap: Allow moves within the same VMA for stack moves Date: Sun, 3 Sep 2023 15:13:23 +0000 Message-ID: <20230903151328.2981432-3-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 mremap alignment optimization. In the regular non-stack 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 stack moves. Signed-off-by: Joel Fernandes (Google) Acked-by: Michal Hocko Reviewed-by: Lorenzo Stoakes Tested-by: Zhenyu Zhang --- fs/exec.c | 2 +- include/linux/mm.h | 2 +- mm/mremap.c | 33 +++++++++++++++++++-------------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index 1a827d55ba94..244925307958 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -712,7 +712,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, = unsigned long shift) * process cleanup to remove whatever mess we made. */ if (length !=3D move_page_tables(vma, old_start, - vma, new_start, length, false)) + vma, new_start, length, false, true)) return -ENOMEM; =20 lru_add_drain(); diff --git a/include/linux/mm.h b/include/linux/mm.h index 406ab9ea818f..e635d1fc73b6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2458,7 +2458,7 @@ int get_cmdline(struct task_struct *task, char *buffe= r, 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); =20 /* * Flags used by change_protection(). For now we make it a bitmap so diff --git a/mm/mremap.c b/mm/mremap.c index 1011326b7b80..2b51f8b7cad8 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -490,12 +490,13 @@ static bool move_pgt_entry(enum pgt_entry entry, stru= ct vm_area_struct *vma, } =20 /* - * 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 fa= ll + * 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 =3D addr_to_align & mask; =20 @@ -504,9 +505,13 @@ static bool can_align_down(struct vm_area_struct *vma,= unsigned long addr_to_ali * of the corresponding VMA, we can't align down or we will destroy part * of the current mapping. */ - if (vma->vm_start !=3D addr_to_align) + if (!for_stack && vma->vm_start !=3D addr_to_align) return false; =20 + /* In the stack case we explicitly permit in-VMA alignment. */ + if (for_stack && addr_masked >=3D vma->vm_start) + return true; + /* * Make sure the realignment doesn't cause the address to fall on an * existing mapping. @@ -517,7 +522,7 @@ 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 try_realign_addr(unsigned long *old_addr, struct vm_area_struc= t *old_vma, unsigned long *new_addr, struct vm_area_struct *new_vma, - unsigned long mask) + unsigned long mask, bool for_stack) { /* Skip if the addresses are already aligned. */ if ((*old_addr & ~mask) =3D=3D 0) @@ -528,8 +533,8 @@ static void try_realign_addr(unsigned long *old_addr, s= truct vm_area_struct *old return; =20 /* Ensure realignment doesn't cause overlap with existing mappings. */ - if (!can_align_down(old_vma, *old_addr, mask) || - !can_align_down(new_vma, *new_addr, mask)) + if (!can_align_down(old_vma, *old_addr, mask, for_stack) || + !can_align_down(new_vma, *new_addr, mask, for_stack)) return; =20 *old_addr =3D *old_addr & mask; @@ -539,7 +544,7 @@ static void try_realign_addr(unsigned long *old_addr, s= truct vm_area_struct *old 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; @@ -559,9 +564,9 @@ unsigned long move_page_tables(struct vm_area_struct *v= ma, * If possible, realign addresses to PMD boundary for faster copy. * Only realign if the mremap copying hits a PMD boundary. */ - if ((vma !=3D new_vma) - && (len >=3D PMD_SIZE - (old_addr & ~PMD_MASK))) - try_realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK); + if (len >=3D PMD_SIZE - (old_addr & ~PMD_MASK)) + try_realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK, + for_stack); =20 flush_cache_range(vma, old_addr, old_end); mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma->vm_mm, @@ -708,7 +713,7 @@ static unsigned long move_vma(struct vm_area_struct *vm= a, } =20 moved_len =3D 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 =3D -ENOMEM; } else if (vma->vm_ops && vma->vm_ops->mremap) { @@ -722,7 +727,7 @@ static unsigned long move_vma(struct vm_area_struct *vm= a, * 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 =3D new_vma; old_len =3D new_len; old_addr =3D new_addr; --=20 2.42.0.283.g2d96d420d3-goog From nobody Wed Dec 17 10:55:41 2025 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 685B0C83F2C for ; Sun, 3 Sep 2023 15:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243780AbjICPNs (ORCPT ); Sun, 3 Sep 2023 11:13:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243448AbjICPNn (ORCPT ); Sun, 3 Sep 2023 11:13:43 -0400 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 514E7118 for ; Sun, 3 Sep 2023 08:13:40 -0700 (PDT) Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-79564282cb1so21312339f.2 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=1693754019; x=1694358819; darn=vger.kernel.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=CgAxpZm73/WsgHgaKL7ACBPFmNc1ioV85z5utVL8UIg=; b=F5dCK+GqTQVl1k+uFsaHVeTN5U2FjlKUR1h/NjZBntD0W//PyCHe1JwuE2/i+2mLiU +e+So368aqLL+pYA5SrKgZo1d1cYlKgDs4qZYTJJVCI142wEua+giqC6Yw7nxRY3LlI9 gB+xUnm8jAQySFj8+HFURo6kWaSCPp/T4fe1I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754019; x=1694358819; 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=CgAxpZm73/WsgHgaKL7ACBPFmNc1ioV85z5utVL8UIg=; b=NmvbirBwEO7iX9KI6ZRPptIPysoUc+yqIIEPmvYXpmzlf8oJp/nsYQftg76PEGCp1g x6JhTWZsEB8ohHjxlhyuqvhvEQHtS5D2LF6a+DiIcL5U/lv/bnSrKxNyAH0oiUoxfIiq nBEN8I/ChFhGNSVHNaYYR1pEG4ZpoSL7fyeL5rrPMlLnHlro8J6gOQnCfk4nYHU4MBrd xs3abMLFmBp5KWEMfqSrSSkH2b9gepcSZTw6f5TecxeD8fwMlNkI1PoHB+GICMnZNanT 9cth/8vzNEEfdotDVIPXplJiXhdhR4Mc7Fxxf/m9h/gZnIfkKjuOHkDQtNJ1sVoliOzp 6OFw== X-Gm-Message-State: AOJu0YwihYbSxSU20zN0zK1WK8ooRItFnFb0cLgjRdtmKL7AV5mSjy2S jEzMTeYp9ODMrMSwR915+Q0XFyZN3+nCppq3SJ4= X-Google-Smtp-Source: AGHT+IGK6R6X5iL9c9EiJjuyIOAcTh4DFWseDeYLr9pYLtkVVy11PWLKEcH+AWQJ5HZZkLqaClZ+hQ== X-Received: by 2002:a5d:89d7:0:b0:790:a073:f122 with SMTP id a23-20020a5d89d7000000b00790a073f122mr8739172iot.2.1693754019346; Sun, 03 Sep 2023 08:13:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:38 -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 3/7] selftests: mm: Fix failure case when new remap region was not found Date: Sun, 3 Sep 2023 15:13:24 +0000 Message-ID: <20230903151328.2981432-4-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Lorenzo Stoakes Signed-off-by: Joel Fernandes (Google) Tested-by: Zhenyu Zhang --- 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/selft= ests/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 =3D -1; - goto out; + goto clean_up_src; } addr +=3D c.dest_alignment; } --=20 2.42.0.283.g2d96d420d3-goog From nobody Wed Dec 17 10:55:41 2025 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 2809AC83F2D for ; Sun, 3 Sep 2023 15:13:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243632AbjICPNr (ORCPT ); Sun, 3 Sep 2023 11:13:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231787AbjICPNo (ORCPT ); Sun, 3 Sep 2023 11:13:44 -0400 Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E53B124 for ; Sun, 3 Sep 2023 08:13:41 -0700 (PDT) Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-7927952ca67so18555039f.2 for ; Sun, 03 Sep 2023 08:13:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754020; x=1694358820; darn=vger.kernel.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=FTlhbyia5QMCbrtLFXMkUmgVcb+mZtdvE4C2xiUXUbtiUDneBOuatj8RUARk0V/4zr M4hQmMSKtICjpEc0hHUIrB2+cXl13nTfFVXlLUp3rSD++8cPriJMSsl+78pMLBv9debc c3w6G9A3fkJCeWnwIaPVdDApuafr1lpaDtS4U= 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=NLb6YtLxiuVJ7SHlxaudu7CFJDz12iMAU6sGCItuq0szipc99rV9+f/lYsabnZSvML FG+5kHtbU/Sw12lSrBUf0lG/DCfuDfsHSh3zsNeFBsZjYz02vE9VQsIq52QUKqcw4F+d KMiF0Uem8eAkrB6WJDwreBM8gOLeixLKfLntc62jIItF0K5E0jq6xtWRsEVBtKZX/sdL E5t1ww/DO9ewi1CDMOkoU12WxdzlKxSmeNziiKCY1Yhu3mxEzOYiicjdG6ZdcgKVxr23 MbeCAVqHO6KMUL9gMCh7MF4cCjgIYm/kpXgduo+f4hAGyiDi5LwIYRZKpXsa+47NDRtw 8gDQ== X-Gm-Message-State: AOJu0Yw85OOMhC8ttPHNCdZRThZuu0B+k8OOE0AC4ygRK3dllFLjEOl9 rVdqJHaIef0mnuFKdkVxaLZjHJfo4BSoLSAHUBc= 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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) Tested-by: Zhenyu Zhang --- 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/selft= ests/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 =3D 1ULL << 20, _2MB =3D 2ULL << 20, _4MB =3D 4ULL << 20, + _5MB =3D 5ULL << 20, _1GB =3D 1ULL << 30, _2GB =3D 2ULL << 30, PMD =3D _2MB, @@ -235,6 +236,11 @@ static void *get_source_mapping(struct config c) unsigned long long mmap_min_addr; =20 mmap_min_addr =3D 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 +=3D 10 * _4MB; =20 retry: addr +=3D c.src_alignment; @@ -434,7 +440,7 @@ static int parse_args(int argc, char **argv, unsigned i= nt *threshold_mb, return 0; } =20 -#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] =3D MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, EXPECT_SUCC= ESS, "2GB mremap - Source PUD-aligned, Destination PUD-aligned"); =20 + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[13] =3D MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SU= CCESS, + "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + perf_test_cases[0] =3D MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAP= PING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /* --=20 2.42.0.283.g2d96d420d3-goog From nobody Wed Dec 17 10:55:41 2025 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 4C93BC83F3F for ; Sun, 3 Sep 2023 15:13:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243871AbjICPNx (ORCPT ); Sun, 3 Sep 2023 11:13:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243560AbjICPNq (ORCPT ); Sun, 3 Sep 2023 11:13:46 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21520118 for ; Sun, 3 Sep 2023 08:13:42 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-79565370aa3so17137939f.0 for ; Sun, 03 Sep 2023 08:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754021; x=1694358821; darn=vger.kernel.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=+BMtnhYdeu/zB56jX4tl+3iW5OG7Lep/G1Bzlyk4Cto=; b=t/vtfEzYtLVv1yf2Lo7ALU4J2usC6H/HyqzAIFvreHvc91Lg1/S4u1MpnMjtdvH+Sf BPZtO3oPSPNGkTCRM6aRRFT+T9aSKnESqRIyUBsJ54BcD8tWU8IKBVANgYP1jugU2RK6 XCpkyOR9c0LDmFaG7jgf5VzEkMvoBbH6mSORI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754021; x=1694358821; 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=+BMtnhYdeu/zB56jX4tl+3iW5OG7Lep/G1Bzlyk4Cto=; b=b+iO6FtxMwhxW48cRZXJEEwoO8z5LPL/HouLHlNEwNIaS3B+20OX32sD2tLjYKt/VJ A+mG0eRutu8V4D81d5U/cH0C7/5uXVLI780pw9W3/wKFRYv9qm/lvWwvPITEkZh57XRk rXkIEiqBVuPx12gYHTNmj+nfOPziXEnFrL6mu5WCQ0wAsmkNT7jqg6gVDvJGdt2ghI3k wlRTCx6Eur0yB36UqaYrboiSVzn01GzOkpL68f7AoGcEg0pmD6VVv9KHDpVRPuY+c9ju XtPCxUC6WBYAnTJBV5eCKZbU/gAx8X+mzDvLgFTyg1DZ/GVuMCZ7JHDovVr56WZqaJSO QEtg== X-Gm-Message-State: AOJu0YxXWw5pzpezT+/mue9qa3iMbAT/CIxMHw5vSbFAg3fl281QGbh9 lWTFokuMsnsIGfEyiLp/d7vmymA9bYljB/SiZvs= X-Google-Smtp-Source: AGHT+IGoiNLSWXDDcRwa+CUKmoRj1KyKVnC5w9SpA0dWyRbwniu1q3CeYE3pp5OaUl5HGdBBsO8atw== X-Received: by 2002:a6b:f104:0:b0:795:1a7c:486f with SMTP id e4-20020a6bf104000000b007951a7c486fmr8841640iog.14.1693754021116; Sun, 03 Sep 2023 08:13:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:40 -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 5/7] selftests: mm: Add a test for remapping to area immediately after existing mapping Date: Sun, 3 Sep 2023 15:13:26 +0000 Message-ID: <20230903151328.2981432-6-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch adds support for verifying that we correctly handle the situation where something is already mapped before the destination of the r= emap. 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=3D2900000, old_addr=3D2900000, mask=3D-209= 7152): 0 can_align_down(new_vma->vm_start=3D2f00000, new_addr=3D2f00000, mask=3D-209= 7152): 0 =3D=3D=3D Starting move_page_tables =3D=3D=3D Doing PUD move for 2800000 -> 2e00000 of extent=3D200000 <-- Optimization Doing PUD move for 2a00000 -> 3000000 of extent=3D200000 Doing PUD move for 2c00000 -> 3200000 of extent=3D200000 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=3D2900000, old_addr=3D2900000, mask=3D-209= 7152): 0 can_align_down(new_vma->vm_start=3D5700000, new_addr=3D5700000, mask=3D-209= 7152): 1 =3D=3D=3D Starting move_page_tables =3D=3D=3D Doing move_ptes for 2900000 -> 5700000 of extent=3D100000 <-- Unoptimized Doing PUD move for 2a00000 -> 5800000 of extent=3D200000 Doing PUD move for 2c00000 -> 5a00000 of extent=3D200000 Reviewed-by: Lorenzo Stoakes Signed-off-by: Joel Fernandes (Google) Tested-by: Zhenyu Zhang --- 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/selft= ests/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; }; =20 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 =3D {0, 0}, t_end =3D {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; } =20 - /* Set byte pattern */ + /* Set byte pattern for source block. */ srand(pattern_seed); for (i =3D 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 =3D (void *) (((unsigned long long) src_addr + c.region_size + offset) & align_mask); =20 + /* Remap after the destination block preamble. */ + addr +=3D c.dest_preamble_size; + /* See comment in get_source_mapping() */ if (!((unsigned long long) addr & c.dest_alignment)) addr =3D (void *) ((unsigned long long) addr | c.dest_alignment); @@ -327,6 +331,24 @@ static long long remap_region(struct config c, unsigne= d int threshold_mb, addr +=3D c.dest_alignment; } =20 + if (c.dest_preamble_size) { + dest_preamble_addr =3D 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 =3D=3D MAP_FAILED) { + ksft_print_msg("Failed to map dest preamble region: %s\n", + strerror(errno)); + ret =3D -1; + goto clean_up_src; + } + + /* Set byte pattern for the dest preamble block. */ + srand(pattern_seed); + for (i =3D 0; i < c.dest_preamble_size; i++) + memset((char *) dest_preamble_addr + i, (char) rand(), 1); + } + clock_gettime(CLOCK_MONOTONIC, &t_start); dest_addr =3D 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 =3D=3D MAP_FAILED) { ksft_print_msg("mremap failed: %s\n", strerror(errno)); ret =3D -1; - goto clean_up_src; + goto clean_up_dest_preamble; } =20 /* Verify byte pattern after remapping */ @@ -353,6 +375,23 @@ static long long remap_region(struct config c, unsigne= d int threshold_mb, } } =20 + /* Verify the dest preamble byte pattern after remapping */ + if (c.dest_preamble_size) { + srand(pattern_seed); + for (i =3D 0; i < c.dest_preamble_size; i++) { + char c =3D (char) rand(); + + if (((char *) dest_preamble_addr)[i] !=3D 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 =3D -1; + goto clean_up_dest; + } + } + } + start_ns =3D t_start.tv_sec * NS_PER_SEC + t_start.tv_nsec; end_ns =3D t_end.tv_sec * NS_PER_SEC + t_end.tv_nsec; ret =3D 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 i= nt *threshold_mb, return 0; } =20 -#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 =3D VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests =3D 2; - struct test test_cases[MAX_TEST]; + struct test test_cases[MAX_TEST] =3D {}; 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] =3D MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SU= CCESS, "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); =20 + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[14] =3D MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SU= CCESS, + "5MB mremap - Source 1MB-aligned, Dest 1MB-aligned with 40MB Preambl= e"); + test_cases[14].config.dest_preamble_size =3D 10 * _4MB; + perf_test_cases[0] =3D MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAP= PING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /* --=20 2.42.0.283.g2d96d420d3-goog From nobody Wed Dec 17 10:55:41 2025 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 97E00C83F2C for ; Sun, 3 Sep 2023 15:13:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244136AbjICPNz (ORCPT ); Sun, 3 Sep 2023 11:13:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243660AbjICPNs (ORCPT ); Sun, 3 Sep 2023 11:13:48 -0400 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1732C124 for ; Sun, 3 Sep 2023 08:13:43 -0700 (PDT) Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-795547f055fso33811139f.0 for ; Sun, 03 Sep 2023 08:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754022; x=1694358822; darn=vger.kernel.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=JBAJc+/RO3zfkzT8oQUizmToikDAYdiXUobcga/v+/I=; b=XNqp/7cUxCblamQ14jAv2530ONZdbHS8TfgSn+1vc+pkWsi4bjulAI+d5M7X6rN2Jo 1IhL1ZQDqWYsXj14OYub0Xh2CCcakwHVDpNea7lDyOSqkMFLqhDYLVqSBT4X3Xn+ztf+ ZxoPkY1DZVB9n60LXrBl/boVlxcvPLUov7YqY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754022; x=1694358822; 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=JBAJc+/RO3zfkzT8oQUizmToikDAYdiXUobcga/v+/I=; b=K3jVJrlB+ioI4bYzFEAy0lTHi5NpkFX5MHMZelD+rA396nJg5dIokXtLchd/uedLEU ynhAQ/Nc4F41KnWwVUXMpUIZoJ1Si+FyG3TzFf7K49I4YnvtWyCoHhbo2IOJJwxAJk8V VtUE6AHMBIVJ9+4wS66TzLqs/GKYb0cRtZGxi1A498JIOG2zexW04fn3RABr14MBNoy7 thcKZqq3HUCr0qsXa5ECO75TTDm5+KC5cssnnKvFEdHZ58kmijEjc3VLyYFE4qCpuALo PGemeBGVOqhyf+ygYG1xTxpfmwLlZ9oG+Mv3KKq0XNO21q6Bs2kavzCiS3VQ0uw4c2Mo 7XRg== X-Gm-Message-State: AOJu0Yyt9k/pT3x65C1IxiKzyXM4+zun02Taezw8kBtRu4L2CGVuiDVZ clEewSZZ09vNrOdNP+AsHldiOXRx/1sOHN47sK8= X-Google-Smtp-Source: AGHT+IEnJA2vqbUSl47p66mh9CCynh4MUM2TZrhlzcxgAiU4zPqoOBOaRdFGp3Nx/rofoZWjgNCIdw== X-Received: by 2002:a6b:7218:0:b0:77e:3598:e511 with SMTP id n24-20020a6b7218000000b0077e3598e511mr9517002ioc.2.1693754022005; Sun, 03 Sep 2023 08:13:42 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:41 -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 v6 6/7] selftests: mm: Add a test for remapping within a range Date: Sun, 3 Sep 2023 15:13:27 +0000 Message-ID: <20230903151328.2981432-7-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 !=3D addr_to_align) return false; Signed-off-by: Joel Fernandes (Google) Tested-by: Zhenyu Zhang --- 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/selft= ests/mm/mremap_test.c index d7366074e2a8..12a095457f4c 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 */ =20 #define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) +#define SIZE_MB(m) ((size_t)m * (1024 * 1024)) =20 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); } =20 +/* + * 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 20MB 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 =3D "mremap mremap move within range"; + void *src, *dest; + int i, success =3D 1; + + size_t size =3D SIZE_MB(20); + void *ptr =3D mmap(NULL, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (ptr =3D=3D MAP_FAILED) { + perror("mmap"); + success =3D 0; + goto out; + } + memset(ptr, 0, size); + + src =3D ptr + SIZE_MB(6); + src =3D (void *)((unsigned long)src & ~(SIZE_MB(2) - 1)); + + /* Set byte pattern for source block. */ + srand(pattern_seed); + for (i =3D 0; i < SIZE_MB(2); i++) { + ((char *)src)[i] =3D (char) rand(); + } + + dest =3D src - SIZE_MB(2); + + void *new_ptr =3D mremap(src + SIZE_MB(1), SIZE_MB(1), SIZE_MB(1), + MREMAP_MAYMOVE | MREMAP_FIXED, dest + SIZE_MB(1)); + if (new_ptr =3D=3D MAP_FAILED) { + perror("mremap"); + success =3D 0; + goto out; + } + + /* Verify byte pattern after remapping */ + srand(pattern_seed); + for (i =3D 0; i < SIZE_MB(1); i++) { + char c =3D (char) rand(); + + if (((char *)src)[i] !=3D 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 =3D 0; + } + } + +out: + if (munmap(ptr, size) =3D=3D -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 =3D VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests =3D 2; + int num_misc_tests =3D 1; struct test test_cases[MAX_TEST] =3D {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; @@ -572,7 +647,7 @@ int main(int argc, char **argv) (threshold_mb * _1MB >=3D _1GB); =20 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_tes= ts); =20 for (i =3D 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) =20 fclose(maps_fp); =20 + 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:"= ); --=20 2.42.0.283.g2d96d420d3-goog From nobody Wed Dec 17 10:55:41 2025 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 CDF04CA0FE3 for ; Sun, 3 Sep 2023 15:13:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244499AbjICPN6 (ORCPT ); Sun, 3 Sep 2023 11:13:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238137AbjICPNw (ORCPT ); Sun, 3 Sep 2023 11:13:52 -0400 Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07B47130 for ; Sun, 3 Sep 2023 08:13:44 -0700 (PDT) Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-79564282cb1so21313639f.2 for ; Sun, 03 Sep 2023 08:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754023; x=1694358823; darn=vger.kernel.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=f+nqtAseasZFOdOpIwYvU1wfrPMXCZ3Zt4BE+IzJOeI=; b=icCM7tAzofuObhoJQPpsMpaO+grSsCguGAmim704GqP8i0u1ttjtGUGUoHa3E5vRjs zKxkWRouRndPglhy6x+rPOwjcFPdDCi93iOcjGd+LXmjzx2cItmRTPTG83TYiYP7RiAU fnxCDKydFoOsyu+ocnnMmvLl1vFOjDaUJGR6w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754023; x=1694358823; 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=f+nqtAseasZFOdOpIwYvU1wfrPMXCZ3Zt4BE+IzJOeI=; b=FYalDtUjbDB26qsH6SeoOZncpfxXubNpMSgaAC9B6QuSTrWoLmSIddacQuUJQTkbnv SdKji9oK9CNeaTBt/2p1lt1a3kTga0FaSCrcr+hH1W434qdWBJxMCBZstG1QPITE2YGx QwQNKC/NrvzEdLPQTsKrJFCjvkOEC12Q+1gtZf5zo3m+fBj9lzx1Y2XIsBJSj8hYcPaS wPaq24+jMS63is5PEgnMxEKrkfOIrjdlwhr2A4Q6RnFIIv3wiwdyCml3a1qRPXLR11Wy JyXfnDzocz1+W4GuYWiJgr7ACY4RPWeFmTj8p2BsCm6jwCcPnqqaVxTwXZ0fK6cME5z9 W68g== X-Gm-Message-State: AOJu0YxfsdvlwRUHnvkcV75hHUF8FizEq4jSTzYyL0XQA4oKpkLF4gZv /SobhZ0pja39BngX/Y/N0mlNtBwrHy0F1rd+ZTA= X-Google-Smtp-Source: AGHT+IG0ubtl3WQP2iLAfgo/8U3Gp+Qcadj9ljmVKqqAyOzu0TCZj645xHn8dTLLCtLKiiIphITokw== X-Received: by 2002:a6b:ec16:0:b0:792:82f8:6f90 with SMTP id c22-20020a6bec16000000b0079282f86f90mr8856879ioh.16.1693754022914; Sun, 03 Sep 2023 08:13:42 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:42 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: Joel Fernandes , 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 7/7] selftests: mm: Add a test for moving from an offset from start of mapping Date: Sun, 3 Sep 2023 15:13:28 +0000 Message-ID: <20230903151328.2981432-8-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Joel Fernandes It is possible that the aligned address falls on no existing mapping, however that does not mean that we can just align it down to that. This test verifies that the "vma->vm_start !=3D addr_to_align" check in can_align_down() prevents disastrous results if aligning down when source and dest are mutually aligned within a PMD but the source/dest addresses requested are not at the beginning of the respective mapping containing these addresses. Reviewed-by: Lorenzo Stoakes Signed-off-by: Joel Fernandes (Google) Tested-by: Zhenyu Zhang --- tools/testing/selftests/mm/mremap_test.c | 189 ++++++++++++++++------- 1 file changed, 134 insertions(+), 55 deletions(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selft= ests/mm/mremap_test.c index 12a095457f4c..1f836e670a37 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -24,6 +24,7 @@ =20 #define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) #define SIZE_MB(m) ((size_t)m * (1024 * 1024)) +#define SIZE_KB(k) ((size_t)k * 1024) =20 struct config { unsigned long long src_alignment; @@ -148,6 +149,60 @@ static bool is_range_mapped(FILE *maps_fp, void *start= , void *end) return success; } =20 +/* + * Returns the start address of the mapping on success, else returns + * NULL on failure. + */ +static void *get_source_mapping(struct config c) +{ + unsigned long long addr =3D 0ULL; + void *src_addr =3D NULL; + unsigned long long mmap_min_addr; + + mmap_min_addr =3D 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 +=3D 10 * _4MB; + +retry: + addr +=3D c.src_alignment; + if (addr < mmap_min_addr) + goto retry; + + src_addr =3D mmap((void *) addr, c.region_size, PROT_READ | PROT_WRITE, + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); + if (src_addr =3D=3D MAP_FAILED) { + if (errno =3D=3D EPERM || errno =3D=3D EEXIST) + goto retry; + goto error; + } + /* + * Check that the address is aligned to the specified alignment. + * Addresses which have alignments that are multiples of that + * specified are not considered valid. For instance, 1GB address is + * 2MB-aligned, however it will not be considered valid for a + * requested alignment of 2MB. This is done to reduce coincidental + * alignment in the tests. + */ + if (((unsigned long long) src_addr & (c.src_alignment - 1)) || + !((unsigned long long) src_addr & c.src_alignment)) { + munmap(src_addr, c.region_size); + goto retry; + } + + if (!src_addr) + goto error; + + return src_addr; +error: + ksft_print_msg("Failed to map source region: %s\n", + strerror(errno)); + return NULL; +} + /* * This test validates that merge is called when expanding a mapping. * Mapping containing three pages is created, middle page is unmapped @@ -300,60 +355,6 @@ static void mremap_move_within_range(char pattern_seed) ksft_test_result_fail("%s\n", test_name); } =20 -/* - * Returns the start address of the mapping on success, else returns - * NULL on failure. - */ -static void *get_source_mapping(struct config c) -{ - unsigned long long addr =3D 0ULL; - void *src_addr =3D NULL; - unsigned long long mmap_min_addr; - - mmap_min_addr =3D 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 +=3D 10 * _4MB; - -retry: - addr +=3D c.src_alignment; - if (addr < mmap_min_addr) - goto retry; - - src_addr =3D mmap((void *) addr, c.region_size, PROT_READ | PROT_WRITE, - MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, - -1, 0); - if (src_addr =3D=3D MAP_FAILED) { - if (errno =3D=3D EPERM || errno =3D=3D EEXIST) - goto retry; - goto error; - } - /* - * Check that the address is aligned to the specified alignment. - * Addresses which have alignments that are multiples of that - * specified are not considered valid. For instance, 1GB address is - * 2MB-aligned, however it will not be considered valid for a - * requested alignment of 2MB. This is done to reduce coincidental - * alignment in the tests. - */ - if (((unsigned long long) src_addr & (c.src_alignment - 1)) || - !((unsigned long long) src_addr & c.src_alignment)) { - munmap(src_addr, c.region_size); - goto retry; - } - - if (!src_addr) - goto error; - - return src_addr; -error: - ksft_print_msg("Failed to map source region: %s\n", - strerror(errno)); - return NULL; -} - /* Returns the time taken for the remap on success else returns -1. */ static long long remap_region(struct config c, unsigned int threshold_mb, char pattern_seed) @@ -487,6 +488,83 @@ static long long remap_region(struct config c, unsigne= d int threshold_mb, return ret; } =20 +/* + * Verify that an mremap aligning down does not destroy + * the beginning of the mapping just because the aligned + * down address landed on a mapping that maybe does not exist. + */ +static void mremap_move_1mb_from_start(char pattern_seed) +{ + char *test_name =3D "mremap move 1mb from start at 1MB+256KB aligned src"; + void *src =3D NULL, *dest =3D NULL; + int i, success =3D 1; + + /* Config to reuse get_source_mapping() to do an aligned mmap. */ + struct config c =3D { + .src_alignment =3D SIZE_MB(1) + SIZE_KB(256), + .region_size =3D SIZE_MB(6) + }; + + src =3D get_source_mapping(c); + if (!src) { + success =3D 0; + goto out; + } + + c.src_alignment =3D SIZE_MB(1) + SIZE_KB(256); + dest =3D get_source_mapping(c); + if (!dest) { + success =3D 0; + goto out; + } + + /* Set byte pattern for source block. */ + srand(pattern_seed); + for (i =3D 0; i < SIZE_MB(2); i++) { + ((char *)src)[i] =3D (char) rand(); + } + + /* + * Unmap the beginning of dest so that the aligned address + * falls on no mapping. + */ + munmap(dest, SIZE_MB(1)); + + void *new_ptr =3D mremap(src + SIZE_MB(1), SIZE_MB(1), SIZE_MB(1), + MREMAP_MAYMOVE | MREMAP_FIXED, dest + SIZE_MB(1)); + if (new_ptr =3D=3D MAP_FAILED) { + perror("mremap"); + success =3D 0; + goto out; + } + + /* Verify byte pattern after remapping */ + srand(pattern_seed); + for (i =3D 0; i < SIZE_MB(1); i++) { + char c =3D (char) rand(); + + if (((char *)src)[i] !=3D 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 =3D 0; + } + } + +out: + if (src && munmap(src, c.region_size) =3D=3D -1) + perror("munmap src"); + + if (dest && munmap(dest, c.region_size) =3D=3D -1) + perror("munmap dest"); + + if (success) + ksft_test_result_pass("%s\n", test_name); + else + ksft_test_result_fail("%s\n", test_name); +} + static void run_mremap_test_case(struct test test_case, int *failures, unsigned int threshold_mb, unsigned int pattern_seed) @@ -565,7 +643,7 @@ int main(int argc, char **argv) unsigned int threshold_mb =3D VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests =3D 2; - int num_misc_tests =3D 1; + int num_misc_tests =3D 2; struct test test_cases[MAX_TEST] =3D {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; @@ -666,6 +744,7 @@ int main(int argc, char **argv) fclose(maps_fp); =20 mremap_move_within_range(pattern_seed); + mremap_move_1mb_from_start(pattern_seed); =20 if (run_perf_tests) { ksft_print_msg("\n%s\n", --=20 2.42.0.283.g2d96d420d3-goog