From nobody Wed Dec 17 10:54:38 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 C7341EE49AA for ; Tue, 22 Aug 2023 01:55:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232182AbjHVBz3 (ORCPT ); Mon, 21 Aug 2023 21:55:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232161AbjHVBzX (ORCPT ); Mon, 21 Aug 2023 21:55:23 -0400 Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D6C3186 for ; Mon, 21 Aug 2023 18:55:22 -0700 (PDT) Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-790970a8706so147646939f.2 for ; Mon, 21 Aug 2023 18:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1692669321; x=1693274121; 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=CsH3vkDr9agJVI3SouFCcK5RkzBRN3iHA9ib5+au0Rw=; b=CzldOLSR/1CFch60cKxnxJV7KC0TbczE/AS7NU3vcELLGEqTO96428h5zAJIQx9q47 qJfdzOYkvoVEnJLl8uynvnnrnlYgm5gqjmtv+3cgEgtH/Nt4FRLdULpgo/k3RjIb+SnU WTKw5yuYuGQnOEhCHelds3JU0dgsb9m7n0OS8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692669321; x=1693274121; 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=CsH3vkDr9agJVI3SouFCcK5RkzBRN3iHA9ib5+au0Rw=; b=E95CKLmRMkli9UxsmIlsf38BBDJx5jm6Mmi3dY5oUe1srRthxEnjFDfRP0jIxspGRv 5vPBz+pMyJ5o6cXPPVW4tplOZJqwVP+ON/LgSBzC6mtii51Ulak3/fe89w3s3cRNiWWV gjrj8lbggNEJqxys0NJz8b8wEkyIPN64yuyGGInM/yF1grDr9mOud3Blk/VDDvhazQiW yFBa0zw9cmWK7wZAZlH/OA3AsFm7boPbNXR1yXAXRz2g7L+ZvMVcDxoWyKo+3szZ+bOy 1/xC12TSjeegu+7K5kfnvIHKydma5MD9cuNAAXy2LDkZQaWr9Sezk+q/ByxEDNer65Gd xBMQ== X-Gm-Message-State: AOJu0YwWpfoYm6F9O+VGIJVRIyRtG8WXqZ8a+inE6Ur2kesWPzj2h/3+ gZeZUtqsLrvkRcEC4wxJ73y46njTp03w9PvHhzM= X-Google-Smtp-Source: AGHT+IFjdGA7XRGfiXyy54FM+yhexl4gbxKokE/+1QN35KTpxnmuosD5M/koT6P5pAtsasmz/S2vng== X-Received: by 2002:a05:6e02:dce:b0:349:9938:a9b3 with SMTP id l14-20020a056e020dce00b003499938a9b3mr9158834ilj.3.1692669321018; Mon, 21 Aug 2023 18:55:21 -0700 (PDT) Received: from joelboxx5.c.googlers.com.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id q11-20020a92d40b000000b0034886587bdcsm2907390ilm.18.2023.08.21.18.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 18:55:20 -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 v5 1/7] mm/mremap: Optimize the start addresses in move_page_tables() Date: Tue, 22 Aug 2023 01:54:54 +0000 Message-ID: <20230822015501.791637-2-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230822015501.791637-1-joel@joelfernandes.org> References: <20230822015501.791637-1-joel@joelfernandes.org> MIME-Version: 1.0 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/ Suggested-by: Linus Torvalds Signed-off-by: Joel Fernandes (Google) Reviewed-by: Lorenzo Stoakes --- mm/mremap.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/mm/mremap.c b/mm/mremap.c index 11e06e4ab33b..035fbf542a8f 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, addr_to_align) =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.rc1.204.g551eb34607-goog From nobody Wed Dec 17 10:54:38 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 9CE96EE49A6 for ; Tue, 22 Aug 2023 01:55:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230315AbjHVBzd (ORCPT ); Mon, 21 Aug 2023 21:55:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230266AbjHVBzZ (ORCPT ); Mon, 21 Aug 2023 21:55:25 -0400 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28A2813E for ; Mon, 21 Aug 2023 18:55:23 -0700 (PDT) Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-34992058e95so12335405ab.1 for ; Mon, 21 Aug 2023 18:55:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1692669322; x=1693274122; 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=UmTCssMd/OkLNKuh8A+l/1O9kIjaudHJc+AQCzKHLlk=; b=A1fiRL9/gyGYLlkYcaWvN0fBKnQebciTf0B21CCdmsU1xEeOwPHiF1/xra5llF4iqQ QGiqLGX70eBqHNJ5suqvz4NbbitFDLqcy3w6HKepVcS2DlgpUM+PMtv50jv4oJX6cS0Z Y3Gnd49h1/o+WqJ4Dlgt0SeNoAFckPqhzGZ+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692669322; x=1693274122; 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=UmTCssMd/OkLNKuh8A+l/1O9kIjaudHJc+AQCzKHLlk=; b=gLMONNYqI0pQV2zCtLAeJvOmqxmqEZEie2xixSyhFObd6+VpG2on/j15rRQwfmQmi3 pNXVbTk+BrCWrtvF5aOmlkzzx6fIW0jH7C3GygW3CILuVgD78887o0MYLazu7ofNpk1L U9L3zc2IHvnh7W7LlNL59A/5m9DuzlEhJE3/GVqI2EbEoKQz9mjiAx1t3WT+5zBZEQ+O Nn3XnR3voZUd4m+apja8UtM7Tda3eMfScGOtUQqJwyF8OT0CAYcdJfYhXfbTpAm8ectb 43ABnGEftLlP7mKNQKRKjKmCi8QDvv924/nTBe5nxiYlNL/tc21zBK4FZi4EtzFq0Kmc zAmQ== X-Gm-Message-State: AOJu0YyzZP4KNP2tLoR5KKMQWfJQ1cJY319Zv0S9ktop5qJc8ZUbPWnM G/PHn/OTEMuB/cIdwrflb0SgofoZj7rpR0wsqDk= X-Google-Smtp-Source: AGHT+IF3qvn51n/32NdS40F5GBEiAi2QwNfdcj7jaTRmqbaEocW2e2V/vyWF81PIpFzzD8zMdl/02g== X-Received: by 2002:a05:6e02:1a4b:b0:349:8dfa:ad64 with SMTP id u11-20020a056e021a4b00b003498dfaad64mr13813434ilv.15.1692669322088; Mon, 21 Aug 2023 18:55:22 -0700 (PDT) Received: from joelboxx5.c.googlers.com.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id q11-20020a92d40b000000b0034886587bdcsm2907390ilm.18.2023.08.21.18.55.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 18:55:21 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v5 2/7] mm/mremap: Allow moves within the same VMA Date: Tue, 22 Aug 2023 01:54:55 +0000 Message-ID: <20230822015501.791637-3-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230822015501.791637-1-joel@joelfernandes.org> References: <20230822015501.791637-1-joel@joelfernandes.org> MIME-Version: 1.0 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 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 | 29 +++++++++++++++-------------- 3 files changed, 17 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 035fbf542a8f..06baa13bd2c8 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,7 +505,7 @@ 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 /* @@ -517,7 +518,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 +529,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 +540,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 +560,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 +709,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 +723,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.rc1.204.g551eb34607-goog From nobody Wed Dec 17 10:54:38 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 8309DEE49A6 for ; Tue, 22 Aug 2023 01:55:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232192AbjHVBzp (ORCPT ); Mon, 21 Aug 2023 21:55:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232172AbjHVBzZ (ORCPT ); Mon, 21 Aug 2023 21:55:25 -0400 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AB67113 for ; Mon, 21 Aug 2023 18:55:24 -0700 (PDT) Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-34ca192f8feso8741595ab.3 for ; Mon, 21 Aug 2023 18:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1692669323; x=1693274123; 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=7MVDg4AiFSlG/+H1Z+4rrwZ5TuiaCol/qVRe1MkiyJ4=; b=dfaWwvA9oBL1IZ1Ld8nmBYZfchopf8juXDP2xXzgSG1+4P+Y22COL076a6tOgVMiwz QILZngUNHyArlcv/oP21Fea28QqZgLAOBnLUlGNmpK8m4daK64fIorApmoM/BsiyrFBx m5xcXJdKn0E99mRIBpuKTVuUQA71ez3oXSMYA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692669323; x=1693274123; 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=7MVDg4AiFSlG/+H1Z+4rrwZ5TuiaCol/qVRe1MkiyJ4=; b=c+2E7IFTJMBzksKucQ/ygN0IELnQ5HN0KQ4g59aEkSRTMFHF97bFExBaM6TrY2f8pc lHNBQ7SA0/jpuba66dIhE7P9mbvYnOBGjDe9Braqaf+h1N37JSeId8/bjAlycEcQJg5I 8ElXpoWQfn3Q41rzuhhhyVJ/QvfobRa7eN8mav2nGTHg7SLyjJONQQxJHUu2BaY/PG3G PNFddu3zSXKvLPF89jRpyXrQc4kk/erqn/bN+JNNzdzRdf6eH6CS/u4IBZbQEYRIdj6E hUyDZa/PYQJXSSZSXtP7yaGm7m8N1idnQwZbUffHqy1l0UfW1ir101EIvz+vcKmXIker laTg== X-Gm-Message-State: AOJu0YynWEc2ux2Ws0327NnMfiRdlCwkjfaqiX3F5qCV+Mfs4q7/v8uP dHXNkUBvYHm5IAf+S/DVYERx0Bb47S/A2uae1bw= X-Google-Smtp-Source: AGHT+IHvqVdYTC6n4DObVG1/cE1N4x7Ela2mYdMwjClLo2WnnHgsjk7IpjhEewtQDpWgbd40PsHlhw== X-Received: by 2002:a05:6e02:1906:b0:345:b923:971b with SMTP id w6-20020a056e02190600b00345b923971bmr12162039ilu.3.1692669323174; Mon, 21 Aug 2023 18:55:23 -0700 (PDT) Received: from joelboxx5.c.googlers.com.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id q11-20020a92d40b000000b0034886587bdcsm2907390ilm.18.2023.08.21.18.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 18:55:22 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v5 3/7] selftests: mm: Fix failure case when new remap region was not found Date: Tue, 22 Aug 2023 01:54:56 +0000 Message-ID: <20230822015501.791637-4-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230822015501.791637-1-joel@joelfernandes.org> References: <20230822015501.791637-1-joel@joelfernandes.org> MIME-Version: 1.0 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. Signed-off-by: Joel Fernandes (Google) Reviewed-by: Lorenzo Stoakes --- 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.rc1.204.g551eb34607-goog From nobody Wed Dec 17 10:54:38 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 DA697EE49A6 for ; Tue, 22 Aug 2023 01:55:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232195AbjHVBzw (ORCPT ); Mon, 21 Aug 2023 21:55:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232178AbjHVBz0 (ORCPT ); Mon, 21 Aug 2023 21:55:26 -0400 Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BE11113 for ; Mon, 21 Aug 2023 18:55:25 -0700 (PDT) Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-34ca07e6d6cso7276675ab.0 for ; Mon, 21 Aug 2023 18:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1692669324; x=1693274124; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=u/QIpV5GdoUntyQD+YAulEqEr5HWAYhIt+wE2vL+NDs=; b=XkzwrKY2BPO8OgeQrtUkfRLAKPdqR5M18ZKGU4FGFYxvzWBQw/eRILHendM5mzgczx BYc3zziDMJlYLqaCnwu/53EUEoReNctpO9RDz4aY9+4UOxQi20TdBSerToh1EPXlQG2U E93hf56fnUcks90HI5CRHcJwgSm33hqntG3Xo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692669324; x=1693274124; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u/QIpV5GdoUntyQD+YAulEqEr5HWAYhIt+wE2vL+NDs=; b=OjjueaextO1BbhyMhjMEeaFrQEL6l1lk6ngz6G1d84VbR4k5vtN7Wa/M+hFNwOtQuf PgrdAphwKCz3f73Gwlw4JAYFV1GWKygCJw6jBHDxUEcHNMBj2L7O9aSAOA6nMC7ktYRq k38E5URqpmdv3S+hfjJyxvg+bDBk7iFCYYPSOurc9Dcy6weOwnXRum2gyyyC5tTplIhR WGysRrenIYffjPBo+Aj4DVaYcQ0iRQm5RAK2H5MPDtOPgWae9y7BqWVSppK+7NJSzf8M vRT4ZrFcyhnYb5bnDFoGysG3rrwIgFCvwE3zJl72Lhpa08a1PrfLWd56RIOaz205y5gn nm5A== X-Gm-Message-State: AOJu0YxbcDidRka9raJf0lIY+fQn4OdFCk2ynlGs0y6WzYJtZN1DT/Vc Ir5+evxBpFuf/NReWdgXKWfQcB72ihJeTbUMnGk= X-Google-Smtp-Source: AGHT+IH/MZvRRV4VaPoT76ACeI7st3J3G1ER7zfxqE1rsoOojx8UWxh8tAIJJ7hX3Eu9rNxe5sWekA== X-Received: by 2002:a05:6e02:2189:b0:349:2bab:9e47 with SMTP id j9-20020a056e02218900b003492bab9e47mr10720872ila.12.1692669324214; Mon, 21 Aug 2023 18:55:24 -0700 (PDT) Received: from joelboxx5.c.googlers.com.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id q11-20020a92d40b000000b0034886587bdcsm2907390ilm.18.2023.08.21.18.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 18:55:23 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v5 4/7] selftests: mm: Add a test for mutually aligned moves > PMD size Date: Tue, 22 Aug 2023 01:54:57 +0000 Message-ID: <20230822015501.791637-5-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230822015501.791637-1-joel@joelfernandes.org> References: <20230822015501.791637-1-joel@joelfernandes.org> MIME-Version: 1.0 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. Signed-off-by: Joel Fernandes (Google) Reviewed-by: Lorenzo Stoakes --- tools/testing/selftests/mm/mremap_test.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/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.rc1.204.g551eb34607-goog From nobody Wed Dec 17 10:54:38 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 C7D50EE4996 for ; Tue, 22 Aug 2023 01:56:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232249AbjHVB4K (ORCPT ); Mon, 21 Aug 2023 21:56:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232194AbjHVBzq (ORCPT ); Mon, 21 Aug 2023 21:55:46 -0400 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 558EA18F for ; Mon, 21 Aug 2023 18:55:26 -0700 (PDT) Received: by mail-il1-x129.google.com with SMTP id e9e14a558f8ab-34bb72ffb1fso11141765ab.3 for ; Mon, 21 Aug 2023 18:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1692669325; x=1693274125; 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=Axho/C2d3GxLBo+LZnFUqjVo2BRyImetugTXkfwiHhM=; b=dcsD/55UXOmDc6JKsWv76PEhXAR+DHegc6mDX9k2Jt5pnmj+7kdpAShITM6SWA8XVM +P0Xr5RhvhwbMxDE/FrWsVMmWu1bcOxe96a9Sj6svTHwHS6oAJLaYFyQ1ynl3xKLRc8F pQ+Bm6+1vG8lQOIPDNwuUzZJIUNfw4RUA4nHM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692669325; x=1693274125; 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=Axho/C2d3GxLBo+LZnFUqjVo2BRyImetugTXkfwiHhM=; b=c80gyu/NF2emPmqREQ/jDo/nz+vbVn3Hv9xoLKG1+Naz/GGWcsQJ3Sir5wjr5EdgY+ 4rndMeXeuxcE62qZYQ+zByB5z41Hd10A2czlexV7JOTWtr/cdM8w8H97/LjJWF2RXEa8 tsymdDK+aEeqL0hIBvo1zZCCIQOtF5Bqsf0+5r/XrkF0ulQ8IlWxlH9p7LwPfHljAmPH bMtJEu1udALKaG8daqQloKU90E1yK0P+zWkbLvN+W3U8Tn4vHdZHl/fNzjW4GCi8jh/9 aFvMQ1FCQIvM9AQ2SQVDULc4ieLDujOI6KXRWrUo79FQo3hAUFNoEPqyg1iGArG0DRF4 +32w== X-Gm-Message-State: AOJu0Yx6UWywPAqQVKT/IajU+h0d23n4kxcOPMfwO6lrma1cpEp1qYtV 2xGt0MmHLTRdk6KCZep3F6cJ4UeAXGBHl9Ps/V8= X-Google-Smtp-Source: AGHT+IGZXIerY8NUWYReuIPpDpvFlLHcIDml9i8pszriAMC0UzQ9sup1GqyFJEY4NY5BpU4X49RLVw== X-Received: by 2002:a05:6e02:dce:b0:349:a4f8:8815 with SMTP id l14-20020a056e020dce00b00349a4f88815mr9945123ilj.2.1692669325296; Mon, 21 Aug 2023 18:55:25 -0700 (PDT) Received: from joelboxx5.c.googlers.com.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id q11-20020a92d40b000000b0034886587bdcsm2907390ilm.18.2023.08.21.18.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 18:55:24 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v5 5/7] selftests: mm: Add a test for remapping to area immediately after existing mapping Date: Tue, 22 Aug 2023 01:54:58 +0000 Message-ID: <20230822015501.791637-6-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230822015501.791637-1-joel@joelfernandes.org> References: <20230822015501.791637-1-joel@joelfernandes.org> MIME-Version: 1.0 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 Signed-off-by: Joel Fernandes (Google) Reviewed-by: Lorenzo Stoakes --- 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.rc1.204.g551eb34607-goog From nobody Wed Dec 17 10:54:38 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 7FA29EE49A0 for ; Tue, 22 Aug 2023 01:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232333AbjHVB4U (ORCPT ); Mon, 21 Aug 2023 21:56:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232199AbjHVBzq (ORCPT ); Mon, 21 Aug 2023 21:55:46 -0400 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80A92198 for ; Mon, 21 Aug 2023 18:55:27 -0700 (PDT) Received: by mail-il1-x135.google.com with SMTP id e9e14a558f8ab-34ca2fcdf9fso6954325ab.0 for ; Mon, 21 Aug 2023 18:55:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1692669326; x=1693274126; 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=FD9aGvqokkyzhhNkz6Ym1Row+eZXw3mkXyW6dIKtxjg=; b=BVxKaBwCWqmv9ynuQE7s7YtVK38FkX779KlBkPDkQBjoFlq8GAIqxdpbPgdXIHuYEP sTZl8JURdoNTsMC+vviGXqt9EnyyK4mtdmmYuLB06JdlbsUAxre1uPUPQ9095aYWBBzQ UX41cyoBUmNRAXgSpAygarUMAnDMlAVDQL8Lk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692669326; x=1693274126; 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=FD9aGvqokkyzhhNkz6Ym1Row+eZXw3mkXyW6dIKtxjg=; b=MrShR0GLPVOTDkKJ+jry3K7LN3l1qvWIAfRWD/KtviuLDgukJvFKMF1HKktJLJwD2c ljT+CJMhlZHclkrEF2daU9oDx/3kNh92X4GmXcgAFbCwFrieNcxw066S//0OPzTKz0rk EYShzEXJwiaX/OMvzcMwoon6RA6Axe5wUod1PM8/yh98jBFt1F7YibTJgLMNtdsDAerG Sx8MR20mSXsBiYrC4Uple68ly0Ub+q/yPhRh2SEzYWOtAmVtd3kWtNKn1fZ7EkXjBA6H cipI9ljIJ6wUSSiXVMj00LSmu28CKsRRE9l/JnNgxwNTuftUTxACA5zJGEOaQs2dwvNA q5UA== X-Gm-Message-State: AOJu0YxwA+V5G7/Iye/j4inVoarJLrtkIxM1saHL5rL0+jlYk+p1CYYu uceV5Z7aQTER4SDu0KOSxt9XUcNLpovMDHv/61g= X-Google-Smtp-Source: AGHT+IHvcEbCoDqCw1Fy8RgEWPuit/xENlfoh2EHuYOQYRSjxZ82L50BdV84tK7DyIjYWJTuRfLE/Q== X-Received: by 2002:a05:6e02:190d:b0:346:1185:31d0 with SMTP id w13-20020a056e02190d00b00346118531d0mr11455463ilu.9.1692669326463; Mon, 21 Aug 2023 18:55:26 -0700 (PDT) Received: from joelboxx5.c.googlers.com.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id q11-20020a92d40b000000b0034886587bdcsm2907390ilm.18.2023.08.21.18.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 18:55:25 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v5 6/7] selftests: mm: Add a test for remapping within a range Date: Tue, 22 Aug 2023 01:54:59 +0000 Message-ID: <20230822015501.791637-7-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230822015501.791637-1-joel@joelfernandes.org> References: <20230822015501.791637-1-joel@joelfernandes.org> MIME-Version: 1.0 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_masked) return false; Signed-off-by: Joel Fernandes (Google) Reviewed-by: Lorenzo Stoakes --- 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..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 */ =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 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 =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.rc1.204.g551eb34607-goog From nobody Wed Dec 17 10:54:38 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 2BD7AEE49A0 for ; Tue, 22 Aug 2023 01:56:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232278AbjHVB4a (ORCPT ); Mon, 21 Aug 2023 21:56:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232213AbjHVB4B (ORCPT ); Mon, 21 Aug 2023 21:56:01 -0400 Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 836A61A8 for ; Mon, 21 Aug 2023 18:55:28 -0700 (PDT) Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-34bad46e5a5so13597825ab.1 for ; Mon, 21 Aug 2023 18:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1692669327; x=1693274127; 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=XSp2RkE7WNDbZkDSniptEmg1knVa7eiFGdAlEcTCYXk=; b=hB3OrYAbWCivFEMRY0ZLiMpZipo0ohQ9va0ALoFrxF3N6j0sGBBJlAMhPCHbROrmOG MMW9Vz6sZFa1UpuJWvtJjqpcBgMy1oMCAqHWjDG602AT6TI0cyy2YQgsTV3s8EI+m5+o Y3Mr4kc1PezfoD+BPHuwn4CF5Y65DFcuRKn00= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692669327; x=1693274127; 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=XSp2RkE7WNDbZkDSniptEmg1knVa7eiFGdAlEcTCYXk=; b=ZAZ7XJ6lf3oQApbX422Ec1/067BHPcqee1zsZbyVO399O7Lu9bOEo0Zpdonvo867Rj 7Cys3+G315HBfnFBJdLBsFPF5X+dMpHFd0FMFnXqL7h+3qVa5FyNvcZhbMpnlTnDp3e6 mdj97ELWPEeTyrsPtP15QtNXWXy6DZ9oV7b2MBjRBTAMX1rQs4sf5wDymTY1Ywr1/LBa JwG2Z58yG+eujuIx7KIvXcDRhbgdNKVFV+hMaWUeGesU7hOwGOy2tuOX00nAzDF8ktGT 7f3j4Fhp48Rw1eS4hFK2BAFCXAgLY0ruwtr14Oj2Ycq7hsmtQuKeNXkcltSXtYS6bprQ nHYA== X-Gm-Message-State: AOJu0YwJSq/zhD8F+D9DxuCubmE1fKlnlrjeZG9XaPD77mOt+O16Wv7z IRaZqeePACGgT8T1dh7aD9N5rbe49guX8NhK5E0= X-Google-Smtp-Source: AGHT+IHh2CBbyhDqgwo/dvz/3E91EJeozSUIuQC8LNJTxnm78FkGwumtTjDlvLHNyDKvyt16yZrJFg== X-Received: by 2002:a05:6e02:e02:b0:346:5e80:bf67 with SMTP id a2-20020a056e020e0200b003465e80bf67mr8883734ilk.21.1692669327493; Mon, 21 Aug 2023 18:55:27 -0700 (PDT) Received: from joelboxx5.c.googlers.com.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id q11-20020a92d40b000000b0034886587bdcsm2907390ilm.18.2023.08.21.18.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 18:55:26 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: Joel Fernandes , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v5 7/7] selftests: mm: Add a test for moving from an offset from start of mapping Date: Tue, 22 Aug 2023 01:55:00 +0000 Message-ID: <20230822015501.791637-8-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230822015501.791637-1-joel@joelfernandes.org> References: <20230822015501.791637-1-joel@joelfernandes.org> MIME-Version: 1.0 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. Signed-off-by: Joel Fernandes (Google) Reviewed-by: Lorenzo Stoakes --- 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 f45d1abedc9c..c71ac8306c89 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 2MB+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.rc1.204.g551eb34607-goog