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 */ } From patchwork Tue Aug 22 01:54:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13360075 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 3C97CEE49A6 for ; Tue, 22 Aug 2023 01:55:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47E22940020; Mon, 21 Aug 2023 21:55:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 391A6940008; Mon, 21 Aug 2023 21:55:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16EC9940020; Mon, 21 Aug 2023 21:55:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EE770940008 for ; Mon, 21 Aug 2023 21:55:24 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C9EF114019D for ; Tue, 22 Aug 2023 01:55:24 +0000 (UTC) X-FDA: 81150073368.04.E832AEF Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) by imf15.hostedemail.com (Postfix) with ESMTP id EBEB5A000D for ; Tue, 22 Aug 2023 01:55:22 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b="A1fiRL9/"; spf=pass (imf15.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.182 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692669323; a=rsa-sha256; cv=none; b=RCgJxneHqaPDlGCKdVtiKeCEtDoCPUoUIEljz5KxDjhHS8/eF689QAMAVn/zUffmJApQcr Rb8BQ05YPeG4OzUXJyEyrL2ipWPXO/BoJndHbtHNANDCnjh6hMOh7JGfPbzCEsMpqb/adG vaq8VsdlqhorWINton22y5HeaTXz2Ls= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b="A1fiRL9/"; spf=pass (imf15.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.182 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692669323; 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=UmTCssMd/OkLNKuh8A+l/1O9kIjaudHJc+AQCzKHLlk=; b=SvaOj1HlNPfHxj/X7CVA4b5lBHlqrUPLVlKVwcmKMIS1lTLD0yej+gS4PQ8R01b/UiCshk vkcFETdA/sIxl49eHGfnHhjBiPpQ3sT/h1ZFzIUe1WzuR4i4wa9T0XXZVcI1XVySAyYUT9 6J2wNkVZNMToJ+jqTC+QMyhW1H3RUP8= Received: by mail-il1-f182.google.com with SMTP id e9e14a558f8ab-34992058e95so12335395ab.1 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=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=SHwZcpAObWKF9NcwHYOZ7BOew6SQyo8opdEdVT9YF+OWYXLr6q1u5DRlL40pS4/w56 BRA7/E1EtgM6tPiWKEK/nt90A61TVm4ylT0TSaCxpWAnb+LCxOVfA8BLNbumEqroiItO 2A5hfCEIresQmn9zhTMQUZekYeDHnHiM5EC9Wp3r7JWPlVCXUm5r/YsfD5mgCLkLSJPK pn+Bw2dUWNXS5usApW2iUPskOlI/H1lOOYfCfY0gn1AssMYEXXJGgs5xmQTuG8JjX2o+ 9Yjlj8pGLkyzBpzhYK21kFT8sJ5GkTMGwiB+RkLDire8OTRWql4V8KiZk7MWyEsQleZv yjQQ== X-Gm-Message-State: AOJu0Yw6zVUzgfyT6YUFhs3mKC0Mk1G+YAmn456XI/ft+VPGNo93azAT G/Dmj1xFse5XzeSGQ4gPcv7jrw== 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 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: EBEB5A000D X-Stat-Signature: gto614dibrc3ieusoiefnhzji3znkp4m X-Rspam-User: X-HE-Tag: 1692669322-770679 X-HE-Meta: U2FsdGVkX19obQsYrqtEwPuSjKxq0ApJDplWo6xWIkyPKT6cF276aOmY98EDu5ft9DXK9norhKq4KCvTBmc72UfNtf/5fv83HOYUXi1Y6rOMgYiA2h6HABwcNk1AyLOboBrcJEY+cQHDOwBP3yMZi1wblbAWY47NzW8Z/53zztDDx3AGGjjvEMCkafG4led0k218lf8G6cN9qwkktnhoqSQbXkDy4T5qxH/2f8CEZ/Kz5OUfC5B9cgniLigmYnBivJyDJTXyRGCeG0SdBy5Hz/aie8sT6uPgjFg7yUcKTmyp/RtsXi2b4GrTnNeBNGsgy4KTMrfm5Dous3Xa4Z9Y32Fijn50AzFHdiurFCLn9COmjDp88RLtZ2uf7x5YF+ptRAXF2ZTID0I9oAptLjO/4ZHwdveqIR+wsnf7olcAWXQc8+kB0rQgL1QWwlUSlYZrvalMg0i2ABw1Udf1mmxJbJUnLY13YlHhvqWKVgUjCBYkX4vafUV4NPs4kIXHMk24kaLNkg8N5CrYIc/e0qKUNDwnHJZdIVImuiFpV74abJOK9Vd8eUUl+J/nHjyBHqG30a0rPFIdln08tO8PE0Gz+4XVfbcZjCYrz/Dgs7UN8tCCP2WZWB8w4CQfV/kLYQ2yS4xs0TTBL0E+Dz9r+9LCO01haxxT0H4Wb9sWWxrZQxfVNR17eLUT5yv+/u1qGQsiKF0n6lYPbLX2lZLelC0BNqbtdArS6dh2iX8/doOLUEyojv4K3ayFtc81BOG9gOjwbVuhgrdhLZXtudKudYyASbjPmjD4vO4C5bn3kpErM16zk3AD1uUniJ/fud4UI3qF4dX12jQnTu0rmgJh8ojYa3cjSRjzZNp9QuLMEQooD3CvVYj50WwqG13QxzlJ/A2+Kx0AHD+YE9YgjXzeWeds76hNLh3gxAxRsfVhPHMCOuiWrhAmAxq3+UxNd+i7/2WEsKEOwlWvb/d7zuL3LgQ z29cwxNN GDmEgAD1kuBdPIUO1cXxWeuMulLj2JztTMoehqsdh1aUYkC2gzb2x9N9+1C746A1/JiJcZahUmg9PrPyiSR6uBZzayjT/YD29qGbfYZWkyVbf0hWcQ/P2oTPkEQ4831LzEIU7cPBi7ook+R2AVnHNFFTqi7MB9LQpy4Vp/sTQkv8xDdo4Idh34J5qoAMc090zxS0yzwyuUpuwrRdBz8FP43CBMreiEkg8HEB5RyBVnTfZAnD/6NGX1WmRallOBgw+PAV69h1z6hvv80/z6mhzBFb+9wP61VwbfD0B5LsxALwU//Z6FTyjH89GJgd54YZINP4R1AvxKDivsFJIReTh/YfAFLHBXMT0PKG0seCcWjv894w7T42YRiQsv8t69ISZDLmAquJkefmuvVikDyriZ8/GIw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: For the stack move happening in shift_arg_pages(), the move is happening within the same VMA which spans the old and new ranges. In case the aligned address happens to fall within that VMA, allow such moves and don't abort the optimization. In the mremap case, we cannot allow any such moves as will end up destroying some part of the mapping (either the source of the move, or part of the existing mapping). So just avoid it for mremap. Signed-off-by: Joel Fernandes (Google) --- fs/exec.c | 2 +- include/linux/mm.h | 2 +- mm/mremap.c | 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 != 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 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 *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 035fbf542a8f..06baa13bd2c8 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -490,12 +490,13 @@ 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; @@ -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 != addr_to_align) + if (!for_stack && vma->vm_start != addr_to_align) return false; /* @@ -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_struct *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) == 0) @@ -528,8 +529,8 @@ static void try_realign_addr(unsigned long *old_addr, struct vm_area_struct *old 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)) + if (!can_align_down(old_vma, *old_addr, mask, for_stack) || + !can_align_down(new_vma, *new_addr, mask, for_stack)) return; *old_addr = *old_addr & mask; @@ -539,7 +540,7 @@ static void try_realign_addr(unsigned long *old_addr, struct 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 *vma, * 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); + if (len >= PMD_SIZE - (old_addr & ~PMD_MASK)) + try_realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK, + for_stack); 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 *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) { @@ -722,7 +723,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 Tue Aug 22 01:54:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13360076 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 6DA40EE49AE for ; Tue, 22 Aug 2023 01:55:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 40CA7940022; Mon, 21 Aug 2023 21:55:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 390B4940021; Mon, 21 Aug 2023 21:55:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1BFEF940022; Mon, 21 Aug 2023 21:55:27 -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 E5E8D940008 for ; Mon, 21 Aug 2023 21:55:26 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C22DCA012D for ; Tue, 22 Aug 2023 01:55:26 +0000 (UTC) X-FDA: 81150073452.01.3A90964 Received: from mail-il1-f172.google.com (mail-il1-f172.google.com [209.85.166.172]) by imf22.hostedemail.com (Postfix) with ESMTP id 059F3C0009 for ; Tue, 22 Aug 2023 01:55:23 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=dfaWwvA9; dmarc=none; spf=pass (imf22.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.172 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692669324; a=rsa-sha256; cv=none; b=L1ESy+SORWbAlmqpKMMX5/CXAzU3X48z/sariJmCKd5ZU45elQ07rx/MFWU+0axnqxvOPp 8Z5priceYWWb+LoQLJAAF/BhzOMydKzJRlgAzMlGnC182eMAui6XkoOd2MjOwZ4vW29hDq tfFw247VBxn1gB8Xi1QykZ0JvKGk6VU= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=dfaWwvA9; dmarc=none; spf=pass (imf22.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.172 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692669324; 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=7MVDg4AiFSlG/+H1Z+4rrwZ5TuiaCol/qVRe1MkiyJ4=; b=HWxTjzoUoKzDhcTLjAUbNAjigJk88z/OE1lWRYac1sm64HwZyz5SJZiD0Ij7Ke3bSXxc5h F4QYwUC8VvCc27lFvgt/slpW4GBDYPcZ8zxIp352aiSH14LFnHZpAGwZfgU0/WOM9tR8sL JXKcFwDIav7kdWWJo36kBfJeW1SXyRc= Received: by mail-il1-f172.google.com with SMTP id e9e14a558f8ab-34ca07ea55dso8942825ab.2 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=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=kroo0AP27X+lZMBiaVrujMRV+R8aH26Oe35sfLn9KQ7qsjbsf7rf9WAjGlvmN1dTrM /8PDudX2v40+wMSp9mUz/28CGp6YVtoGpxLwXK4YbrPqgC+AfIsHMH4t8C8sdR28TBsb s+h4Z0/3s9G05oDw/YC6aJJp1HfVx5fm9H+b8JnIjcTkVB8RNOKh72uU2fbWJ64pkQsa Q7+OJSnSkBXtWgScQ8FJU0z6dnx+HB81/2LVdySGphPRyp4PtqjBvzwDAcx/M8G3/ET/ tS6yYBYoy3t/XxcvdtnWbn8DcUk1qM5qfn0bqrANNQ04/HozyDNs3aL6lSYVKZT/oMoT 5VYQ== X-Gm-Message-State: AOJu0YzW5d9UThv5vkkM/BM2QPynlsOyY7mmFdoXjZpDY+3RAHQxirsG rwy7OOaSR3/S1D/nC5meuU52xg== 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 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 059F3C0009 X-Stat-Signature: xbonnyt73gnsdwuufyd6yih8chbgqucw X-HE-Tag: 1692669323-617008 X-HE-Meta: U2FsdGVkX18P1bCFIfq7p9ks2wzuzXxB5sxHJBLnasesamuRr8Vt8Of3R9JRBQELD2SrBrkJ9ZH+D2YXt30rl1fYdiKkMaPL8CCqpBSV8zjMIS4rML1HJcz01MdLjlsf7PEOis6ZpnErl85bdP4ysvv67lpUR4zUqTTyKI5RNqYp85NSTu2j7lBVaXUBeYomsRq5rqBiSUCVd92uZIvD+zlOYuRXAIAKucDnxmW5yBjO5z3J+kNKMV/SrDDVi/fSHrMQ20Gpcx7YN0OSvGNCH6ifTs7aNPdkPQe/8/2ZZQqg1kI7OrQ1JyLIdkwyqJoJopuI8JVa0z62cqC5DLcqncM//dxJj+Tj3iQAadLCAfAwMelVLOxzvLrZHdvg5ix1lW0Ngy4oQ6HXSyFAvOORQgKj6d/R+L1cIeG1FtUMMqXgGabhoVKPjVDPaG0pbx624/nbuuve2CZSBPgweslqXBg1KPT3aOGfgQQDaFdqPrSUxVGeAJmRhmqxPhYg898j6u3z1yJntj+ldwEG0zFeaUGBrsuCX0n9lNSDF4WhgsTGIIdxLdVaScTj9Cy8bFkaJtjKbpj4aMD+316RoU8RmsUEfCSDlfRJZcGNAUwH0bO18WT9DapegrsvNW9ELCg3yhQIo5puBfeA7Xlv1dunYxsk/A4n2aDDc9krU7/Pa78ev140fMfFTn1YALyQzFuhYYct7lFvYlVjVcxJ+PhrniXe2OsuHtM4e/1wScYTuMJrQPLt44hfKUbVgBqGwjMRbYs1JPVMFqG8SptDOEG19WNUr3FPbYGuP7eQbBfLkneew7p+RoFOPgiQsprlGifIyFBo9Qk9An6Ymvu0jqJ/A1BUn9jkgjnP3uD1SssTjJNwE/ej58uHeod8cIlbDcdE2RzxksZrRqBjimFlcSjhdG2qrnv6HoCG6D+qwlHzoFhgR5J27T6Ku5TTuvmUL4fRL0sQcv7mxIyVOCXcGdi fKb3S0rb 94p87rB1SUAPx+w+2CDbC0ShtMZVyCgickNsb3dS9aRrAJGJnO2ZnPCRLjlwDFvPl5Gobp6I6pkSHkyfWLb8RHZN2zX1pMI9KWkaG+F366YNHcU8D1EJ+fKc1Eusu+StoV8rLe5MZpUQ5TZbFKXFpUvIKJP9f++wFrPSyQ6rJPT1mr7BIBx2IgUKueyvchBQxGhGaWAYmWbW33ga257FgFdjY1Hbw7TM0WzppThOsnoZOZa7uTYhon+kt1hdKy87t8d6I2uHpLOKZ5vmxGtwjAHVTPjCMBXBu/lNy8TRzxdZOHM9Z3Kxlh61XMrtUhKNW1nkUbd5oU1Z7bKm+mAwDPvROepwDnw1kkl7F+flN21sZZAaGdhgeHSsVx/ZgDGE4lsJE8iKmf/vIjr530gg6ZhuWK+bPITLiPQjf/uPmrnrB3eA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000004, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When a valid remap region could not be found, the source mapping is not cleaned up. Fix the goto statement such that the clean up happens. Signed-off-by: Joel Fernandes (Google) 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/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 Tue Aug 22 01:54:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13360077 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 F1D5DEE49A6 for ; Tue, 22 Aug 2023 01:55:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 67916940008; Mon, 21 Aug 2023 21:55:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 60A2E940021; Mon, 21 Aug 2023 21:55:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 31C53940008; Mon, 21 Aug 2023 21:55:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0D81D940021 for ; Mon, 21 Aug 2023 21:55:27 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D1AA512016A for ; Tue, 22 Aug 2023 01:55:26 +0000 (UTC) X-FDA: 81150073452.29.99053E9 Received: from mail-il1-f176.google.com (mail-il1-f176.google.com [209.85.166.176]) by imf26.hostedemail.com (Postfix) with ESMTP id 0A41A140010 for ; Tue, 22 Aug 2023 01:55:24 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=XkzwrKY2; dmarc=none; spf=pass (imf26.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.176 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692669325; 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=u/QIpV5GdoUntyQD+YAulEqEr5HWAYhIt+wE2vL+NDs=; b=su3qof8gs9rQOXVPIoLgW0UcKvTlNlqTKwhPSe1K5OTHtc1SaUiVmEEogqIlk/gm039RMf PcxKyLeXzolzNT5ohYNSKz406pz3E+lDU9MzZZJ1ewItrqhL/OBxft0Zc9XwDG5oWP/csJ JuTHlcnjyu4yaT1BbrhkFuugzMav+JU= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=XkzwrKY2; dmarc=none; spf=pass (imf26.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.176 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692669325; a=rsa-sha256; cv=none; b=uRfC7njXAyM1a8R6rN2LD1OkIPpjMVllQhIqy70PudXhOenIARaMM3pjPBQIw0xz+bLZJv Vnqn3gIIZx0oBuL/QJCw5ZW7KfiCVF38P6eJ+XTxh4Vy+B3fYsbbMsPfgL/ITuqmUoO5jf bplPppQeDu/BrIU1Odl8A3vtfaziBxQ= Received: by mail-il1-f176.google.com with SMTP id e9e14a558f8ab-34ca1bcb48fso7128055ab.2 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=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=Z8eSpylOcgHyuFzkTHB5YYugMqNcQ4tv3RsyKgYJLqZaYCsEpK6PL/hWNbmxD5eDOq DKIa/mAIvWjG3bPy9hrEU2+V5AYzyYXQdsy9laye02qAtSX+D1ktmKpMJhI18MvSTwfG kUD5RFo3tLjzKJ4J5a7Zkv4Cd40aJZ7u0PXeOxFAGPF0qkgZILnOSL9p+6/r6scXxpAy ErzpWCFNG/hW+woaL8eXp7FZyQpUQp5mDKi2ebQd0aWtowOZ8Q87erhUW/Qf6NGQWpB/ PxdaGBBWQVmfWL6r6M0Uzi3Da/eycvBrqJpv9PvUKpKcuH9gchN/p1wAjBHpOa5UD7KG QXuA== X-Gm-Message-State: AOJu0YygnxBvaWrEGj68+AvXdM0NIeALDJwfeYkKSasPC0qzetIJ8ZDm T2AKCm7El2QweOjQ5e6/sl4cIQ== 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 X-Rspam-User: X-Stat-Signature: pwxo1da36smif7ip4q9m1jphw9sfesqn X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 0A41A140010 X-HE-Tag: 1692669324-942367 X-HE-Meta: U2FsdGVkX1/5FyW6K02lXxVOXSvMuPzIMt3aC9COPLDQ1izgE6wemuOXfpqcPAgCQ34ogxIxzCuBAUZs3gLILqNBxW4tkZ3giR4AJXwR5GYqRjhc1EtOM7Y1jn3oty7+TO8XCe41gMMMETY4L/ntdZsq7QSO7nrnIzbuwKDkv1NnswPmUgj4Dty+H2PTSwG+m0/cGeaOMf5GlxiDYSfF+fPFMEnh0oqrBJ/JskfCQjyEe/lP5k3/lfOZeN2TRs2pe4CXaXEW3m4vlh4LxD12fqu6KjqnDgvUrtIPos+dy5OjfB3Mbs7fPPEIaF11OojwVV+mBYoe5x0lV87pFYCEnVoz8g5kCGSFCO0yiqQscyOjOIcAnjWkM0l6+amwFf9C5aiVBp3vIEqJZgisU3P+wcRX4nrXa4QDtFwk/SWi0vao+dFLneXEEalVcUcwP/JVYYzT9eqI6wCLxu/guy3mapTQe+3kzBTZnqWc6M/Ow/1MOzjQUvKjcNLjzeVyfx0SXfRl01Ggw5HYFHLPcn22kmApX9CzPrayWhEy5hBt0ra89majdKRz4IZx3F1Pm4D1ngqL4iGyGtwBy8eIh66DTvtRikFwqdQ+PXlGqq/JHP3bzVhdTrqcrewtTCcwdWZEA34k9sbrksVr4v3Zak2WGjvvuRhN8DjsR3WJ1K/z9x9u5HK70UVoqI46zUjMFoLfkKqcUvDnW5QtN3a6rZondlDFEtCSk9cJIdJhA1yRlFctOPs7UJOelHSUsLfQ4Lk9W2PYKRczow62v6LVZZzE0jK23VPHOLaD9vf801qIROM0DuTXOMtXDIN4fqdKVQKo8U4FGkdndqvSZLFe65fxraU2S1KgcW7UkCMQRyQbaIitsBWGJ7M48Mj2JLTmD5JZ3WSzvJCEPVDyn79yc4NG3zFkES+GSc+II7QiMUmZbCoiNDOwSrLdG2Zin4XGn3ASTxm5I62kgnIb5XmKGZ6 bfIcoryY ftAhQAtiVWK9FxO8QEqMqd0QnsfEh6RFOQ+0UBBpepUwMaJVVN0DfLhqnZim7rrRJ0ujuxAR+TCtGuy1cxn5EPV7XuX7FPIWKKWhc44pDgiwtM5AFvNSyQWYyqeiBJWngBfV11cKUHKxWz6fnr+eL77hKZh8u9uRDUdH5MONVGn7oNbCsq+O3MT8qa2aHcoxx64y+OpD+mj4nWD2ji4R70FbhcVepi7yyULWB0ty7Q+Fde1hvjCLuhG/BgJCsPxThDH5dRvher8npm6SrUyHnyCB7Q1XJqFszk7LnnnlpDWLbeHFm78k8g0ll4XQ167fQorVds+1h8vS1ppTAveM8yrxRpejX0egwsg9HzzOk2nmPcPRtuDVn1OVVddbTt+mJokIaqn8HXKp8+RUsBJ7quqjB9g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This patch adds a test case to check if a PMD-alignment optimization successfully happens. I add support to make sure there is some room before the source mapping, otherwise the optimization to trigger PMD-aligned move will be disabled as the kernel will detect that a mapping before the source exists and such optimization becomes impossible. Signed-off-by: Joel Fernandes (Google) 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/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 Tue Aug 22 01:54:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13360078 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 6AED7EE4996 for ; Tue, 22 Aug 2023 01:55:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F64E940023; Mon, 21 Aug 2023 21:55:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 47BE6940024; Mon, 21 Aug 2023 21:55:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20D91940023; Mon, 21 Aug 2023 21:55:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 05274940021 for ; Mon, 21 Aug 2023 21:55:28 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D221E12017B for ; Tue, 22 Aug 2023 01:55:27 +0000 (UTC) X-FDA: 81150073494.24.5472552 Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) by imf10.hostedemail.com (Postfix) with ESMTP id 1ACBDC0003 for ; Tue, 22 Aug 2023 01:55:25 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b="dcsD/55U"; spf=pass (imf10.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.45 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=1692669326; 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=Axho/C2d3GxLBo+LZnFUqjVo2BRyImetugTXkfwiHhM=; b=t9lRs/GYC+XuyldasykcDEGf2dcS5BBtVjZde51P4IVAos+rTS6Z4DCRhcmElN2D+Ap8C6 CFerpQlGXwKMt6DW/adw8z4BnWhCKDbRu8RfHQqLvz/gxBsinDGaa3itoKfNHEjNV8Kolf VBqfpS35cJMMgehXg8z/JE3ql4BD9ak= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692669326; a=rsa-sha256; cv=none; b=xLYMkXkLTNFUy4mfnAA65/Re2yQU1WE+6UenBJHEr+XXZoK9FQ9RBQt0rFdnJqsYyCXUU7 vAyw7P4KJxSdhlsVP/x+N0zplZGWndLFiMR13idxjSWaDz+26u+we8xMVHcY1eJvdWPfku 73/hqEffLs0A7rixakBcONhv1A8X4/o= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b="dcsD/55U"; spf=pass (imf10.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.45 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none Received: by mail-io1-f45.google.com with SMTP id ca18e2360f4ac-7923bae7788so39653239f.1 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=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=lX9GJ/rASyudwHPErrR+pwSL4l15PpIGh0VszX+p8B7w+c3nPEvhNSdA58oIG3/zjX /NqAzw61+ertgGPMeMH7S8cPYcrmLD+/Z5ZEX5VSGh5n20+v7XtrkPfpoL1Xh2w+ZxM5 XWleKA2aV1JeEuIiPnr3Iz8VIZvCMm0pg8SeEgTakOgOCQchasUpAsKeJefqShQo0Eie ld7ZU9C71Ev0/7OmUgVAPwFwqUJToj0RBgCor+snwTnhHjKe9xfP+HPQeZ3UAcOCOAgX j36/Pha5IzmGKRrQk+73Zw7my8HsHonnLYBNvY39Sr7/YLvIxo203J+z7WScBZIPUBOG VJmg== X-Gm-Message-State: AOJu0YwIe6oeyz4WWiZe7RXs7SRQysIimikFx5b3uSb+NG2h5lIbWu57 /D3fOjyEEPW/0Dg4k626dGinNQ== 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 X-Stat-Signature: z759mp1fh6sdycc6ykehweppjxpn7jqx X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 1ACBDC0003 X-Rspam-User: X-HE-Tag: 1692669325-689588 X-HE-Meta: U2FsdGVkX18dxzPPHDUVYF52/T8rNK43clepupQODRSq7K4HhZGbGX1ZVjnh6taTVIB8BOvrfIiPTEZyTWsv5zYkgK1X8UNHz2Jkz4/b2uX6SAlm04/rX4rTiIcmksvprAMNy2BsLOqZTe1zoAlR2tUAIvYUMrPdickDQq4Abhepd41ur2l4PP35A/2stPEhXPAMFiJRRIsSjDKkFUAZRXZKkmcky+pvM0hy85R/kC71UHEgI2JZDj1b1qBRSdnu1rMcwrxKBzRxApEalHqEknNb/gqOtcxnKyThMVlj1eorRyxqlNFif2E5MUM9Gft4p2ZMvEx9tNYH/J1o0KXgyZITaRWOJUDjyl2cTvnWpUA0fKRzm3C23xJx6dLPmnOmnvHyn3UkOaZ77Nk93Yb7Ov0+igOSD7SaEuSzmqdhZIwrPsJsZECbf3YuqY6gC8FRycfJsHtspUr6Jau2ClJzPtObvv75EEI+XHT8lfzsIg4EU86tj6+nKB0229rC6e3ds2MQdwyNj7S7CXsLyq1Xmd/1zZSSefR6CPfdfhP8ArwXCtrvtDx9jjD4iQf1OSAqj5HZ0haasXCBByL/JtRXZRsntqrzIgsixIC+bHnvGGH+6SJTe7/EvkBuANkXegbGwaCnRWiKrIAP7iK8cwQS8KjTk2Q9/A+Oky0ZC3Ega+/XOfR7uRZ6KA7XFPArFf6Swp+lnGhpozGC/S4jAh416Wqk5t7uzG82PmRK0T4hn8Ke2ueNH1IMP28SNmUfEMsvq1pNlasgGAcrFS//2cyjGQ05GUK/cGqFDd/3Xl/lNKJFO9LmeXCsNC/kRDN9/spfh/mSOTsKSG7uqiXrsi5Whl/ktfDVgmZJxhD1QKUBxZbPsk7JbV1l+guJTEydTxHfcowkiSvQKSDh+vYsNMD7tpMTjvHqPvI4eVo1gkluQjYBNTj7/INlfbUfOZradFGiysvAjt/l/KfziAARVee Tj+80JhP HybRSkd32qWhQCD6y4NKm4QNyQUn3S3qAD5p/bBKHM2p+dMWN9L0+sD5FrU/mpUazhSHM/gtI2KrxIvdZ5BqlthWU9dCbRg4zh9oGAaoTy7wOfwhvBDbwIxKPoPUH75ab48pA4OpLkux1D7+tg7Ti/mYKfpeMDqERYCZ6h1S5EFX8icZnMU/oIcBCIdeglvdcVB9ynF1XfYbN0K6rUIsfP/4dOakJlDjAwD3LwvTZHR4WMBcqIcrCWdhiLKBctSjkXKxeEWLNVau/mv/8qPqh5AOuZpTqi++uNT5DCYRue1OV7wsJXNRfpJsqN4R8L9ekooVMy87HubTWMqCB/1mgKSTmRTNGh3aNevNOUFKhyT6swKGlOiHs1XKSWsHN57x24M4SsvcSkFAictcjYpHSfip281vwxaa6ZSFYH84gWnFBJ4UOiiH95zOf6DCSOwGXUwB9gbKpZtrTEz/SuGzJ5xNMgQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This patch adds support for verifying that we correctly handle the situation where something is already mapped before the destination of the remap. Any realignment of destination address and PMD-copy will destroy that existing mapping. In such cases, we need to avoid doing the optimization. To test this, we map an area called the preamble before the remap region. Then we verify after the mremap operation that this region did not get corrupted. Putting some prints in the kernel, I verified that we optimize correctly in different situations: Optimize when there is alignment and no previous mapping (this is tested by previous patch). can_align_down(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 can_align_down(new_vma->vm_start=2f00000, new_addr=2f00000, mask=-2097152): 0 === Starting move_page_tables === Doing PUD move for 2800000 -> 2e00000 of extent=200000 <-- Optimization Doing PUD move for 2a00000 -> 3000000 of extent=200000 Doing PUD move for 2c00000 -> 3200000 of extent=200000 Don't optimize when there is alignment but there is previous mapping (this is tested by this patch). Notice that can_align_down() returns 1 for the destination mapping as we detected there is something there. can_align_down(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 can_align_down(new_vma->vm_start=5700000, new_addr=5700000, mask=-2097152): 1 === Starting move_page_tables === Doing move_ptes for 2900000 -> 5700000 of extent=100000 <-- Unoptimized Doing PUD move for 2a00000 -> 5800000 of extent=200000 Doing PUD move for 2c00000 -> 5a00000 of extent=200000 Signed-off-by: Joel Fernandes (Google) 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/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 Tue Aug 22 01:54:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13360079 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 0554CEE4996 for ; Tue, 22 Aug 2023 01:55:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 78C3B940024; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F2C594001D; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 47CF0940024; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 303D494001D for ; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1481616013E for ; Tue, 22 Aug 2023 01:55:30 +0000 (UTC) X-FDA: 81150073620.25.12E7836 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by imf24.hostedemail.com (Postfix) with ESMTP id 48C0818001A for ; Tue, 22 Aug 2023 01:55:27 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=BVxKaBwC; dmarc=none; spf=pass (imf24.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.42 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692669327; 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=FD9aGvqokkyzhhNkz6Ym1Row+eZXw3mkXyW6dIKtxjg=; b=bvIhhVq0fWjs7VlqkyGrLQG7vhj/nZHtvXGhzKielo80iakUtTcRvwIihwiadCh6Cgqhm2 dsEOdrhJX4fyJW04NnadwoeTrF7THkHk7smjJPcrHlJYbAC25X8gjglnCV8qWQG/1rsXjT X6+8Xqh0Wt6ePOT0UddSsiyTphnCfQc= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=BVxKaBwC; dmarc=none; spf=pass (imf24.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.42 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692669327; a=rsa-sha256; cv=none; b=RsMTOXCQP1igbsb29GeamzS8iAhIfiaJLft+NbZNY4YCDPC/q034N89u6YDQvBqXqRsSWS WlZDoUn2H0MA719NGsk7ENqNRO12s4knb+7JufBZRS4tag3Ki8d2ugAfG1rZgAB5xseGWn cEEb5i95lc9pKlDjCTy00hwSReBIDZY= Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-79244dd2e49so15853839f.1 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=VcwfjAcpugz2QgQG6gNTgjg1vS/HOhQmoYwaVO2yLsXq0YMgNqUMhRESXj1YL7byNF 581VH0odAfbtwYzq3RxZl3rj2hjfTG5n8OeT/iIDwnyWXyyWReIRiUH8Qe0gs7VwdaOA YwJyoM59U3f4idj4gLkilzahTKXWalE778llXVV+0AvDbnvim9qdKgOUzpwszcSwX2OW 9kdbukJ0eBU8TJjEU1IGrSxcGxmCbpf2xxfnK84i9qbAIk+E/8ZgPgVWb6puHn06AJ+g IDiszptXCTaERyQRc8RUu14OPRB+hKFcK7x3zxVPRY6llRL1TRZ8HMav+p7xSuB1ZqVx o2mQ== X-Gm-Message-State: AOJu0YxXEntCf/AKaLeyFNgNyodnYCDL8yWXVUBjMKlWAzJ7pXTJ70k5 vw8/mV9bwfYUXKU7m9WvBDRphQ== 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 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 48C0818001A X-Stat-Signature: r5m7ziys1wdc6kdoofbgnmdkabnbtur3 X-Rspam-User: X-HE-Tag: 1692669327-531759 X-HE-Meta: U2FsdGVkX19zP/y/+jcON7RVhvZJkf1wcaKlxAhItf87jAZ7FQ2vee1GWRxaZqxwFAaD5tfxUYpr8knnVwhiFGQGGz6WfA9cq2+Ux7hAxllgG8Hy9wMC1cTpc+e2g7Jgr7/yXr6zI3arNYOFedOP+pNJ4hRQXWOhwRXPcBeK/Tj/yqIPE31xZsSvNvqEo0XxV08Tz1qWpAx9fsX34SnukSkwzo0P2ibWJIzrr4QO13woQQgyejo/yVBCREZ4NZy+WO0AwaypR8YCQpHwnDZawHT7pS3BDbdhq/9eGFAsvE4KvWsaqKiP3wcNMgAMBa9TNEoZXL5r9BrWL5jS8/n6moPJ9cAmjkC7LqUaDPwt0/Ii7Gi9D5QvxcBp89hgM/CeKomu4b0Y7VKHBqQO0OlM5sPL9GwJFJiL2dXu4kuBBEf/tHLDv/7iazf36zAVXZfom9vha85CplizcGSNc8wRlLPYFHDM9tBfGHlcna+8nJ1/z2xPUOhmj+hOrwrcnG4WyPWTKIyT7RLnzfJlPymyABm/zwBd6nYcNGVPPv15OgfQiKFSBgXMU/YeuK1r4MvIQPrC5Ll+qzzdVVTVqC98Ev0MThul4SkA2DiFPvLw/4EmNVKU357oEj8LYdKEyt3y85tmVRu2xDtzSFnxzx006a1RT4sNijGEy2tDRxF8sp6rngrzH3VmozbIAh6IeUpTbDwzQXL/ogjBqeN31D3VjsM075fk9y6YEKXmCOVE9xPkBBnvJPrOPx6/M5mM7g3/tuoNdhPXUOSMSKdHAW7RmoZXVdNhkWRtI/C5Ul+yMoya8lkywDOSz9cb97Iake49IrCN6EGqOjoxyMMBo8ECq/HUcIC/0CBeZ1on1vT7yi+t/MOAquAYHe6u1a7jdhP9eXYV8wwVgc1XSy3qFIPC9QLjs97ORmLojR1j3Oz26+C/7JK36hlvvQ8KPlYP2JAPP1WtzCTpzo74SiCImLZ r6NpnomA nGjW0ky8nk0hU86Ioy44yrO4/1dd+CGAo81a68OGT6sBZqxfi9x55dqLqh/LPeN0qEhmJFbH5lvfTeiJNmGvyp8ISe8XZ9ec+YBqAft0rMz+gmZ5TSeRruvw0lGEIlFJi9LUwwu+8DQR6CygSQwj4+r90KbAEU7+JKfqkakUW2+GbhQdg+qZH/f8UXUn54EJJA6+uV0rXbKfUfq/Aw6MSkEf0V5XsRSFLwvZ52fI5Gy9NG1da9RFzKUO48SZb0VNAbuq+kgYboQ4Dg1OHkWRdqpNSiDDRIijks+EkQEzdk8NkXUL1EJD3OAhoggqLTJJYhSxYzEvrQxLvI30cICXJdo9W5zu6KDjf1BAuAJbWxIg9PWzGHf0yNxdtsS0Yoa1PK0EPzaqVIPL6L6hCEJVB5uaiuGxPs2tAwP83mUzWZlh3XLMOrozthz431UBM5JSfhAj5nZcRCapqrw/kvJ5QQWTgfw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Move a block of memory within a memory range. Any alignment optimization on the source address may cause corruption. Verify using kselftest that it works. I have also verified with tracing that such optimization does not happen due to this check in can_align_down(): if (!for_stack && vma->vm_start <= addr_masked) return false; Signed-off-by: Joel Fernandes (Google) 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/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:"); From patchwork Tue Aug 22 01:55:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13360080 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 C2601EE49AA for ; Tue, 22 Aug 2023 01:55:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E6C2C94001D; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DFD91940025; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF6EB94001D; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 997BA940025 for ; Mon, 21 Aug 2023 21:55:30 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6DB911A017F for ; Tue, 22 Aug 2023 01:55:30 +0000 (UTC) X-FDA: 81150073620.17.198BDCF Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) by imf04.hostedemail.com (Postfix) with ESMTP id 62E3F4001E for ; Tue, 22 Aug 2023 01:55:28 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=hB3OrYAb; spf=pass (imf04.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.175 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=1692669328; 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=XSp2RkE7WNDbZkDSniptEmg1knVa7eiFGdAlEcTCYXk=; b=6roOkxLET015Iy5xPOuLchNxlJJDTLRjKBgRnYDsfqXh89r18nJ3na0xk92utlxOeA/2ex ptBTz8ob+/OK8wifXwF1g2cUFPqzQyBLIvPKAtHqUld23+QImSGDjXnnmfkVNoSqI7FktU I7F6WzV0uXaVXKzHYctce2TB2lzd3g4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692669328; a=rsa-sha256; cv=none; b=i/Xf+acrM8o0cA7u6fkPHF4B1phvttPge8H2C8BUSKsImCZe09MhwlrBSR73QuxLtB3xBf A2G1zM9+e1Bm4bdFFVHSwk6vV4DyIYmS5LVuENIdUe3dy0NGOncc5z80BEcIpjh/jpeQsA LSt9BraC60byqBZJJEzBhkc9BKHpxtE= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=hB3OrYAb; spf=pass (imf04.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.175 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-34bbc5eb310so11406135ab.2 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=ZBfS/PkKP47WVWqIo1CT/1vy7/iEtMqZvVl8De0EdiwxrwR0l6+Dg/+JFATducGr1J +xjvGztKuWCUGTcWiqhTAecRFszTO0MRWiz6sW+0BCXBsXQqjDtW66ZDT1aD/ipLTsXH ORgdioxRUes0lgfnqgwHMH+btJgJ0VGPjEAlN9malxW3nyHYWas0sIiavtDgxvXd57+/ NiAoIv9zj8obWGdouVrLp7pSF1NdjNDo5Xgce3+gb0BC3KNMlTi3cuYJDtCtVzWZYSih jn/d6ia5B7gkZdVouemwtUzQ6qyiQ/lKpkraZ+s6LzdzOqLinkrXwdhLXW23izbC83fM 8J1w== X-Gm-Message-State: AOJu0YygCy+Hz6/POpkC7UUwG41SFzO1qxPIdy+R0dO5sy1UR+kQ1Bi7 VbMhGyXQbyy3L4CPQyuJqEHR1A== 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 X-Rspamd-Queue-Id: 62E3F4001E X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: pkym1iw8dwn6zbkzzdrn8o7ea1op9ns1 X-HE-Tag: 1692669328-781215 X-HE-Meta: U2FsdGVkX1+Qsvk1gC7oBWeHKuXQiF+lR8MDAV6qr3GJEYFlt3KbAHN/NvWdBz3HoVcCaTWUbZKexJOGScbihursQreRXPZd8KAJYIvdsGhkqjmgjf0TYEj/zHz9f7JRUqszyiXip/U95v+tMO5zdnmCKEH4nYOhrFd6sGhvO11MBOpGD1UC2deBcLgLmbxA7HRPa6SJtNhOhHVDrnua2upbR9sD+6Q0V26mtXhoNTj4jqArV1hPnJn3feH7mof7AZ1cm0t+sZ+5ej/gV/GDiLSq7ghXUwixa7yQtY1LlexjeZLIukDIe7UR4RfYwygAi5clICX+4UtbZ3XtFnBzDj+ZUGmoFYtvEIW+2yRQITeo3tJQP9GRYUgDvXE8Bez0dn4sXv8WRrrW+XAAolUwHCqonVLEYlxCXV9sr3IEc9A6y6EpfTS/VKBQYlly++ElozviC0p+LCkRsnp9Auhd7v7IJ/pV7/5dJ89YUzA/dDmMauGQ/Xgm8jdM36W+7SH3IZTLiQ25ONSBhlx3wK5QfCOSGCVWtpZHJPOKQ0rgDBWfPe+Yv6YVXjKB6+6M+p8vLX+tPpe1cviCSFk2zg/ySesXNhrz54Q6WKmZASm17kdRA08gw2G2BPwWlDovFZ80nYLuBWxtUd/+KtD22opaD9dGxhok43tC/wHaxe5WiZr9jWKdrAFT4t2HnzLPy4o7O+Syi+ZLbsF1t6Giv9QVmfMoU5aGvleBHLFWMzJRuNzHDvo2ZWHwqjA6iwVfS7KDHKFe066VubsyN4Guc0UMaPdkuQPTWWEwsFRBe6bq2yZyXYf8O9yh/xtPvol2IM9VKc6Tua3xhRb229a2ZIpGqyhQfNhBibIMOf4DJl6yjfiClXiLaKnuQriHqkyTVDm5snYSgE2JQK4pI5w+Xx+CSJyeX3uz7iURGiTKdKzsHM2f6Oke0J88TI8GGUNeMivmQjo5bYHMEbWGHlV3XYq OILBj0M+ WytHXh6ytHlCWESsPMjVdPGMZJnmsMjTJR1XkboBkV7E7oJ36oeqbgjn/DxhbaAx7vT9MGPVb1GhR2tlIBU8pBpA5xsE+TpCZsybZR2xuw+1xG2HTtiqOY+/NYzsUnSNRsTVPPL/Vz9/p/OBNsWtFeXzBRJg7gob9hX713LbKDgjmMz0aLaf3fDjwrX6s1JYzP9u5w+HFcBumLFTpGfrWIdzX+m/IEds1hbadCStDJhVYWt+EI3dXBsMgYaZHcXiVRsQ+GAJ9UxwAHHzpzVr7LD2ulT2ovoPp22QHCEud2vbMI36wHLqqjLGVCsp06p0BNNLVPe3wod8u1Wlw2HXNk7izSgLlutUkdM6QmQeyTqTFht5g7DoTmkhIMUlqbCbLRbXytNduVDaleIWgSuNxQwlDm5fah9LQ5TlglwfOZ9Y9qdpimBS2aV02RVGSm6mk2xB6nekmbNdKwO4PmsqA6C2zcVtZ7V0IrV/U 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: 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 != 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/selftests/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 @@ #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) 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; } +/* + * 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 = 0ULL; + void *src_addr = NULL; + 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; + if (addr < mmap_min_addr) + goto retry; + + src_addr = mmap((void *) addr, c.region_size, PROT_READ | PROT_WRITE, + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); + if (src_addr == MAP_FAILED) { + if (errno == EPERM || errno == 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); } -/* - * 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 = 0ULL; - void *src_addr = NULL; - 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; - if (addr < mmap_min_addr) - goto retry; - - src_addr = mmap((void *) addr, c.region_size, PROT_READ | PROT_WRITE, - MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, - -1, 0); - if (src_addr == MAP_FAILED) { - if (errno == EPERM || errno == 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, unsigned int threshold_mb, return ret; } +/* + * 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 = "mremap move 1mb from start at 2MB+256KB aligned src"; + void *src = NULL, *dest = NULL; + int i, success = 1; + + /* Config to reuse get_source_mapping() to do an aligned mmap. */ + struct config c = { + .src_alignment = SIZE_MB(1) + SIZE_KB(256), + .region_size = SIZE_MB(6) + }; + + src = get_source_mapping(c); + if (!src) { + success = 0; + goto out; + } + + c.src_alignment = SIZE_MB(1) + SIZE_KB(256); + dest = get_source_mapping(c); + if (!dest) { + success = 0; + goto out; + } + + /* Set byte pattern for source block. */ + srand(pattern_seed); + for (i = 0; i < SIZE_MB(2); i++) { + ((char *)src)[i] = (char) rand(); + } + + /* + * Unmap the beginning of dest so that the aligned address + * falls on no mapping. + */ + munmap(dest, SIZE_MB(1)); + + 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 (src && munmap(src, c.region_size) == -1) + perror("munmap src"); + + if (dest && munmap(dest, c.region_size) == -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 = VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests = 2; - int num_misc_tests = 1; + int num_misc_tests = 2; struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; @@ -666,6 +744,7 @@ int main(int argc, char **argv) fclose(maps_fp); mremap_move_within_range(pattern_seed); + mremap_move_1mb_from_start(pattern_seed); if (run_perf_tests) { ksft_print_msg("\n%s\n",