From patchwork Wed May 24 15:32:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 98567 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2916549rwl; Wed, 24 May 2023 08:45:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5k+4eOtnVMn0G/EPeEPqyyr3Ckp/f23GIheiPBmKQbowXWtuo77O6O6yidWrKKuQ1mPsBd X-Received: by 2002:a17:90a:8c10:b0:250:1905:ae78 with SMTP id a16-20020a17090a8c1000b002501905ae78mr17139112pjo.15.1684943130989; Wed, 24 May 2023 08:45:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684943130; cv=none; d=google.com; s=arc-20160816; b=irI52shskZoQsyJTDoLlRu3bdzPAIospsdx9ezI41vUgXpH/ov2of60J9IcVmPs+Wg rzsMY/u88dLdtyhthD04o+uZaZ+CgOYcffAwbsLl+3t8t7pJx5u9S+sjjGsmEhr5yOBc KU2Y0qnwxO+TIGgODMPzRenJL1kCGZZePRT7PS2+3NKCUYwNtDsax22rWeS/yyRfobrE dOisyjpTBzE7SNXxSbeWDo2CgvoraQlovRZvtlxlA0zVD4dAxFydaVF5OSlLSJSpEHN/ 05FEUJ7CpahP3Ne+gWni9XzAQdEHNx8ZZ8PaWljpP5beG8bghccc8H1gIIVy1Vd6iON4 r+9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TYAWyrxgPtqWXYxm6cJhdFwBx5wHciPZ/aYd0labdNY=; b=ekCA71eFm0S+ORou45P7m6LMhoptmcjjbDC/3RsbU6cHvZ3VCndE1u8qSAFwZgbD27 8chy2W1E0zf9va0vtLYuoonxmYberWFGgSYwhHQoK2vfuz7YvDp4g+sBvaw5pRSc6Ust 6LF4aTu4m5XIK/mq51QwVuZiukVcovOOdvq6ePPnBFNe1AUwY37XI9BdvAM/nYdk9x87 0JiH3x+OJdpCB0VAos4zy2XwRfr8CED7rTSveyXR2PRuX9e6TiKZpELAcRyaFZOI6LJQ KmvjwURrJtcZPkJNGWLvLJ0dgOITcI+ls9n0W6vbGifr+5Y91ep1h0DAz5kKKH2DfSYh L2MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=On7I5ayO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b22-20020a637156000000b0053ef0f20fe3si3290439pgn.600.2023.05.24.08.45.18; Wed, 24 May 2023 08:45:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=On7I5ayO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232903AbjEXPdB (ORCPT + 99 others); Wed, 24 May 2023 11:33:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235951AbjEXPc4 (ORCPT ); Wed, 24 May 2023 11:32:56 -0400 Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6C2F122 for ; Wed, 24 May 2023 08:32:53 -0700 (PDT) Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-75b132ad421so152851285a.1 for ; Wed, 24 May 2023 08:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942372; x=1687534372; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TYAWyrxgPtqWXYxm6cJhdFwBx5wHciPZ/aYd0labdNY=; b=On7I5ayOaYhi5YG/GPdB9nxaPm77pHmMCGllRGYcQUbOR9RaWe8+E1kwIyz/Gm1IO2 lzlpVKQhkPTjP/JCXbURVFFWQ3jgbHYHGgepr9uzBOnTK1CeaL3pkQv0Y3ntC9d96Fw5 Q/V2PreQmRTT8rUh3sL+unZfL9jgCw+Ofoan0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942372; x=1687534372; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TYAWyrxgPtqWXYxm6cJhdFwBx5wHciPZ/aYd0labdNY=; b=jqKVswMS4MJiZ9VQUYkEgZzAfL3xdLW735gG7PpzlDqjkNTr1rXFocdCnFl6iLF03U a/22acoZdx4rKETaWAvUsAD8SZYUKHh1XFXxOYhizLyfSTToaPxrplK1wlVS+P7jpdtu XCYCvKTXqHDg2MXndQcLfg2UTcK+pQJXy5Luj4d02RMcByam98455x85eGkx93J/dlWn 7NaM0FIYcw9S9/B9CoNk1P/sFrveo6PRCVQ300nPteY+CbyA12pf3blOS7LLkDHtaHIL pRSAIDnSb4BUMOEkrNkJfcYWERFmto28B7k3qojiezcsxhtXvfATD2JvQjwlCnb/gtJ7 N4vQ== X-Gm-Message-State: AC+VfDz2MK5FnwvNThGJJ4bgtDJRRP3OypYKAS1o6jtB3sUO4ORnVwd4 yuyFXBSAcvxaUo0GyoTqvdAdDc2OVN+yDwJt5yE= X-Received: by 2002:a05:620a:172a:b0:75b:23a1:3634 with SMTP id az42-20020a05620a172a00b0075b23a13634mr9248078qkb.69.1684942372538; Wed, 24 May 2023 08:32:52 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id v18-20020a05620a123200b007590aa4b115sm3296906qkj.87.2023.05.24.08.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:51 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Linus Torvalds , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v3 1/6] mm/mremap: Optimize the start addresses in move_page_tables() Date: Wed, 24 May 2023 15:32:34 +0000 Message-ID: <20230524153239.3036507-2-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230524153239.3036507-1-joel@joelfernandes.org> References: <20230524153239.3036507-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766790928215063156?= X-GMAIL-MSGID: =?utf-8?q?1766790928215063156?= Recently, we see reports [1] of a warning that triggers due to move_page_tables() doing a downward and overlapping move on a mutually-aligned offset within a PMD. By mutual alignment, I mean the source and destination addresses of the mremap are at the same offset within a PMD. This mutual alignment along with the fact that the move is downward is sufficient to cause a warning related to having an allocated PMD that does not have PTEs in it. This warning will only trigger when there is mutual alignment in the move operation. A solution, as suggested by Linus Torvalds [2], is to initiate the copy process at the PMD level whenever such alignment is present. Implementing this approach will not only prevent the warning from being triggered, but it will also optimize the operation as this method should enhance the speed of the copy process whenever there's a possibility to start copying at the PMD level. Some more points: a. The optimization can be done only when both the source and destination of the mremap do not have anything mapped below it up to a PMD boundary. I add support to detect that. b. #1 is not a problem for the call to move_page_tables() from exec.c as nothing is expected to be mapped below the source. However, for non-overlapping mutually aligned moves as triggered by mremap(2), I added support for checking such cases. c. I currently only optimize for PMD moves, in the future I/we can build on this work and do PUD moves as well if there is a need for this. But I want to take it one step at a time. d. We need to be careful about mremap of ranges within the VMA itself. For this purpose, I added checks to determine if the address after alignment falls within its VMA itself. [1] https://lore.kernel.org/all/ZB2GTBD%2FLWTrkOiO@dhcp22.suse.cz/ [2] https://lore.kernel.org/all/CAHk-=whd7msp8reJPfeGNyt0LiySMT0egExx3TVZSX3Ok6X=9g@mail.gmail.com/ Suggested-by: Linus Torvalds Signed-off-by: Joel Fernandes (Google) --- mm/mremap.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/mm/mremap.c b/mm/mremap.c index 411a85682b58..184d52f83b19 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -478,6 +478,53 @@ static bool move_pgt_entry(enum pgt_entry entry, struct vm_area_struct *vma, return moved; } +/* + * A helper to check if a previous mapping exists. Required for + * move_page_tables() and realign_addr() to determine if a previous mapping + * exists before we can do realignment optimizations. + */ +static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_align, + unsigned long mask) +{ + unsigned long addr_masked = addr_to_align & mask; + struct vm_area_struct *prev = NULL, *cur = NULL; + + /* If the masked address is within vma, we cannot align the address down. */ + if (vma->vm_start <= addr_masked) + return false; + + /* + * Attempt to find VMA before prev that contains the address. + * On any issue finding prev, assume there is a mapping and return false + * which will turn off any optimizations. Yes, we're conservative! + * The mmap write lock is held here, so the lookup is safe. + */ + cur = find_vma_prev(vma->vm_mm, vma->vm_start, &prev); + if (!cur || cur != vma || !prev) + return false; + + /* The masked address fell within some previous mapping. */ + if (prev->vm_end > addr_masked) + return false; + + return true; +} + +/* Opportunistically realign to specified boundary for faster copy. */ +static void realign_addr(unsigned long *old_addr, struct vm_area_struct *old_vma, + unsigned long *new_addr, struct vm_area_struct *new_vma, + unsigned long mask) +{ + bool mutually_aligned = (*old_addr & ~mask) == (*new_addr & ~mask); + + if ((*old_addr & ~mask) && mutually_aligned + && can_align_down(old_vma, *old_addr, mask) + && can_align_down(new_vma, *new_addr, mask)) { + *old_addr = *old_addr & mask; + *new_addr = *new_addr & mask; + } +} + unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len, @@ -493,6 +540,15 @@ unsigned long move_page_tables(struct vm_area_struct *vma, old_end = old_addr + len; + /* + * If possible, realign addresses to PMD boundary for faster copy. + * Don't align for intra-VMA moves as we may destroy existing mappings. + */ + if ((vma != new_vma) + && (len >= PMD_SIZE - (old_addr & ~PMD_MASK))) { + realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK); + } + if (is_vm_hugetlb_page(vma)) return move_hugetlb_page_tables(vma, new_vma, old_addr, new_addr, len); @@ -565,6 +621,13 @@ unsigned long move_page_tables(struct vm_area_struct *vma, mmu_notifier_invalidate_range_end(&range); + /* + * Prevent negative return values when {old,new}_addr was realigned + * but we broke out of the above loop for the first PMD itself. + */ + if (len + old_addr < old_end) + return 0; + return len + old_addr - old_end; /* how much done */ } From patchwork Wed May 24 15:32:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 98565 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2915228rwl; Wed, 24 May 2023 08:43:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4MYM5yYTBkfikeVLBteTrGwV+5GNHEIRlsRjeIb76kE0whjWiKy34QLCybW7ksZDrTGGlP X-Received: by 2002:a05:6a20:8413:b0:10b:cb87:f5e with SMTP id c19-20020a056a20841300b0010bcb870f5emr11235579pzd.45.1684942986714; Wed, 24 May 2023 08:43:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684942986; cv=none; d=google.com; s=arc-20160816; b=XgB5m12cKptpWoVw4awq8dPy52j92+7kYF3gJ1HT1P1sQkEAnINalgCUukQKwA8bJx ZlTQTbkEIJNv8cJpDYB327QnwzTTo+a0PbGVKExatnai2yIygcoy7KvEXXGEFtu6NxlE m87uwj1ISDJS8oRc9hD3hmVJ6QCGrl1NabkkGR226O7B0sYdwPaSI7rtqjfeHDEhJhyN rbU2ZRqDSQFoyWPe+W/FM1sszy573tAENsSlYOqaiqoNgtgKddXRt2QaEs1IAEU1IRLc Nx5ulesNQiJVfuEDmFBNSDC5QXf2+ExHVnRP13d/sOKF3pUp2Ej15RCisR+xvsOjd+VZ +Vsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KHeROvIq4CSC2FMFzmeiM0i6iG6dvZWzuyFWS5s0CDs=; b=teKBN5kNedbQm/+JT+2V7taZkvO+IzzfwMVkKl3POXnWPAfRmYdE058HsgnKRUCiEc Cg5kPmydyPTwNOF21WwFSTv/WRE/9K6LN0DF2zx/JerJs6Q8rRUM1vzAiQ3JR2wwyP1A CRcOLLao8mXkacn0Pr+cLyGhEOBDdsSw+OaLuUlHrPbvUiGrkL0GisR2KMdUyFsf4ln2 sIacFDKit+ABNoUSA0P9PlZ0o021RxeibIv78X9ICL3Df5BtLGXXAJkYOc/NXH3mza2V XtMz6WUTxHKHyqvTFYdBRe/QEPVpC/GY/bOYQAJpV1h5oPBwqDxT6Ap1hPWlwbcGb3gV oNXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=wlQ8v0bs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b5-20020a63eb45000000b005347ed33096si1340116pgk.258.2023.05.24.08.42.54; Wed, 24 May 2023 08:43:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=wlQ8v0bs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236043AbjEXPdE (ORCPT + 99 others); Wed, 24 May 2023 11:33:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229876AbjEXPc5 (ORCPT ); Wed, 24 May 2023 11:32:57 -0400 Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A162A97 for ; Wed, 24 May 2023 08:32:54 -0700 (PDT) Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-75b0f2ce4b7so84869385a.2 for ; Wed, 24 May 2023 08:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942373; x=1687534373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KHeROvIq4CSC2FMFzmeiM0i6iG6dvZWzuyFWS5s0CDs=; b=wlQ8v0bsuOA9hOIgsHnV0xzgFyBlbO7E6j9Va6zOMO1Lq54V7yVfco94su2p9uA3zT GAryTJuE/eyHkMObMXy25pmdmQHP7wJqp+4j8yOi3nIDdmPVuWoRz9/X7tM7FdDjEOMh Zp+su0joqmuWavruN1PE8gqEZA6j486QyZYcg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942373; x=1687534373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KHeROvIq4CSC2FMFzmeiM0i6iG6dvZWzuyFWS5s0CDs=; b=AhQi1H+xpqG2YObf8sH0o47XyyXPf+qijmcjNCGUDAQ1d7R6FElnkTJou6xd93UMkw kIUwxQX9SRhurHuC/s7XN8I3p3LPXomonNtnOVY3hMQtywqJTuJ5RD+x9R8uX3WukHRr MYbVimO/4GfZ3hhBYgksw92G59DevztulbTm2+WmJOZ9muq5yyaoj9DMS9U3XSMwlHlq hBSClJYecA+6r5kmIvY74b6X1rOUZ9u68uQ9/C7kMyYHGzt0P0hY3Vp3504R9BDGZ+rY uvkVqqnRnXHOirbSomhqUpjfaHbhSuzcA1kjUFlxLILgoUu9nNj4dHqh6LEriKLs0sRv 66ow== X-Gm-Message-State: AC+VfDxWoqyNedesCB/eS9DI5ngbpm+ArN/CyLLD0EH+vksRwx6ncnRt +HUKkRMNCSeevZAtLyx6x5K+ZbUg3YKU0mXWIAo= X-Received: by 2002:a37:856:0:b0:75b:23a0:d9d5 with SMTP id 83-20020a370856000000b0075b23a0d9d5mr7619005qki.43.1684942373514; Wed, 24 May 2023 08:32:53 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id v18-20020a05620a123200b007590aa4b115sm3296906qkj.87.2023.05.24.08.32.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:52 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v3 2/6] mm/mremap: Allow moves within the same VMA Date: Wed, 24 May 2023 15:32:35 +0000 Message-ID: <20230524153239.3036507-3-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230524153239.3036507-1-joel@joelfernandes.org> References: <20230524153239.3036507-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766790776778948777?= X-GMAIL-MSGID: =?utf-8?q?1766790776778948777?= For the stack move happening in shift_arg_pages(), the move is happening within the same VMA which spans the old and new ranges. In case the aligned address happens to fall within that VMA, allow such moves and don't abort the optimization. In the mremap case, we cannot allow any such moves as will end up destroying some part of the mapping (either the source of the move, or part of the existing mapping). So just avoid it for mremap. Signed-off-by: Joel Fernandes (Google) --- fs/exec.c | 2 +- include/linux/mm.h | 2 +- mm/mremap.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index 7c44d0c65b1b..7a7217353115 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -707,7 +707,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) * process cleanup to remove whatever mess we made. */ if (length != move_page_tables(vma, old_start, - vma, new_start, length, false)) + vma, new_start, length, false, true)) return -ENOMEM; lru_add_drain(); diff --git a/include/linux/mm.h b/include/linux/mm.h index 1f79667824eb..dd415cd2493d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2265,7 +2265,7 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen); extern unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len, - bool need_rmap_locks); + bool need_rmap_locks, bool for_stack); /* * Flags used by change_protection(). For now we make it a bitmap so diff --git a/mm/mremap.c b/mm/mremap.c index 184d52f83b19..323c3b94216f 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -479,18 +479,23 @@ static bool move_pgt_entry(enum pgt_entry entry, struct vm_area_struct *vma, } /* - * A helper to check if a previous mapping exists. Required for - * move_page_tables() and realign_addr() to determine if a previous mapping - * exists before we can do realignment optimizations. + * A helper to check if aligning down is OK. The aligned address should fall + * on *no mapping*. For the stack moving down, that's a special move within + * the VMA that is created to span the source and destination of the move, + * so we make an exception for it. */ static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_align, - unsigned long mask) + unsigned long mask, bool for_stack) { unsigned long addr_masked = addr_to_align & mask; struct vm_area_struct *prev = NULL, *cur = NULL; - /* If the masked address is within vma, we cannot align the address down. */ - if (vma->vm_start <= addr_masked) + /* + * Other than for stack moves, if the alignment causes the address to be within + * its own @vma, we can't align down or we will destroy the current mapping. + * In other words for non-stack moves, the masked addr has to fall on no mapping. + */ + if (!for_stack && vma->vm_start <= addr_masked) return false; /* @@ -513,13 +518,13 @@ static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_ali /* Opportunistically realign to specified boundary for faster copy. */ static void realign_addr(unsigned long *old_addr, struct vm_area_struct *old_vma, unsigned long *new_addr, struct vm_area_struct *new_vma, - unsigned long mask) + unsigned long mask, bool for_stack) { bool mutually_aligned = (*old_addr & ~mask) == (*new_addr & ~mask); if ((*old_addr & ~mask) && mutually_aligned - && can_align_down(old_vma, *old_addr, mask) - && can_align_down(new_vma, *new_addr, mask)) { + && can_align_down(old_vma, *old_addr, mask, for_stack) + && can_align_down(new_vma, *new_addr, mask, for_stack)) { *old_addr = *old_addr & mask; *new_addr = *new_addr & mask; } @@ -528,7 +533,7 @@ static void realign_addr(unsigned long *old_addr, struct vm_area_struct *old_vma unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len, - bool need_rmap_locks) + bool need_rmap_locks, bool for_stack) { unsigned long extent, old_end; struct mmu_notifier_range range; @@ -540,14 +545,9 @@ unsigned long move_page_tables(struct vm_area_struct *vma, old_end = old_addr + len; - /* - * If possible, realign addresses to PMD boundary for faster copy. - * Don't align for intra-VMA moves as we may destroy existing mappings. - */ - if ((vma != new_vma) - && (len >= PMD_SIZE - (old_addr & ~PMD_MASK))) { - realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK); - } + /* If possible, realign addresses to PMD boundary for faster copy. */ + if (len >= PMD_SIZE - (old_addr & ~PMD_MASK)) + realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK, for_stack); if (is_vm_hugetlb_page(vma)) return move_hugetlb_page_tables(vma, new_vma, old_addr, @@ -696,7 +696,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, } moved_len = move_page_tables(vma, old_addr, new_vma, new_addr, old_len, - need_rmap_locks); + need_rmap_locks, false); if (moved_len < old_len) { err = -ENOMEM; } else if (vma->vm_ops && vma->vm_ops->mremap) { @@ -710,7 +710,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, * and then proceed to unmap new area instead of old. */ move_page_tables(new_vma, new_addr, vma, old_addr, moved_len, - true); + true, false); vma = new_vma; old_len = new_len; old_addr = new_addr; From patchwork Wed May 24 15:32:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 98575 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2918286rwl; Wed, 24 May 2023 08:48:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7sTa5HpSsb/TuZw1Fr6S3fSm4yL5EtDVyvIdKC67np8+6u89Tc6uzK1eoop0qOcaYfF2vs X-Received: by 2002:a05:6a21:918c:b0:106:3b67:b5db with SMTP id tp12-20020a056a21918c00b001063b67b5dbmr16467937pzb.18.1684943323422; Wed, 24 May 2023 08:48:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684943323; cv=none; d=google.com; s=arc-20160816; b=V8QsHI7vJ+GkSlnrF7/H93C9qTFkTVpEKhdaQx6c+AiZhalVJ30xtn83NPzSDuTmjD omso2SRuhbMqbEtRlpmrLrfa4BsX/m1sC+pgATwFboX0lwI4k6IZH3gjYTEJQOu/4EPX JUFzXG8sn0OEpUuNnF69gZwYWNfPQWu0JpWcPoY6Oi+n1uTx7dFzwzUixXeRE7qGlJjl DaM8YfBbg1BjY0ScbgR+Fd8dnII3PiTi2kkhBaBTJNmYT6ebuyDiY0TLs0iOjol8YD+8 6EZzSpyJbqWJWZYW/sb6UHoyZFUDPlqKJVntNrC+KD3+B+3IudOB0gG9oJav3/uTVt3S 1SlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t64UzVHVroabp76Xd4g1LLeTmZtqX+n8nvVYbfjxh90=; b=ZHqQs7d3MuNOgQdhY77scseHjAtG7P0C9ivBvzkTLuNnO/Cps2+s1FGuIzkzpKXDJZ ftiiIUXhei0TgpUUQSX6p6MtCOavZKa8gB5dPT7WLcvLiAS2jXIArX4v7fFweOCsCs5t qka44oPVhr6jqVOnawGvBOiQN2AuyM+gT8uZG8hjWI1YI7DcZQuza8jKOlhaRpPpDPzD 4AvOLXQR0pJoJbphFB4MrzNRL2gXyDnA6+LwhURmXzZkGPoSoZ5h1txtOtlbfvax0TzP FnlNabWMNTzopecLR0j8h+cOXpTxmKHIlLl19Mz0E/iqvjb2p85436s2QZ3ej6xktEDh cKkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=fkkfqnJ5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c21-20020a637255000000b0053f144dc315si1045024pgn.427.2023.05.24.08.48.31; Wed, 24 May 2023 08:48:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=fkkfqnJ5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236100AbjEXPdH (ORCPT + 99 others); Wed, 24 May 2023 11:33:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235917AbjEXPc5 (ORCPT ); Wed, 24 May 2023 11:32:57 -0400 Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD09E13E for ; Wed, 24 May 2023 08:32:55 -0700 (PDT) Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-75b17aa343dso87256785a.3 for ; Wed, 24 May 2023 08:32:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942374; x=1687534374; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t64UzVHVroabp76Xd4g1LLeTmZtqX+n8nvVYbfjxh90=; b=fkkfqnJ52t84oMcKxKF0Qg5EIe+H/e5iNykQYFnHWz3Bf1EAvgahlIVxTsm8Z0hi4V OFp1GA5hnGMxdsdMdpwgJqewYy3Q6MuKpYhOgU1MBi6rBu/XAAnTNc41obMlD1z1fxX9 KRxzh5JbqUbMmqvEK2VKJEfhsUNZsUg4KU2WI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942374; x=1687534374; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t64UzVHVroabp76Xd4g1LLeTmZtqX+n8nvVYbfjxh90=; b=TZLVHPfITjo3iXm/Nx3XXeiswUEKSgG3mbuJmeqO0KxnI4kniNjzJO+8HWieqRJJpj VfkdTB/iCBTGFmHoyVbAVGuUuSMMo+YkiwrzZ5IViPpgT7vEDk+pAelVbtaojuCzc+Oh U93WxFHiyl5uQ9+J8HjRrDCinITmZ78fOo0FwXElrndajG+Y24zchyf/YDp3dHzFbQSr VLgeowBKUL5dbksHDAD1S6XWYkE2lcJHmKsZOQ4eAT/sZtel46wXDIcVtpNJaa2Vkagr iTO2LPFrCUEeypYTPkfeL0KdsTgYLNC4pSeU0xNO8tgdZr6SkdNUt2jTQ10dcNrtrcHf K2jQ== X-Gm-Message-State: AC+VfDz45YmzvFQwxXkGHLukDC/7G80k1fWx9KX9qqz8IObULvzJY+05 3xEZfnd/cp86/YM1P4ab9FAGUgq0IDCEch+N42o= X-Received: by 2002:a05:620a:3d14:b0:75b:23a1:8306 with SMTP id tq20-20020a05620a3d1400b0075b23a18306mr7101918qkn.1.1684942374473; Wed, 24 May 2023 08:32:54 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id v18-20020a05620a123200b007590aa4b115sm3296906qkj.87.2023.05.24.08.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:53 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v3 3/6] selftests: mm: Fix failure case when new remap region was not found Date: Wed, 24 May 2023 15:32:36 +0000 Message-ID: <20230524153239.3036507-4-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230524153239.3036507-1-joel@joelfernandes.org> References: <20230524153239.3036507-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766791130138854553?= X-GMAIL-MSGID: =?utf-8?q?1766791130138854553?= When a valid remap region could not be found, the source mapping is not cleaned up. Fix the goto statement such that the clean up happens. Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 5c3773de9f0f..6822d657f589 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -316,7 +316,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, if (addr + c.dest_alignment < addr) { ksft_print_msg("Couldn't find a valid region to remap to\n"); ret = -1; - goto out; + goto clean_up_src; } addr += c.dest_alignment; } From patchwork Wed May 24 15:32:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 98569 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2917415rwl; Wed, 24 May 2023 08:47:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5y8+068R+R6qgJUVJ7AD0x/uSBKAGIDRK05Udka0hxKoJmX3X+dNr4wvD5e0rUin0PIYFo X-Received: by 2002:a17:902:ce83:b0:1ac:a030:c30a with SMTP id f3-20020a170902ce8300b001aca030c30amr20787000plg.19.1684943224102; Wed, 24 May 2023 08:47:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684943224; cv=none; d=google.com; s=arc-20160816; b=JfdLmDdW4VLQFVo7SS79hvV093syX70M8WBzbSG1UARRZzabMuxiFEU9a4qOJBjciy Ii7I/rhPHgKaOKcslazCWAouOfxAWX8lxTORzdg/rM41dKRT0oTEItrwEtY/QmCLC6eg 2sOBaqM1K23XeGMeiHqN62tsrrxcaRv9dc9ACtX9cjaKDtweo+yukB5yYByYbuxvHboL oeHH/hXLiaEE6Iaz7bhKl6r93BYnxp4u2dmVwjEjtYAF5vqGFTl+UskmC2Qv979s82b3 ids9r/dNFPjFxrRyPdYf05/LAH4o84XFkQ7XGGJ66Ey/RoPQzHYBbWtoqmiiOwnDpHqL qniQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8BlbglpAiZ94wJYkjhcCjsilb7jfKjCG904F6yJstFY=; b=mzWs+rhrKACqdLmOZGyfFIVe8CSwLiJHs7JdCm3+SoXZQRfPriJ+okeh+LgTeybsvT NiTDVM1234mE8qUfGnhFRr0EqU7M3VVlirZGubo5ZwfpKuDkB/o09y441EtO+FYC25xk xWJMOfkPxp8Ma/wl2ECcXeRvDYUduczrq9vtok25WuJ3h+fdRpcDZo0E1Zk5mPv0a5P2 D6qB8Y76VlaClVkHxlyqQaDP08/25HiGl6FfVIoQVg6qF/qGvuGrpHiV4unKPBgihKXw CFZZm+z/aBTtbJbzaU9NTZfllN+WIYx/hzaumMfEhC3bRHjuEOp7QDVR0IL6/LZLPG7E hB4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=M1+QdVek; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z7-20020a170903018700b001ab115a868esi2807831plg.49.2023.05.24.08.46.50; Wed, 24 May 2023 08:47:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=M1+QdVek; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236121AbjEXPdK (ORCPT + 99 others); Wed, 24 May 2023 11:33:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235935AbjEXPc5 (ORCPT ); Wed, 24 May 2023 11:32:57 -0400 Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F97E123 for ; Wed, 24 May 2023 08:32:56 -0700 (PDT) Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-74e4f839ae4so88404685a.0 for ; Wed, 24 May 2023 08:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942375; x=1687534375; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8BlbglpAiZ94wJYkjhcCjsilb7jfKjCG904F6yJstFY=; b=M1+QdVekzfaYabKgKHR4vetDn9xM5mnD1uJWBlxynPLjOJfqn9oU5l1EBrOn9cJpSz Hq98wTXJQOIQVLk3KS5/hG2Zi5acdW1WRswNIK3R6vCGj/LzIulXp3+4a64uKUCOthvR XxhMU2PzCdmfCd52I8rtjdt6QU++OhdOr5Brc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942375; x=1687534375; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8BlbglpAiZ94wJYkjhcCjsilb7jfKjCG904F6yJstFY=; b=JCC3wKj7ykG3Ph0m85HDHYUI3ZORcHp30fMFPfHbh7hreutFngu9dF6UcVPrf+mIcZ 04Quo19CgRrigPGu+9BUUhJvBEVnLovb7eOHt1QJBsswWHDO7JEAL7RW+TBta474hMKN ZwEeqPyGxEC2RPPh2oPOeyl8ma/a0lfla5DoF0o8YbFYmVy6Mrf37W6rPeiPcy4iMAO5 Xn29KApekvGpmdKadVG/+f+bFd8yHzYQVl5WcQOa5LyEzAP/Pz+1Q9VT3iWRD43cDcZW PCcLGKWqXCd4fnMFf1U8SEfCGN9RA1oBgTwuKX0YmupxSpl5eV3/jjBAQeUk0lQcFA2v 5EtQ== X-Gm-Message-State: AC+VfDzTYVQ/iLVfxxuyexgbionB1eDMTohLsn8mCBvLfC05ItFaskNR inRp8kqiITaD/67yEMJdeXDRkE6y7tulmPyQ9iU= X-Received: by 2002:a05:620a:8d0e:b0:75b:23a1:3680 with SMTP id rb14-20020a05620a8d0e00b0075b23a13680mr6261791qkn.65.1684942375456; Wed, 24 May 2023 08:32:55 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id v18-20020a05620a123200b007590aa4b115sm3296906qkj.87.2023.05.24.08.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:55 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v3 4/6] selftests: mm: Add a test for mutually aligned moves > PMD size Date: Wed, 24 May 2023 15:32:37 +0000 Message-ID: <20230524153239.3036507-5-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230524153239.3036507-1-joel@joelfernandes.org> References: <20230524153239.3036507-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766791026101945265?= X-GMAIL-MSGID: =?utf-8?q?1766791026101945265?= This patch adds a test case to check if a PMD-alignment optimization successfully happens. I add support to make sure there is some room before the source mapping, otherwise the optimization to trigger PMD-aligned move will be disabled as the kernel will detect that a mapping before the source exists and such optimization becomes impossible. Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 6822d657f589..6304eb0947a3 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -44,6 +44,7 @@ enum { _1MB = 1ULL << 20, _2MB = 2ULL << 20, _4MB = 4ULL << 20, + _5MB = 5ULL << 20, _1GB = 1ULL << 30, _2GB = 2ULL << 30, PMD = _2MB, @@ -235,6 +236,11 @@ static void *get_source_mapping(struct config c) unsigned long long mmap_min_addr; mmap_min_addr = get_mmap_min_addr(); + /* + * For some tests, we need to not have any mappings below the + * source mapping. Add some headroom to mmap_min_addr for this. + */ + mmap_min_addr += 10 * _4MB; retry: addr += c.src_alignment; @@ -434,7 +440,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb, return 0; } -#define MAX_TEST 13 +#define MAX_TEST 14 #define MAX_PERF_TEST 3 int main(int argc, char **argv) { @@ -500,6 +506,10 @@ int main(int argc, char **argv) test_cases[12] = MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, "2GB mremap - Source PUD-aligned, Destination PUD-aligned"); + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /* From patchwork Wed May 24 15:32:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 98556 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2913802rwl; Wed, 24 May 2023 08:40:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4wPfdsTnXiGp/sGO/wo/zHhBF5bcRVJdzn/POJEkpiAzLqTZgmpOs+LK2dHsQMeQu22ea9 X-Received: by 2002:a05:6a20:8f26:b0:10b:c341:935 with SMTP id b38-20020a056a208f2600b0010bc3410935mr10496028pzk.11.1684942841676; Wed, 24 May 2023 08:40:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684942841; cv=none; d=google.com; s=arc-20160816; b=Hr1wkLnQoK9mrN46MbggC1D6o/ZWWzM+8ozVnSant609TeMhORW2HkDb0H+KVdM+b4 jNejAycdPfzHcrYmFp0coGOBZ+/dKz8Tetfj6/OPdvNgan7wtU8ZCustttslPqXoLDHk nTWLVJDhrgl0t/BqF1j5RXTEgFdpWc4t2N/gDmU1a1hAPJpzh0d0NiPnR4abkRl2qcoU /Jg045eihd5XykY4wOEEFEQWg8LuIk40FY3I1oF9t8Y9AIiVwa9jk4krectC+c/yCucX fMKrMLtyOhNQhfRLLT8bOvRN++KXZod8WGKV1bhmnZvKkg2Wc5DLKvX1bLI1ymhcaoP3 Lu9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=O0tjYXHW6XM/uedvUXhXTuxPHgCneWCEnRUXzUjK1Qc=; b=AY06W/m2zUVAcUd78/99r0X4zhaby6OoA5d8/iIan9tas+5YRSUyrBav0GxUYHCaND yay2nGPTVJKvir4ctH316DCHwfBsAZHZ1ncoB1oA/sRn/rln29v9O+YlTy89s3d7ZP92 AUoV24nTz6sNkVw5+atoVAJjvGpD8e0Fe/h6Ru2vyRTWohnEPOL0lxBW9FFiRAwt4zOq u3ywbwPjPpu94w62IP1ckC2Xb72Z5GIi2meTkCzc+hP9a+mAmrOSyXuQDyDYzlyUkIu2 oIFYm1G0ZNSMlh2ENOBBTgPruzlNyUX9X5uQd9LIJAhfxQpNTN+vKgmlU0mEywSGa8C1 kJJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=WXmStX11; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d2-20020a637342000000b0052872c32995si8497921pgn.724.2023.05.24.08.40.26; Wed, 24 May 2023 08:40:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=WXmStX11; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236140AbjEXPdN (ORCPT + 99 others); Wed, 24 May 2023 11:33:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236032AbjEXPc7 (ORCPT ); Wed, 24 May 2023 11:32:59 -0400 Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C84E797 for ; Wed, 24 May 2023 08:32:57 -0700 (PDT) Received: by mail-qv1-xf2c.google.com with SMTP id 6a1803df08f44-6237faa8677so5816966d6.1 for ; Wed, 24 May 2023 08:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942376; x=1687534376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O0tjYXHW6XM/uedvUXhXTuxPHgCneWCEnRUXzUjK1Qc=; b=WXmStX11/lcotVWec4XBydhg1nwkR8cil5DVP3/cqlxA53iGKbBlq2LBmZ8kmIS4/r a42WEPdEz0veNSLGKQQUgS5H4SFzZ1A3H++srImE6xmN96tt9QD+wjWYUpBgUjbRleFp 6NoSUE5RS+7ygUhpinyFf0tBZWIFpnBydFpVc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942376; x=1687534376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O0tjYXHW6XM/uedvUXhXTuxPHgCneWCEnRUXzUjK1Qc=; b=RjDiOPBA9Yk4XCECJu9M86vB7kTfr5wr7KKLotxnQNtWtM2U19MO8lC7eghbwIQNym QMJ/tcDnzcPGQvadLEdvzzLSgKMZOT2H1D+KIVK4bF0i9/1X9pvbBt3dgjTwdXctuKrY y6YuXE7cFP0j7BTB7G+sgggmI51usLTCo42VKhwTJLTRUtJVxsJoY28sAthzSZMS21z5 KSPrU1DXED8c+LAXB2oXjX1YiF0/eme4w2FsCJv/7+JdnoGJqhetxtBEbVFSSwUeFlXa 3htrJfHIUbqQbxB6o0bpkkh1s5cnyM4Jgu0oVA2JR6zRkr4mL3hJTGiPM5gzyirpsqe9 W7mw== X-Gm-Message-State: AC+VfDyhpvX/f0/qYzuY4bsDPSOiAzsInCFcu/DWJWm67t1NfNJHbusj +Jk94GI3e8tQ715DbvyHKQy60CxUOvZnsASRhA8= X-Received: by 2002:ad4:5942:0:b0:623:86a9:7696 with SMTP id eo2-20020ad45942000000b0062386a97696mr23247464qvb.5.1684942376578; Wed, 24 May 2023 08:32:56 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id v18-20020a05620a123200b007590aa4b115sm3296906qkj.87.2023.05.24.08.32.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:55 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v3 5/6] selftests: mm: Add a test for remapping to area immediately after existing mapping Date: Wed, 24 May 2023 15:32:38 +0000 Message-ID: <20230524153239.3036507-6-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230524153239.3036507-1-joel@joelfernandes.org> References: <20230524153239.3036507-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766790625279614955?= X-GMAIL-MSGID: =?utf-8?q?1766790625279614955?= This patch adds support for verifying that we correctly handle the situation where something is already mapped before the destination of the remap. Any realignment of destination address and PMD-copy will destroy that existing mapping. In such cases, we need to avoid doing the optimization. To test this, we map an area called the preamble before the remap region. Then we verify after the mremap operation that this region did not get corrupted. Putting some prints in the kernel, I verified that we optimize correctly in different situations: Optimize when there is alignment and no previous mapping (this is tested by previous patch). can_align_down(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 can_align_down(new_vma->vm_start=2f00000, new_addr=2f00000, mask=-2097152): 0 === Starting move_page_tables === Doing PUD move for 2800000 -> 2e00000 of extent=200000 <-- Optimization Doing PUD move for 2a00000 -> 3000000 of extent=200000 Doing PUD move for 2c00000 -> 3200000 of extent=200000 Don't optimize when there is alignment but there is previous mapping (this is tested by this patch). Notice that can_align_down() returns 1 for the destination mapping as we detected there is something there. can_align_down(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 can_align_down(new_vma->vm_start=5700000, new_addr=5700000, mask=-2097152): 1 === Starting move_page_tables === Doing move_ptes for 2900000 -> 5700000 of extent=100000 <-- Unoptimized Doing PUD move for 2a00000 -> 5800000 of extent=200000 Doing PUD move for 2c00000 -> 5a00000 of extent=200000 Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 57 +++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 6304eb0947a3..d7366074e2a8 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -29,6 +29,7 @@ struct config { unsigned long long dest_alignment; unsigned long long region_size; int overlapping; + int dest_preamble_size; }; struct test { @@ -283,7 +284,7 @@ static void *get_source_mapping(struct config c) static long long remap_region(struct config c, unsigned int threshold_mb, char pattern_seed) { - void *addr, *src_addr, *dest_addr; + void *addr, *src_addr, *dest_addr, *dest_preamble_addr; unsigned long long i; struct timespec t_start = {0, 0}, t_end = {0, 0}; long long start_ns, end_ns, align_mask, ret, offset; @@ -300,7 +301,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, goto out; } - /* Set byte pattern */ + /* Set byte pattern for source block. */ srand(pattern_seed); for (i = 0; i < threshold; i++) memset((char *) src_addr + i, (char) rand(), 1); @@ -312,6 +313,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr = (void *) (((unsigned long long) src_addr + c.region_size + offset) & align_mask); + /* Remap after the destination block preamble. */ + addr += c.dest_preamble_size; + /* See comment in get_source_mapping() */ if (!((unsigned long long) addr & c.dest_alignment)) addr = (void *) ((unsigned long long) addr | c.dest_alignment); @@ -327,6 +331,24 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr += c.dest_alignment; } + if (c.dest_preamble_size) { + dest_preamble_addr = mmap((void *) addr - c.dest_preamble_size, c.dest_preamble_size, + PROT_READ | PROT_WRITE, + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); + if (dest_preamble_addr == MAP_FAILED) { + ksft_print_msg("Failed to map dest preamble region: %s\n", + strerror(errno)); + ret = -1; + goto clean_up_src; + } + + /* Set byte pattern for the dest preamble block. */ + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) + memset((char *) dest_preamble_addr + i, (char) rand(), 1); + } + clock_gettime(CLOCK_MONOTONIC, &t_start); dest_addr = mremap(src_addr, c.region_size, c.region_size, MREMAP_MAYMOVE|MREMAP_FIXED, (char *) addr); @@ -335,7 +357,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, if (dest_addr == MAP_FAILED) { ksft_print_msg("mremap failed: %s\n", strerror(errno)); ret = -1; - goto clean_up_src; + goto clean_up_dest_preamble; } /* Verify byte pattern after remapping */ @@ -353,6 +375,23 @@ static long long remap_region(struct config c, unsigned int threshold_mb, } } + /* Verify the dest preamble byte pattern after remapping */ + if (c.dest_preamble_size) { + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) { + char c = (char) rand(); + + if (((char *) dest_preamble_addr)[i] != c) { + ksft_print_msg("Preamble data after remap doesn't match at offset %d\n", + i); + ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, + ((char *) dest_preamble_addr)[i] & 0xff); + ret = -1; + goto clean_up_dest; + } + } + } + start_ns = t_start.tv_sec * NS_PER_SEC + t_start.tv_nsec; end_ns = t_end.tv_sec * NS_PER_SEC + t_end.tv_nsec; ret = end_ns - start_ns; @@ -365,6 +404,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, */ clean_up_dest: munmap(dest_addr, c.region_size); +clean_up_dest_preamble: + if (c.dest_preamble_size && dest_preamble_addr) + munmap(dest_preamble_addr, c.dest_preamble_size); clean_up_src: munmap(src_addr, c.region_size); out: @@ -440,7 +482,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb, return 0; } -#define MAX_TEST 14 +#define MAX_TEST 15 #define MAX_PERF_TEST 3 int main(int argc, char **argv) { @@ -449,7 +491,7 @@ int main(int argc, char **argv) unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests = 2; - struct test test_cases[MAX_TEST]; + struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; time_t t; @@ -510,6 +552,11 @@ int main(int argc, char **argv) test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[14] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Dest 1MB-aligned with 40MB Preamble"); + test_cases[14].config.dest_preamble_size = 10 * _4MB; + perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /* From patchwork Wed May 24 15:32:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 98577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2920121rwl; Wed, 24 May 2023 08:52:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7/ZIXnH2myuS4+XNV7fe/CiZ2mh/t36FHaKz1C+zW4f5aiW55qdbZXmx8RH1b5WY173tsO X-Received: by 2002:a17:90a:fa04:b0:255:6563:4867 with SMTP id cm4-20020a17090afa0400b0025565634867mr9713460pjb.1.1684943527890; Wed, 24 May 2023 08:52:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684943527; cv=none; d=google.com; s=arc-20160816; b=tNlzhpbVmOjFXFLneE59YDn521jKegQymI1MnbOmeR4caxjQ7AF4ZZ7Ku8GzHsRrto MyLCxq3weMubdNdZstNas75U/4Dy5W1o89ucfzGqlcwRJ6kzZLUkvz+fogdQfBqC9D8C 751GcyNKEHAV55LwBC2oIIQIjismd6bpB6rGMFITjSiKP/N3F02CsaOzY/x/HWq6bAlq XEsvZ0Hv72k5uDeLbdEi7qh1MlIcRQ1sKnTkTt0NJqEVPu5GRpiQJkSjbQYJ1jzUOC1s 0AibYFRBm6pzEHt6qcmD6O6MNtJzGkP5Z3Wdi7zFO70o9JLiA0n4q3cIKINSXSQuMrNn koGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=h61GjzCXvltES23o4poVmjSYAXp4vZcszjGp5xgEGZ8=; b=sJcIuxZDJwM24YIZ9LHqvYLGHDdqHZl0JUFrwFFugxol8WlxK76QZlgxyNLjUeBjqx 7iK4jEpgpmZvK9UOkm33UkqgtkIvrBueZiOuwUxLcpagG3r6QvSK2dT1jn3cnxUIGiKJ GtnctRvrpMFostqz7cRO4dJVeJzKW8XNcZuwvV9mrX6xbi1GItiULl5yf4wcUk2qGXwc 8MOn5klKtA6vOLlFHs9hgA7A9iy9NIBlUxHsMeVVfK97tlNb0E/icfdH/WXDiXRA2erp AP8olqY1kpF28stAXQbp7XXqbb5QSkjRoexYkpZGx70qYTzBqQIZLgsEDL5lhkCo7nVQ onDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=fTepg2gL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kk1-20020a17090b4a0100b0024df598ed11si1693884pjb.188.2023.05.24.08.51.54; Wed, 24 May 2023 08:52:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=fTepg2gL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236248AbjEXPdS (ORCPT + 99 others); Wed, 24 May 2023 11:33:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235916AbjEXPdA (ORCPT ); Wed, 24 May 2023 11:33:00 -0400 Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2EF4122 for ; Wed, 24 May 2023 08:32:58 -0700 (PDT) Received: by mail-qk1-x730.google.com with SMTP id af79cd13be357-75b04e897a5so152599085a.2 for ; Wed, 24 May 2023 08:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684942377; x=1687534377; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h61GjzCXvltES23o4poVmjSYAXp4vZcszjGp5xgEGZ8=; b=fTepg2gLXsKRDSS3n315I2mTd5hD9c2GRRNGC2wT9Pv1umTd8fob7wD+9EmKEHSy1U JFE5UVfGrEPXsXiFMq89EduNO36oib/1iEtT3SWY+v0Hr0/YukGkb/aj1tsd+gq3+KKs qg5EKhyLZjkSGWEFRvLD5HeTCqPaTdbo3r53A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684942377; x=1687534377; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h61GjzCXvltES23o4poVmjSYAXp4vZcszjGp5xgEGZ8=; b=iAiDimSmMm5qfyC4N/MRBVYrAgl3CQI9Zk6d1bBOsYCYWA1yiKZTNdSvJw+m0mf687 7wCB+zjJshRsqa+SvC1tw0HW2lJc2bi6Oz+ybxrhdNLBFLe+LHHZrTnoGWPuIHCWRkhA LHOCPcvf4xW+Z0bJv5b9OjMU5X67Ry2VGVwqrTXDpOEdyClit3J8GtLA19/o+eJJn1pO K7fnPbbYrDB7qO/QjQN+9rXwadxdOS3CUqG7EAhvUvAKjujlGbjVUV45JQwDzjavxDze ZMgGADVHZ7UJu/VuLy5WWdrUqFKQJvt/sOLAqQE1h4NTNb0mNuC5eKvZNgpRiGzFY+cO 73gg== X-Gm-Message-State: AC+VfDxM+g1gvL5pGpnjIrGhVX/TE7UK/ZeCJAHm6twVoy3vOi5fBO6f XrYHuRem2LNZtXyA84PYUY5iqqPHw2wuPLXt2y4= X-Received: by 2002:ad4:5949:0:b0:5ef:46a9:15d2 with SMTP id eo9-20020ad45949000000b005ef46a915d2mr27143817qvb.7.1684942377556; Wed, 24 May 2023 08:32:57 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id v18-20020a05620a123200b007590aa4b115sm3296906qkj.87.2023.05.24.08.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 08:32:56 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v3 6/6] selftests: mm: Add a test for remapping within a range Date: Wed, 24 May 2023 15:32:39 +0000 Message-ID: <20230524153239.3036507-7-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230524153239.3036507-1-joel@joelfernandes.org> References: <20230524153239.3036507-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766791344272861782?= X-GMAIL-MSGID: =?utf-8?q?1766791344272861782?= Move a block of memory within a memory range. Any alignment optimization on the source address may cause corruption. Verify using kselftest that it works. I have also verified with tracing that such optimization does not happen due to this check in can_align_down(): if (!for_stack && vma->vm_start <= addr_masked) return false; Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 79 +++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index d7366074e2a8..f45d1abedc9c 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -23,6 +23,7 @@ #define VALIDATION_NO_THRESHOLD 0 /* Verify the entire region */ #define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) +#define SIZE_MB(m) ((size_t)m * (1024 * 1024)) struct config { unsigned long long src_alignment; @@ -226,6 +227,79 @@ static void mremap_expand_merge_offset(FILE *maps_fp, unsigned long page_size) ksft_test_result_fail("%s\n", test_name); } +/* + * Verify that an mremap within a range does not cause corruption + * of unrelated part of range. + * + * Consider the following range which is 2MB aligned and is + * a part of a larger 10MB range which is not shown. Each + * character is 256KB below making the source and destination + * 2MB each. The lower case letters are moved (s to d) and the + * upper case letters are not moved. The below test verifies + * that the upper case S letters are not corrupted by the + * adjacent mremap. + * + * |DDDDddddSSSSssss| + */ +static void mremap_move_within_range(char pattern_seed) +{ + char *test_name = "mremap mremap move within range"; + void *src, *dest; + int i, success = 1; + + size_t size = SIZE_MB(20); + void *ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (ptr == MAP_FAILED) { + perror("mmap"); + success = 0; + goto out; + } + memset(ptr, 0, size); + + src = ptr + SIZE_MB(6); + src = (void *)((unsigned long)src & ~(SIZE_MB(2) - 1)); + + /* Set byte pattern for source block. */ + srand(pattern_seed); + for (i = 0; i < SIZE_MB(2); i++) { + ((char *)src)[i] = (char) rand(); + } + + dest = src - SIZE_MB(2); + + void *new_ptr = mremap(src + SIZE_MB(1), SIZE_MB(1), SIZE_MB(1), + MREMAP_MAYMOVE | MREMAP_FIXED, dest + SIZE_MB(1)); + if (new_ptr == MAP_FAILED) { + perror("mremap"); + success = 0; + goto out; + } + + /* Verify byte pattern after remapping */ + srand(pattern_seed); + for (i = 0; i < SIZE_MB(1); i++) { + char c = (char) rand(); + + if (((char *)src)[i] != c) { + ksft_print_msg("Data at src at %d got corrupted due to unrelated mremap\n", + i); + ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, + ((char *) src)[i] & 0xff); + success = 0; + } + } + +out: + if (munmap(ptr, size) == -1) + perror("munmap"); + + if (success) + ksft_test_result_pass("%s\n", test_name); + else + ksft_test_result_fail("%s\n", test_name); +} + /* * Returns the start address of the mapping on success, else returns * NULL on failure. @@ -491,6 +565,7 @@ int main(int argc, char **argv) unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests = 2; + int num_misc_tests = 1; struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; @@ -572,7 +647,7 @@ int main(int argc, char **argv) (threshold_mb * _1MB >= _1GB); ksft_set_plan(ARRAY_SIZE(test_cases) + (run_perf_tests ? - ARRAY_SIZE(perf_test_cases) : 0) + num_expand_tests); + ARRAY_SIZE(perf_test_cases) : 0) + num_expand_tests + num_misc_tests); for (i = 0; i < ARRAY_SIZE(test_cases); i++) run_mremap_test_case(test_cases[i], &failures, threshold_mb, @@ -590,6 +665,8 @@ int main(int argc, char **argv) fclose(maps_fp); + mremap_move_within_range(pattern_seed); + if (run_perf_tests) { ksft_print_msg("\n%s\n", "mremap HAVE_MOVE_PMD/PUD optimization time comparison for 1GB region:");