From patchwork Tue Aug 22 01:54:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13360074 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83CB8EE49AA for ; Tue, 22 Aug 2023 01:55:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0869894001F; Mon, 21 Aug 2023 21:55:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F295F940008; Mon, 21 Aug 2023 21:55:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7C0694001F; Mon, 21 Aug 2023 21:55:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id C26E6940008 for ; Mon, 21 Aug 2023 21:55:23 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A0E7716013E for ; Tue, 22 Aug 2023 01:55:23 +0000 (UTC) X-FDA: 81150073326.07.351D978 Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) by imf20.hostedemail.com (Postfix) with ESMTP id DD4301C0006 for ; Tue, 22 Aug 2023 01:55:21 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=CzldOLSR; spf=pass (imf20.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.44 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692669321; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CsH3vkDr9agJVI3SouFCcK5RkzBRN3iHA9ib5+au0Rw=; b=qNqzMNjKI/HzGcZCKAVvmQtEYDwb9eC0O7IA34EZx/MflsESvcCp0csflz1rXScpe8zO3F KehxN2lBmLYgLjoL3tHHOtPr3RD/mEf8hMOq+oMr8cDmp1tc/elBFZ9kzkQUBxbgM1Eb3u z4/XqkKwONd2dphS9Ch5wpsu3Z38lmg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692669321; a=rsa-sha256; cv=none; b=eJkyYYfsx303b3btbhiqf6qcGNo6ZNG+MOyRWaHqt40yBLvr+MQHYAE67nAlgkhq8Bw0wG CwLBR534agvjN0rKnAa0ptrOYQPXuF5RntKtGYyQVZ15tSSK50FQTdyxsr6TMOT+kUnJAb 1BFl9Ii0HcU2Ll8hmP1zq2UxIAZI00Q= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=CzldOLSR; spf=pass (imf20.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.44 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none Received: by mail-io1-f44.google.com with SMTP id ca18e2360f4ac-79246bb4008so6855739f.0 for ; Mon, 21 Aug 2023 18:55:21 -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=SFA0xdGaIiBbO2g3cJM+GuynYClEluE9PHW6hmAWO3PUnhWt71JUF0UuTa733GkZDu Z9Q264hgWLzQ0sOD1Ui/zgk6Mfq5xpcBrow1Ss3M9MXzbhQ5VH76+nBg5z1OeMojM1tY gypj1dQRmfsd8N8oZdXp8e//Ua6pcRpo9nGN03GeEEIj6k7sYaUWLfN604voGy8JjiJF jNYO7I3zOc98z9IZr4PEyyEnopa/0XHoShI59uQlr623aWaWE9K/ZnZ7UPX3fs10oyJA rNMcv/O3UpCFX5f+pf/od2oKl5fMVDqYcfUITNbHxw4DlHjZLanigwWtw7kJAElJyBTj ElFg== X-Gm-Message-State: AOJu0YytKkCKNzYtp6v88Tr1sTzSn96D/sM7ikYJfRNqT7YFOueiYvGb rxdrd0rts7lZVOOL4ZmI7oFLrA== 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 X-Rspamd-Queue-Id: DD4301C0006 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: keah9bp5qb9i7fn7w3mkat5byh911nyg X-HE-Tag: 1692669321-386480 X-HE-Meta: U2FsdGVkX1/tHpP/meMKy7vlDfE1FuXQ0bkmTSIEhV30spKl8M/eNS/B0z7FtN0suQ57nAf8as27uhqVx7PdzgVSTlQtr1twt8ab4q3839WhPdcBvL5GmidSWyP3cDah9V9k5GC7bsIS0GjrevE5hewk+9Lgm95VVpmiC5+1h8PL+w5ZIOnvS5QFpF3+fc2telNIR27VVo4WTlZNzvLOX8jXLduGSsv89iBEjFdDYkhKdj8qSeI9Q47rMm25dCfkGWZXIl6MG9562MjAr3z465SMV4lHry5g3ATC8aZfzd9e6CDoyYnTTR5sl+P5cGW5voqOo2zEJ8p2uuCkowfPkDVBcKEAVvJMmk07xUOPNDWptv53vHRSBwPQdg0wsg//SxmktToRupV7av+YtJRYrLYDamBAaErOaJa0nqhPrUp4HJz28yzo7vG6taaqMMLIboH2KRRAM+a2XJutHjoktLVEqAUPhu56hPZrmEVMv1Mx/hvXJqzmsT8Y9RLJ4lKJL5kcbmN4OLYxDE3YfuXK8ttBiGPRLWd3S3bDBfu4DxqOA/S+ibHytCHSjKuqq6ZpREvbcqfSVf9KZB5I276KnJ4P3znG450T7OQBjAhURYVnHlu/dBLdwjV9PAUqIEQcJWNg60gC2DOtBtTAXyEBouotFMLovutxNBteahFX1ZHxsrCR9ITkNsoBBXF7bzU0E6+FEXrqwckeQjNQ844LmDz5fynKOR+4RF6bZ1tOqKEz78hwlk/FJVp3uetXM8HujKq6twHXUHBqYp+Czs8EiMM8hm+fCR9ruS8YrampOQcI9gkJUXrTTQWm1Q0H+Me3WzA3Ni++pXMAN7ytUMapL2WVzLF3c9zHPZVsD4xwaZpHRWGBclnLlzKoDNr6L5Ndp4j8YJrwEXHLsNALcJkxfLAfZDr7AIPnBOzwzpANPe+wlBzVZ7CpXsxmHIbDonbzHepRqjNOJwWb7Ivh7L4 EurQ9PB/ r9Wt5lFmj2RAj+3Eey6+R0DCjsTFXuZltpr/TXDUzoxepYJFmdolwA/qzcgC8IhSB7WpaMdi6ItUMvPUfL7DlExwrOffLbpRQAs+PdkseZAot3dFVAj7OXeDnSbpKyJPe8LUDB1XKMfZGrG0WnM8rLTSSeZjDFw+XdDrUm+Pfrq496MeGLdYTjPv35mq1Qeu1yRc2UqdXC2sUHXvgWEZX0bDFMuyuCg1yaf01PFaG2LL/SqF7uJTXqg2mSk5HyvlqbSAadU6ByDruM1TuoyA9L440NEpPCY2wq9XvOnGtaMP/nByVEQ0iHEUtYvrrR1aqVb7OuziG804Jn9FXrEdwrRIsaEk9fRnPParONIsUk7FGe2X+Oz191Qb0CbfUOOe6e8t4qdMGRsMwiqYAb9BOWXBI8DjTaVJF6BTKrzwNPDIlHBulFjOaSdoKjBlmDpkH9yeXS1vGek2VyoXLh3rjPpTipzCDDg9uClt2nddq7W1gB27SfsZ1+YZ0SxKTjK53v8yv7f00PNg/Gu1CgOrk4BQOwM/0khztdOaaNh/XEBJROzXXZPC0AJ1zeINhlhzOIqRRh3ShYR7fTWUY7k+RD47KPA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Recently, we see reports [1] of a warning that triggers due to move_page_tables() doing a downward and overlapping move on a mutually-aligned offset within a PMD. By mutual alignment, I mean the source and destination addresses of the mremap are at the same offset within a PMD. This mutual alignment along with the fact that the move is downward is sufficient to cause a warning related to having an allocated PMD that does not have PTEs in it. This warning will only trigger when there is mutual alignment in the move operation. A solution, as suggested by Linus Torvalds [2], is to initiate the copy process at the PMD level whenever such alignment is present. Implementing this approach will not only prevent the warning from being triggered, but it will also optimize the operation as this method should enhance the speed of the copy process whenever there's a possibility to start copying at the PMD level. Some more points: a. The optimization can be done only when both the source and destination of the mremap do not have anything mapped below it up to a PMD boundary. I add support to detect that. b. #1 is not a problem for the call to move_page_tables() from exec.c as nothing is expected to be mapped below the source. However, for non-overlapping mutually aligned moves as triggered by mremap(2), I added support for checking such cases. c. I currently only optimize for PMD moves, in the future I/we can build on this work and do PUD moves as well if there is a need for this. But I want to take it one step at a time. d. We need to be careful about mremap of ranges within the VMA itself. For this purpose, I added checks to determine if the address after alignment falls within its VMA itself. [1] https://lore.kernel.org/all/ZB2GTBD%2FLWTrkOiO@dhcp22.suse.cz/ [2] https://lore.kernel.org/all/CAHk-=whd7msp8reJPfeGNyt0LiySMT0egExx3TVZSX3Ok6X=9g@mail.gmail.com/ Suggested-by: Linus Torvalds Signed-off-by: Joel Fernandes (Google) 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, 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; + + /* + * 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 != 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) == NULL; +} + +/* Opportunistically realign to specified boundary for faster copy. */ +static void try_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) +{ + /* Skip if the addresses are already aligned. */ + if ((*old_addr & ~mask) == 0) + return; + + /* Only realign if the new and old addresses are mutually aligned. */ + if ((*old_addr & ~mask) != (*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 = *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, @@ -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); + /* + * If possible, realign addresses to PMD boundary for faster copy. + * Only realign if the mremap copying hits a PMD boundary. + */ + if ((vma != new_vma) + && (len >= 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, 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 */ }