From patchwork Sun Sep 3 15:13:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13373271 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 B6D33CA0FE9 for ; Sun, 3 Sep 2023 15:13:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A8183940009; Sun, 3 Sep 2023 11:13:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BB048D0002; Sun, 3 Sep 2023 11:13:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 85D81940009; Sun, 3 Sep 2023 11:13:40 -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 756B18D0002 for ; Sun, 3 Sep 2023 11:13:40 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3C649404B1 for ; Sun, 3 Sep 2023 15:13:40 +0000 (UTC) X-FDA: 81195630600.18.52EDB22 Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by imf04.hostedemail.com (Postfix) with ESMTP id 5AD214000D for ; Sun, 3 Sep 2023 15:13:38 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=odZGtHyJ; spf=pass (imf04.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.46 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693754018; a=rsa-sha256; cv=none; b=QXw1lbWPPJGE9O29WLQFGSoaC2nuLgHf5rESmWrHUIuGh7gpcD0Zc/I7ZTA7NDQ46GVji1 Cp4wcIi4NmMKqvUc8y6QUfXDVyHTdvAJbBx94p9kmNEcgul3SLu9m0sL8d0R4helKVPV8X 558kODjM6vo8pMsIYS8qn60befzQcA0= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=odZGtHyJ; spf=pass (imf04.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.46 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=1693754018; 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=L4plAmoxt0TIZz59K3TwGGgNGB354bzgqE5y3am6jPM=; b=dVjmtmVR2+P7oG+PFjGW8Oq2pRIJvw7gcFihJQK2TfreSRvLGYSwSI6nWa4MQUe2uJGP4I 4JXb4m5gF9vaTZh8FdpymbOQVmpXywn2KnFr0LUW/Hf0atoJO7MT0fsVn8sx1URjV+Xnj3 YMZ81Uc7OzkSoc419X94VTdfZE+DdsY= Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-7927f36120cso33613139f.1 for ; Sun, 03 Sep 2023 08:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754017; x=1694358817; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L4plAmoxt0TIZz59K3TwGGgNGB354bzgqE5y3am6jPM=; b=odZGtHyJWDs4jHmUnw+l/YEJdeR5JjI3y37jHQ+4RkkrmJBZ2IC4ZLAc/qzkJCDe5d P07QpPzXjcmaBzPWwFghYn+XWlWSJ8NA4YXQuhRhPHH08Jqd7eXjsgYOX7a6+jvWZZzB nGe9yQSGMkZRbc5JzjQFTMKjDrwsvqIz1J0uw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754017; x=1694358817; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L4plAmoxt0TIZz59K3TwGGgNGB354bzgqE5y3am6jPM=; b=froyyoS9ikxOGz+LWz1kuVwt42uZF3LTm65I/7NKAfGJrXFi90SrfI350MIppuhlHz hRVBr5x1WGx80TfT2BdgTIhLKc3fzYZbLOe++d/qLwYw+7Ntm+LuxERRjBjhD2lAsz9x jY64ovnXWL5n7e1ZGmFJZ2tfslpTqABuhk5Vxkf3gby8YWUSX1KKKVzucPB2RK4drnfz xcYkZLNu6d2pg2XvHQhsnVSe5c7t7RcnYLi2eZrXgKIgogdp2EIQ9nluZAnlgmzAWb70 6QtBFfemT3PEBTdnlctw3i23/cGLwzkwWbjwFtIu73RbcBk0/nzsvXapcNY19c+IDFx9 enMg== X-Gm-Message-State: AOJu0YxaA3TyOTJhhm1FpmqFKBC6xUSaYm7cJZYy7t47LhqfkE0DOfFH +wUYrd6cq+szZo1LvlGZZ1u0LeT2AX1yOE+2f0E= X-Google-Smtp-Source: AGHT+IHJGQrTQCQWJADO7oGCiqQCRPPFaXSY0O8+5g3/GiBjHqRcTCt3H4l78vIVACIFoG7YASx0Jw== X-Received: by 2002:a6b:7f46:0:b0:791:2db5:c779 with SMTP id m6-20020a6b7f46000000b007912db5c779mr11231804ioq.10.1693754017569; Sun, 03 Sep 2023 08:13:37 -0700 (PDT) Received: from joelboxx5.corp.google.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id f5-20020a6b5105000000b007835a305f61sm2605897iob.36.2023.09.03.08.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:36 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Lorenzo Stoakes , Linus Torvalds , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v6 1/7] mm/mremap: Optimize the start addresses in move_page_tables() Date: Sun, 3 Sep 2023 15:13:22 +0000 Message-ID: <20230903151328.2981432-2-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog In-Reply-To: <20230903151328.2981432-1-joel@joelfernandes.org> References: <20230903151328.2981432-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5AD214000D X-Stat-Signature: 7397dsyes3pfqyfwbmjtp5mpa51xwzfy X-Rspam-User: X-HE-Tag: 1693754018-81145 X-HE-Meta: U2FsdGVkX1/Lb1cEWZkAVZK9IZc+1XA3cLIG+84eR+HmT71CvkqlfhTys2QwO7fLX+Ikl9iSP/CVYYoWOcRg6gIbNDl46tBOVE/AO0TtJ9gfizZbnii4o7yoafzc5xLXs0wU6gKn4qdgctoimApFnJnsF4TFv5r2n72HsbhA+8GCDdJPUZ2oS0GbnIDyIi3WD7CVR9AwXB9W0PB2ODrsf2fNpA1AoxV79K0kB+K222YBVMvU+nwYyr7syOIspKhaAPg5Lvi0hiqhDu7DaZ7JTExXV6SVXN6jcK0beqWhw514idz32902MPhm46tDapgjKbz3PEYkxGyMPuw/mYzvb1ZYanFDNe4IWxBp3sB/BEEm2dQFCZpjzYiIgm/0QXUP4i0NEziF/DNYQHLksIHJDtS106d5/hkuqAMSJL3x7UNO8Xhjt9PprigmbcIGc+eBD3xWWhdDgiVhSGitr8smseRq/2qXGbAWMLSLlOUxzvgT1T4o/fwrw+SRkAvRSrmzPEvanZ+uyaBwL8Smj13e1H79TVOfWhIEHMsFoGoqB5ZqmQaq9gHiqOYob1JK8TYhPG9jGPdVhbKwdZAInurTO/CePTul15kCAcLjOW5u1OqnR2OM3niux/DzGKyRPSq2P+vuFWlwMR4PiOAIMYT8XpKeun0ZQQuHyKniy4vd0MWrbC/Hi/0Hd0cN8gaHVtObu4Rml0V+dM2xmAP7t257G+u+zflYC/715rRa3Uw1eBOFFICUPf3kUQZpJWnRBX5A4DkvHPdtYFH3UFVVvFmgHW9ENN9P1+/8WRqaEbvIeiEYXaOHf9RP3nDRxKvHwnbHpe/Il7AYte54Gykf8EajqizRtUEARvUI+HKt+s6SYZw8shs2LbJt8COlMusT6sybXIqRRHygJJOH4tU1UqDY7uXaSGv4xTZgn+HbXCyXRXsuOTXRm3sbwRA/kschAEe8pWV7Mn8rrQKzIpkWHqh AovqLP9J eSdkWvtbVBsBt6wfjBwBaWPTbMErs+EE7HOdpyGHIEm9/J/NZ+8R0tlOYkF6xOmwAHYTX1bfr3bCVS4wFNtwIkzfusKTnj9MNmTTuzUl5kiJ1qS58UnziNERi4Xv+MGpszAOuzDrO0I63zc4aHQsxpHT34KHUi+YhMXjOV7c5ytd5GsrhmSMOydSSnK/FviOwyJ4fp5RdPbrrNnoNzj1FlL0fXm3ZVqpH5NbPQEcuiPqZULT2njujQ6hGVN6OvkfzSGUa++GTmVv6thw2sIZxS0hTthFKZr8BLIvWRbrDpXZcXhUr4elPmLQ/c2GAYqfAxg8voam/sXyfKZy+33BV4OrovjiRARv5O2G5zsj2qI/xumO8+jqhjPtc94ok54/+kQmBZFnMx+NBe8/+eNHR/BBJqkdasJfuvMsVhF4FbVU+W7VTeBHruCrfhfc/8lc9cM4oKfdTpY25itkZTSd6WuQmguCX5r7XSEU9Oomlk5OMvdLGkGSRNQcsoA== 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/ Reviewed-by: Lorenzo Stoakes Suggested-by: Linus Torvalds Signed-off-by: Joel Fernandes (Google) Acked-by: Michal Hocko --- mm/mremap.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/mm/mremap.c b/mm/mremap.c index 11e06e4ab33b..1011326b7b80 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -489,6 +489,53 @@ static bool move_pgt_entry(enum pgt_entry entry, 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, vma->vm_start) == 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 Sun Sep 3 15:13:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13373277 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 BB698C83F2D for ; Sun, 3 Sep 2023 15:19:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 469E3280018; Sun, 3 Sep 2023 11:19:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F2C1280017; Sun, 3 Sep 2023 11:19:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26C5A280018; Sun, 3 Sep 2023 11:19:53 -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 13C72280017 for ; Sun, 3 Sep 2023 11:19:53 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CA62E403C9 for ; Sun, 3 Sep 2023 15:19:52 +0000 (UTC) X-FDA: 81195646224.12.43B2358 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by imf28.hostedemail.com (Postfix) with ESMTP id 02DC0C0011 for ; Sun, 3 Sep 2023 15:19:50 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=DXTDoK5v; spf=pass (imf28.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.219.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=1693754391; 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=Oa7N2sPH/lilO/UwWqLMR+jDCHXNj+j722SD4+8DAS8=; b=oJs7xDZcj6Dx2TSxK3pgNOqDqW/4EUu1ppCZx9vyDJlzFILdkMPl3qF5M9Ie5O2nckdeSx KcrPGSh79nyjFdFVHHg4UnUR7/vZcJRkFAtXqMnEa8WuQ4+VoGoELPVEkLmOq9wELvaYsE GggJWGPO4hCwqWFr6bfT2WLQtNNLFLk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=DXTDoK5v; spf=pass (imf28.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.219.44 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693754391; a=rsa-sha256; cv=none; b=6Z+nwpAq4cS9ZelYuDbm/U0Jr4+pyc0h9bRSpFfQpOIUdtq2YkS3+WkTOxSJrHg3NM3w1j rOv6JgVD9qDvtxfIGsZFWo+jqfr/hN9eHcXgHOL/skh4wzsscoEtohsQbBCYlPRDknUN7n 0l2oB2SR9nGhpkzORMWphh/ar4W62ig= Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-64f3ad95ec0so4644206d6.1 for ; Sun, 03 Sep 2023 08:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754390; x=1694359190; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Oa7N2sPH/lilO/UwWqLMR+jDCHXNj+j722SD4+8DAS8=; b=DXTDoK5vTLfeVTZ1FXWPrq1qSc3T/7BI86TXuDl92scS39yR3o6rPonl4mZMSboFYw 0RkjWRrWXq03J6a7qKgLvC47bZ0VTyRc/pez7ZgPTy8T3aeMecuiXx0eRZrYQRdgU7vv vpwQNW5UgWAJUNvrgaHs0duFQ5AeR8dMv8ZfE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754390; x=1694359190; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Oa7N2sPH/lilO/UwWqLMR+jDCHXNj+j722SD4+8DAS8=; b=X01/19zUaLNG2rDJZIzfAdcg8c6/iEtpaGPEqNa9qntU16NC8QDWUJSwoqxNG84J9D l8+1q2Uo9oUt9yKyVZanPr6dITy6qyUVbGh3gJ6N2yAd+9ZfhNs9d6eZXvNCOIu3J0E3 QDcsS3Zc3Aae6q3OSPsJqQ/H3SUUyGrmm2byqU1K9FUfvu7sOU5VeUAmor3aKJAkUXOq L3hhk0A6QQiw8aeEI2c50Bx3SnsRl3MyVJHSwC6BKV6YBukmowodDVN+h+z8GcfNU/rp GrI+HpDLog1bQuU9jty636Q3xBglAJXuC6zg2C/QybrKOsdzFPBZ0PaPgPJSidmsixWB f7nw== X-Gm-Message-State: AOJu0Yz5CGDf5k8skclujIqTF/JV1/vchTVJ6U3OwMnuJKmWKfD3UtTF QA0cV8p+sAJbnGE7tfVRZv4Q2yAf7rETYrP0MP8= X-Google-Smtp-Source: AGHT+IGTBN7+8BUOuxu3HzD4jDZmr/y5lg4NupMcQKdCe0g07b+paLWsn6FtLb2h4fhMmD0ruozikg== X-Received: by 2002:a05:6602:210b:b0:787:169a:927 with SMTP id x11-20020a056602210b00b00787169a0927mr8408605iox.20.1693754018437; Sun, 03 Sep 2023 08:13:38 -0700 (PDT) Received: from joelboxx5.corp.google.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id f5-20020a6b5105000000b007835a305f61sm2605897iob.36.2023.09.03.08.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:37 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v6 2/7] mm/mremap: Allow moves within the same VMA for stack moves Date: Sun, 3 Sep 2023 15:13:23 +0000 Message-ID: <20230903151328.2981432-3-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog In-Reply-To: <20230903151328.2981432-1-joel@joelfernandes.org> References: <20230903151328.2981432-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 02DC0C0011 X-Rspam-User: X-Stat-Signature: fhuymdhmwqay3q5d8jhgaq18at7st5xm X-Rspamd-Server: rspam01 X-HE-Tag: 1693754390-681904 X-HE-Meta: U2FsdGVkX18OLdIL/aynI05PWYvAKJFaBfJbut6oQ0o7+SN9tDS3jIKgUE8bWx+/4VzgRqmcAPm3L3CuTIxAbs2WQvOXcPqnTx9OW0GbjSJRNcnCOnkh5z4ygw2oilWAYzCp1gT3Iqb+eyHM2xKa52l2qeSes2tIWcCleOVG4TLl9z4s7MnI9wq6puJmA7Yc4bC2QxZH9dK8bqoVlHnIHVYCfeMA6aObTyoyvQedZ4kOP033amMqxR+a5YAJcIhb1drag9sk/UJWK4y7H0OAwYGAON4L+88SxiRMPS3OHMpDlPQ5eNxIZ1rkki3QXPk6S/ZXrnf4Tka09qwTX3+QiedGLVt13wszTFsnNzJfw5zPweXPoPVT/iNJAgyZ5JOYv2M8iecO05ydWdzJ8K2nGIU1E54yk1UtAgghFI2JkpcyOamqqHeft6LEzVNXEroJHh40rBGYDaGFhCqqfoqGmgsneJeGaW40NNb/WlGRynZW/tz1wUPZMfBc8xig93GVQyHMQbGXx4MqqKjXI3AR22+SLxFYn6i+wbb1yHD8E8lOhdBkAq0llcde+02hagZ4IRd64ywQHLEmIkAfnTDQUv/K5XCLkB8RFyZjdEl1bv+/VdLte+e1BPGTqx09iqi56XIym5uOcMKuJ/ei4pv17/b2pIilq/jztIlBmrx7ifleVaJttMMyXhCd9fEXmm/JhzPOFxA6OFzBUSV02jgSGinUDSVSQnvOiMRDzXoqJFdKLzUzTHyBc8NcMksr9El9Blgqhu8wfE0t0GycpIbEbwItCMEVRpcXIwQ0DT3fsPMOdm22tgp7QEZpmOmS9dDYdUFKU44clo16c1oQcJdZliBy1TqMVfwAmH8au5DoFqJGiKuHpFEMf7l0iElWxhiDi8XVrU/KdULD2p/FLctgb6CwRZrbgYNvBNvQ7bAo5xwxMr+bXSD5wvVIwqtaKA58f2P2luQMHa4C1MOb5gu n/HFX7fF sc46guc59PY8wxCzGX/U0avO98w4NbhcZbqmqeg4R4wCs9mMXD/ClmkHPNfllN6S3a1Ry1C2rqpFDqxXQoiT4Pk149JrZeh17jldG82I9WS8BH9EGrXh85hby7JSzE3cmX2MMbHMzOhPgq4RahKU7pPfXeeKKX4S+n4RMxtDBB/0AJql6ML+vep5z/R65eMIPLPjS5ReqnUbcVhB/cUiBGOBjDmrMU32sTXWPbdtb8vx2fAxaoEjUyCWBU8j8YHvKmxDE60v1/ItaPrZvXoi66owddkhiNHIjHH/9u6dpHxDkqiIp1rVoMVUlU90AzYM+gDUUJQzfqV/td7AJDLGNUL6B7gsDhln8vSkCR0l3FulUOa/ZJBV2zdsiwRl97PIY5l4IeXD/1rEjGeq9+eOdWp/NUg== 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 mremap alignment optimization. In the regular non-stack mremap case, we cannot allow any such moves as will end up destroying some part of the mapping (either the source of the move, or part of the existing mapping). So just avoid it for stack moves. Signed-off-by: Joel Fernandes (Google) Reviewed-by: Lorenzo Stoakes Acked-by: Michal Hocko --- fs/exec.c | 2 +- include/linux/mm.h | 2 +- mm/mremap.c | 33 +++++++++++++++++++-------------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index 1a827d55ba94..244925307958 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -712,7 +712,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) * process cleanup to remove whatever mess we made. */ if (length != 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 1011326b7b80..2b51f8b7cad8 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,9 +505,13 @@ static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_ali * of the corresponding VMA, we can't align down or we will destroy part * of the current mapping. */ - if (vma->vm_start != addr_to_align) + if (!for_stack && vma->vm_start != addr_to_align) return false; + /* In the stack case we explicitly permit in-VMA alignment. */ + if (for_stack && addr_masked >= vma->vm_start) + return true; + /* * Make sure the realignment doesn't cause the address to fall on an * existing mapping. @@ -517,7 +522,7 @@ static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_ali /* Opportunistically realign to specified boundary for faster copy. */ static void try_realign_addr(unsigned long *old_addr, struct vm_area_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 +533,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 +544,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 +564,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 +713,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 +727,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 Sun Sep 3 15:13:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13373272 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 BE703C83F2D for ; Sun, 3 Sep 2023 15:13:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B40B8D0002; Sun, 3 Sep 2023 11:13:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 463D6280012; Sun, 3 Sep 2023 11:13:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 304328D0021; Sun, 3 Sep 2023 11:13:42 -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 2035F8D0002 for ; Sun, 3 Sep 2023 11:13:42 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E9E11C04CB for ; Sun, 3 Sep 2023 15:13:41 +0000 (UTC) X-FDA: 81195630642.25.4544D8D Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) by imf28.hostedemail.com (Postfix) with ESMTP id 1E2F0C0021 for ; Sun, 3 Sep 2023 15:13:39 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=ZqKDtTD4; spf=pass (imf28.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.52 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=1693754020; 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=CgAxpZm73/WsgHgaKL7ACBPFmNc1ioV85z5utVL8UIg=; b=dIrjqB21htGhebcqtcx4lJOy6sLBa7BquCoKJNM/FhBE4iREyM12OITXzlFhjPsZiR1KUC tS8BhNDBH9CZuZtkSCMoqEof3X5w8wwRWkSk8ZviyYhB4H+yLnKiC/C/Pp5l7AjvZyU18d AQQ/bDDuQaGr3g3GLuJb2jcQwUjI7+c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693754020; a=rsa-sha256; cv=none; b=Ce7gKjw/YwALiopmUb4pD8yPwRtg9vGMRa7JglHrHNx6Wi88uZg4Eth2YCRodBOYdLRx7w gpV1wnQ3RnV3mm8wGVLBKy/T1Ey0KEpAnWkXpkX73VrCV6fz4adPkX95sTaP3HyIpqs2Oj Uav+8N1WLNAuf0npM1cgeeZ1r5HF7EI= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=ZqKDtTD4; spf=pass (imf28.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.52 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none Received: by mail-io1-f52.google.com with SMTP id ca18e2360f4ac-79275d86bc3so33157339f.0 for ; Sun, 03 Sep 2023 08:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754019; x=1694358819; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CgAxpZm73/WsgHgaKL7ACBPFmNc1ioV85z5utVL8UIg=; b=ZqKDtTD40CIqBsaaWSrzhadNVXWATroQFHRhrj00z+ZgLpirri8UxZUri5APc5tM5h tX33U6O/Nkb71TDAQlDeHgiwR5Hkt940v9X5jruFHrRVQ0qDNoWjapaDEd95m9VG6jMd poQJ+1L582dOhb7n/SVHFsQ1mM9SFNGhKmWVM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754019; x=1694358819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CgAxpZm73/WsgHgaKL7ACBPFmNc1ioV85z5utVL8UIg=; b=ibxuKYPzC1O6Fu8yOfkIpSQT8suUGf3o1+VbXRTZGkUULSzIYHbovAHplpekY+NU/D MSblnnkvDZxNjkKxpHe7xAX6rfCrmJToQ7J1A8Rcf3oiGEhe3yn9UPYGiVGQMXZH6lr6 GsUJ5Im0SiALsCbvvwlScT/Wgj+imix3pWjqHU4A/yl8lBWva20f/SeyyzNd3a014YPS 5t3gEzhDQzXwYzWxZXsQKQOH+A5e2GG01WtE67iAncmSvRDj5VnCeVImIMraa4hoGZNS F5zu/AIkHCHgwdR6prRXk12zh7rhWzahtMRpPT7OA+V5WgrI5Ig9IzRmjBqPOyqcQF5o +ekA== X-Gm-Message-State: AOJu0YwddYCT7EtsZLjOkEjpeAlKjuqJPCUp2vcejjr7RQMbwoEJczga /rngXDwOiAFKOAGvMD46yB6AI9/SqaVr8rb03uc= X-Google-Smtp-Source: AGHT+IGK6R6X5iL9c9EiJjuyIOAcTh4DFWseDeYLr9pYLtkVVy11PWLKEcH+AWQJ5HZZkLqaClZ+hQ== X-Received: by 2002:a5d:89d7:0:b0:790:a073:f122 with SMTP id a23-20020a5d89d7000000b00790a073f122mr8739172iot.2.1693754019346; Sun, 03 Sep 2023 08:13:39 -0700 (PDT) Received: from joelboxx5.corp.google.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id f5-20020a6b5105000000b007835a305f61sm2605897iob.36.2023.09.03.08.13.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:38 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Lorenzo Stoakes , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v6 3/7] selftests: mm: Fix failure case when new remap region was not found Date: Sun, 3 Sep 2023 15:13:24 +0000 Message-ID: <20230903151328.2981432-4-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog In-Reply-To: <20230903151328.2981432-1-joel@joelfernandes.org> References: <20230903151328.2981432-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1E2F0C0021 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: k5jje18pnojuckred1ynxw39eqnt3m7e X-HE-Tag: 1693754019-129144 X-HE-Meta: U2FsdGVkX18sTCvQgm855A8QBDyQvEpQQ6XGiGbOYPiSAcdEPLzc9Kud1PHcz6wFSS9aEpMDxFZIe6oTA/a9CTyDYQQqpnK9f/otYu8RLcGmQp9JzFQX4RmF5+QG06dOKcCwVLA0C6jIYmX5KjoryitfD+HZpCa0eWCk29K8JII8loNt05CH/84R7Z2qghFxaBIf9vBaZwz9wPTgdm/Pxr+IY6WP4ERnaT+HmZABwhgtN/NA/0447wV3sqvIqCtd9mWTRbZ+XoQXWRFxrlvPmLmJ3HmuG99PhFSp0XZnWp3OgAVvo7XiGuhkXQ5zrFw8G7gHPysKHmSMBJX+Eb6O8fu8c4HbIBzncrZfeOK9eYDJhVI43OYgofIFcgUcScf2VBaBaBV6m1LWG6FGtgPt5YrdWf7czYjPrDsM0E4+NfP2JRw3pDCbEYUwH+6kzCR3gCnFPYl2yII+jpbW/CoKidszDRUp1TA1/3wio5XG/cAky2FwMXDy78/HAi/rJGv6B8xrX3VfRXrA+F6Rgu5lJpmRvERF/Yu8C7yU/v+bJiiN/wKqtEPqMim8k3uzAt1ZkftWYTt1ZNDc6Ed0MpgEPAQXFDD0sErW9bJHCj7lrRHKWPjOQSB2ulh0UdlAVmcXsSJ0kfqd+qxD2211KZJcBDKrQHck9FfD1eCPmsZvD/g26NmGDnb7CjHC99LvTe0khZUz/jzYQUaBzsjpLDbXBd/l0JoJnkSBkoJgk1C3w7FoxBV1yYIma7QXAHJsB6YaeCjhkfrK1xgVl/BrKmnYzxZNztZcacNND2T4w4DuKRhWv9FnuUCYcRT4p589Q22l0M6VCCJuL97Yh2xUL2/IWkx2BDNabyGJiU0H9JDC3U1iXAM+0OvzegLJeN9guWjyhdf0//uLpm/VCmMzZSagCQNuet7734lEykjNyNuV7IjXcDdzL/OnnPNVy6fbvKv35cFwwAnWNZIG5RUH97i ua7rS07/ IXGgeyasKnuEeEM2JqShNWGa2PsSob/vLfeUF1snDsPU0jXI6O7jk3yn14tuefWZ3Jqv0Rvn85IzzaYDEqG72Mg1TKG1kjlx3xUflZuHqj0Oe4f/HSOj+MMs/P1CrS2LficcyjpOpBroPMBcp2eFIutZoYH7EeMGk0psO9Q/Ghz3eE+ofRBKncGYy7YXlQLD0vZeTQnkqgxT+Rtlu5X93lm6KrTK/sPqjJjdz4wtx7pLq7RNoLJECmjfOsFyjGgNRgJiVQS3+nVFfZJWCuinWiYzwg41oult/KytYEpu/abzLuTSGvQ/NKjLucUtBe+cb2y6ICF+lGJuysu2XsWRdKKgZtN9PcPRnJ4XDoTZfhaiXCbec3yizd17+UGHUBrLIf/nkBq+3I6IZ7CF7EK2XsOTs4Bpn+4uS6W12fQ6x2aIYexf8g9Y7xmZiI1m83EbvIM5r 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: When a valid remap region could not be found, the source mapping is not cleaned up. Fix the goto statement such that the clean up happens. Reviewed-by: Lorenzo Stoakes Signed-off-by: Joel Fernandes (Google) --- 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 Sun Sep 3 15:13:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13373273 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 6614CCA0FE9 for ; Sun, 3 Sep 2023 15:13:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32CC2280013; Sun, 3 Sep 2023 11:13:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 30412280012; Sun, 3 Sep 2023 11:13:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A48F280013; Sun, 3 Sep 2023 11:13:43 -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 05231280012 for ; Sun, 3 Sep 2023 11:13:43 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CB2A7404B1 for ; Sun, 3 Sep 2023 15:13:42 +0000 (UTC) X-FDA: 81195630684.16.208EBA2 Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by imf29.hostedemail.com (Postfix) with ESMTP id 0C27512000E for ; Sun, 3 Sep 2023 15:13:40 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=LwN1aYr4; spf=pass (imf29.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.51 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=1693754021; 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=3i4JKzyyHPJXK5xbz9I2FYDU9mp4fFQ0BqGZeRR+IkI=; b=ZzD/1YTa8X76wJtPg0PKZ+Zmbk9vTt8O2oUSYBs6ED01NxRcvg2jI3Osu1iYQURZepc50j rCMHtZZGBmYNxMclpYPMnE161aAzuckulIDPH/UmMfHQ1T31aD3dR15PWzNaAHhehVTXCc 9N1D0ngE6uDPwycF9l7b1PAHBpvtIaQ= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=LwN1aYr4; spf=pass (imf29.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.51 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693754021; a=rsa-sha256; cv=none; b=ochvZaqzEjNha6IqSSKnFV8F4aRkFsWI42Q7UuLUhl8VxeM+SEjVToM8YQYKlTuVCKY6f+ OjXyVShyOzRP+lJrk4Nf3/84BQi7dZnSzRSV/AW54UX3O2qV0bV810CRRHLEqaj3enB7aH NU/qiZIpVycFNJc6vYAfkQLNw6+UnD0= Received: by mail-io1-f51.google.com with SMTP id ca18e2360f4ac-7928ba24936so18811939f.0 for ; Sun, 03 Sep 2023 08:13:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754020; x=1694358820; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3i4JKzyyHPJXK5xbz9I2FYDU9mp4fFQ0BqGZeRR+IkI=; b=LwN1aYr46E+gQtet8Qxr/ZpVakSoCubM820PK+50D4Tk64m4iJtpWAL2aQEQo8jeas JyKXOvB2v0z/aggt3xqeg+9srtPqbk0zGihZ9akgAVrrVRlqXW4cD8fGYZdfE94ziOxU TzWufDJcj6ei+swYOpPUdcx39+PDV9CvhyE/k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754020; x=1694358820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3i4JKzyyHPJXK5xbz9I2FYDU9mp4fFQ0BqGZeRR+IkI=; b=BJywdDzhCOZDOwtUwvk02T2RxlwPeg1jGZbAbJaf+953oDDsMpBTWT0ynTlXmzj5wK /gV0yTe5xgNePCaGBa38xEtaaOM+4HO00taQf0LVDbOvUYqjAOGhPN8WWAUoExxGHBv+ qgynT9VyghFCFf0Qc+Ka1JIy0LglnBi7Rz/LPko9SCR7vsr1x8EOF64OBeYiXWskKJ1V MazzYtdgJxAYSwsNnD5OTzRTKSur1ae3GtjIfa/69srHEzFl6Yg+cBHo20eL4xBbJGBV SuMVcPHWua/WDRxCAYJINDzqRc1r8+QVPvg3eGkn+lMvmUXI2AcMfciZdmPxymXzwkLM bdjQ== X-Gm-Message-State: AOJu0YypwJtffgKWCfs8N968dUPra17LUPU7xqINdNf4CjJDEm/r2y0M mLaLZvKJSFF0c339PAlkzMNmZg== X-Google-Smtp-Source: AGHT+IHONBzFDHNEJj9fUdFbCOcAZGQgCkRLbDItObOX2Jewvf4Oe2vlmaZIITxIM+/izWF1P0j3xg== X-Received: by 2002:a5e:aa0a:0:b0:792:4d29:ecc7 with SMTP id s10-20020a5eaa0a000000b007924d29ecc7mr7910869ioe.15.1693754020233; Sun, 03 Sep 2023 08:13:40 -0700 (PDT) Received: from joelboxx5.corp.google.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id f5-20020a6b5105000000b007835a305f61sm2605897iob.36.2023.09.03.08.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:39 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Lorenzo Stoakes , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v6 4/7] selftests: mm: Add a test for mutually aligned moves > PMD size Date: Sun, 3 Sep 2023 15:13:25 +0000 Message-ID: <20230903151328.2981432-5-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog In-Reply-To: <20230903151328.2981432-1-joel@joelfernandes.org> References: <20230903151328.2981432-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0C27512000E X-Rspam-User: X-Stat-Signature: g74aomqhadcbk4u66brh1yph6g1xnap9 X-Rspamd-Server: rspam01 X-HE-Tag: 1693754020-633795 X-HE-Meta: U2FsdGVkX1/oh9FTDyT+4XoeRqs25sgJDpkXGTr4GNPotikj4eSk28ESZQMsuvd1gT5i0bXsWuq+jHbkejYrHgYVKnjwIMCZ6XkD7zvQjtxmthDcgeEaAajtQ9p9TgpoR2d5bnp45qkhCgcAZTpek5EHUw+caM2dfzFWm6iIw97MEZ/kPQN2HUOpq951RNx+lGXwWCcI6jPHHuPHu7CKrmnbXGUtDiVFjZyobXCyLnQzGlsTT3VUD1FMoHUGoa99iXFT8IZ3zQiriqwabigIBWnIr8eKJw6+zvCW29BL6P/gIrhAH+NY+xrSbTK+UB5kR9VBwVUFyrBfQMNT1J/mwb4I6JaMbNKjbWi2lKBbgFldAKEP2QxkXtoEceatcUKlijFU5CgWwmmxycik3IfoEHBshFxbOIs2GhMPNDVUCwrSnkacSi1mZ4E8eXeYsHg5udgnKjYnGq0JEH3wVU2vXZOm3jkAsCIYj4Z8lhh5xFrAIBj9jL/o28q7WMZ5AEAl0TO/CNSMQZwFmxWdqYgGES9pj7ujSYqlqgjhsFmngUrq1J8Dx/cTQt8K9OZhFipUiJkkyG8wg5CPuDDII6xpbRR8tCAWco0e3zVgc2kNnC1aIwAK3/y9sfT45hYTkY0byvaKuNHLnLcw9TTkSrHeliPjPNMgekWrbg06tazD6igLGVKVAnLM9gDOd9It90diqmUjpCcA6qXc4UR89toiAUTXvAs/Iuqc7S12Pa2euYXmrvS9RhsWEvSCUqTVqWMRZYZJ3X/MN/UZg2871bsfkWvMyXV4i0C0dTuBZb9tV/A+WojCgzXDCPWDrseqR5Jpr9QlfZxRdvm5wwIYIPtTX0paxkkZGTpcBJ4r7mHc8Zdu3U3JTTgh3NaLE2EE/OKAHFW+MFvD1paQLMl88DOJ9iJoL4NH+G4UucwrSXqSo0GzAPrXR57FZpVeLLJGp02nz4EwOVw3lrnRLwNolP0 SJvaH5qm girSdaYuEN3IC3qu3b2UdHkQ5ed8AlKIUoEkJkpVAOXneFwnAgYOlr7Vh6OaipSsGkNb8DZPO6Gqw1uc5ytQB8Hb7hMDgC6OgaDTqA+QWTlPwql5VmmiZIoxWEaAucAFnGszm4RDvmrZjOuiDaGzSJmdZIals+OCciwICmXgKFVn5z9Ebs4JZpl1Jntdvu+ISRPdWkk1Mtfl0kcvQ9CnR1JTd0bBZ/51kS1w8NYPq1oQNkLtvoE4po8AFX3832LXWK3DkxgcIYF3IJoAkf1l5s7zPfhzBsCj9efpz5/UJ7LppVd/Gy9/lbi/63TGkb6n9xb4bLdyx5QPMM3sJRdk4GY/cjhSY5J6YVePMyc5stEjbPzIXfGGMYEHUH/EqaEEsGlbjt/ipTzVL2Yn9gQBzEmfcZp/JqFBPE4E7E8h9MChhSaE= 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. Reviewed-by: Lorenzo Stoakes Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 6822d657f589..6304eb0947a3 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -44,6 +44,7 @@ enum { _1MB = 1ULL << 20, _2MB = 2ULL << 20, _4MB = 4ULL << 20, + _5MB = 5ULL << 20, _1GB = 1ULL << 30, _2GB = 2ULL << 30, PMD = _2MB, @@ -235,6 +236,11 @@ static void *get_source_mapping(struct config c) unsigned long long mmap_min_addr; mmap_min_addr = get_mmap_min_addr(); + /* + * For some tests, we need to not have any mappings below the + * source mapping. Add some headroom to mmap_min_addr for this. + */ + mmap_min_addr += 10 * _4MB; retry: addr += c.src_alignment; @@ -434,7 +440,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb, return 0; } -#define MAX_TEST 13 +#define MAX_TEST 14 #define MAX_PERF_TEST 3 int main(int argc, char **argv) { @@ -500,6 +506,10 @@ int main(int argc, char **argv) test_cases[12] = MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, "2GB mremap - Source PUD-aligned, Destination PUD-aligned"); + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /* From patchwork Sun Sep 3 15:13:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13373274 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 28FD7CA0FE3 for ; Sun, 3 Sep 2023 15:13:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B7CE280014; Sun, 3 Sep 2023 11:13:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 26704280012; Sun, 3 Sep 2023 11:13:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E1D8280014; Sun, 3 Sep 2023 11:13:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id EF380280012 for ; Sun, 3 Sep 2023 11:13:43 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C0D41C04B9 for ; Sun, 3 Sep 2023 15:13:43 +0000 (UTC) X-FDA: 81195630726.07.7ACB72C Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by imf28.hostedemail.com (Postfix) with ESMTP id E4F2DC000D for ; Sun, 3 Sep 2023 15:13:41 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=PJR6zLBt; spf=pass (imf28.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.51 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=1693754021; 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=+BMtnhYdeu/zB56jX4tl+3iW5OG7Lep/G1Bzlyk4Cto=; b=jVn1v748hT4huRRLS+3f1jji0E/1lPT9ZQoYrNQwSS83vmR1Ix+4VOB8iq8+YqVH0LgdoC mxfastjWV3lruBUnD6WLy8skJq++ucoxKgbhwItANK5XDwt18qzDkEc9djpw9v1K2y60gd GLvPhKs3Mt5/lKIqshO3SOtk2qjvs+8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693754021; a=rsa-sha256; cv=none; b=1R9raHf6fqMdZqqMvmlh7Xcn141DpparXOf1X2Vwzrusg5DQDw+bWg8mIEhh0KeFFXCaJz goNtVK9YwtdeDbrHU7S7FyiueklgACZeXH7uGCJPHDyUr20V5tn/+ywbdvM5xZFJUg0xBC Qx0DyoMJ9wzRsIITN5DaQdsXmCA3JMs= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=PJR6zLBt; spf=pass (imf28.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.51 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none Received: by mail-io1-f51.google.com with SMTP id ca18e2360f4ac-77a62a84855so30043839f.1 for ; Sun, 03 Sep 2023 08:13:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754021; x=1694358821; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+BMtnhYdeu/zB56jX4tl+3iW5OG7Lep/G1Bzlyk4Cto=; b=PJR6zLBtHETgcjJCDh6NMoOddO6nOkjrwFLN5uWok3x+pdeSLVty1veSD9ahbH+qHG qtd13eV9LlsWgs4KQI9+UajAV0vHoHCI9GsV2/2R4KYn1ItOS7ZkI5ZsI6IlInKW8Rhk 6cO++8A82BAekG34NwNroHPnimRkJc15RGBls= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754021; x=1694358821; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+BMtnhYdeu/zB56jX4tl+3iW5OG7Lep/G1Bzlyk4Cto=; b=hWsADIVeRD26gccMFMBiuCyLX7FZfNoY96+ePQ9+rNH0bB0h8argmTzXMsqg8pWjor 1ybHoeMjyPE5mBdXJzl+5k4UdQBthrZuJH2vEcO14lCybWkaqLChrbbpzjfUzuj9z9Hv s96fD0A+Df6ofRkc+qBdykRzFnNqf9Nttf7LCpC7skW4KrcVXRw0F/g+NMJfu73N2x+F 3bm5hudi/XuE3pq20WtQaus3F8ivZSmNEQyn0AYsye62Yhdc8sjDIsmJ0oFGkyRm4Av9 8fScTH1txrRI/hC3E1Ik50U69iqR9yA4+8gUrDpKpg7SBV0HXmgnD0sTNr3b5rV4Cu3e d9VQ== X-Gm-Message-State: AOJu0YyO9WLhm8+AmVB0Y5nrq3mjsgF5/LF20XxUJ3IfoR/niSr+Cm7X QOTTFggYnarYTq2Gf9My8aRu0A== X-Google-Smtp-Source: AGHT+IGoiNLSWXDDcRwa+CUKmoRj1KyKVnC5w9SpA0dWyRbwniu1q3CeYE3pp5OaUl5HGdBBsO8atw== X-Received: by 2002:a6b:f104:0:b0:795:1a7c:486f with SMTP id e4-20020a6bf104000000b007951a7c486fmr8841640iog.14.1693754021116; Sun, 03 Sep 2023 08:13:41 -0700 (PDT) Received: from joelboxx5.corp.google.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id f5-20020a6b5105000000b007835a305f61sm2605897iob.36.2023.09.03.08.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:40 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Lorenzo Stoakes , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v6 5/7] selftests: mm: Add a test for remapping to area immediately after existing mapping Date: Sun, 3 Sep 2023 15:13:26 +0000 Message-ID: <20230903151328.2981432-6-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog In-Reply-To: <20230903151328.2981432-1-joel@joelfernandes.org> References: <20230903151328.2981432-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Stat-Signature: 9uibotwr164yf1ikuzbqcnri3ckqotxx X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: E4F2DC000D X-Rspam-User: X-HE-Tag: 1693754021-110043 X-HE-Meta: U2FsdGVkX19uLOGsU52Ny0ynH9SnYsO9+cb8hjwLDLXVtvvNfvGM+pwHrQMYbDoiBP8ox2G8JVzT6RwBdMNcPflDc8HAQpPm8CCTf6PJcv4mJcBBmAkOD4bA5OM+5Q1XYRilqvBHW/MkAhtFPp/Y/eXwkALeelac4rfleA1UGHcv4SG3A7tuYaJc1WFfBYq1ePtnSr+2gmD0P98F7iAP3TjbrOulEQzL7FGv76z4WG1qhsAxU6cR1fvGXNiThJCuXiF9ST+vfUTHCk/8IhAt5WdPQZEM6VmVxK/pb71MEjC4UwU6T4GdFi77Ery4uOVaUgSsXvFKx+ll5j1EvZCm3F562KVvmpw6wyJuCSZRIW/nFyqthJQud3ee3h5mLJX1wD/+GEHfBXGI/RS/xkNgpwgXWuaTivPLUJSjluG/HKG3soBqbB/AGxXCkIcrnRUHsAwuUOhme9a2Lan1PDOlhwGL+JGF3l7y3UCHhZJIMyrYxiPWbygTFKTkrX/mp6CZTvCdx4kyJIEx1f1oJ6oOc581WRde0lzFSSAXzyFKbz5ZkCMBtFSoN6YfBG5PV07rv/DrH5ZcJFGMNQiho/WKB0x2tGENMKkFnAqIobW6Q3W17lkfAzQt0fUOs/UUSYHYMFiFVNgnATpGBEUhHQyiFgHw3esObP5eyL12XdOiERXxj5QGfLZU79cl308pxvw1jvH9Rt84mHcmMlY8VTD533ajga1bhdoKzP8yBwVWUjxlRnNwhx9j0AvYIdBrlSCN32v1hII/W49p88W3pNV4F4QprSQTRaDbjcZMGpvWydtuqS82v4qdlVc/hlsnjmNlrLnNQsxueOqstl4F/1NqVPRENCQvJHIjUt0zsN01l155kJqxXqCjYvTVOYciqBwXd+YFjQiI7Ejl/9DSVvWGWNpnJnZjUUrHmEfffJObICeWxS/yAqIpruKfiX7TeaeGweZ+nHDZ1viOFYX9CKt nY/gFf4M nIDvH5SfscOpqbSlAlpIc2pyJPX1XTnDByKN4AugJ5GCneuQy3xPpAooIppKKc2dJ3n1xQDcsmCuvg1Afc4AjFtxM9XOYlBd5eZUIfjZhbthBvejLe+1BRpkhMUWVIIF/pjYZ8W4x3EE9xpOqDXvhq3KgBPdX7oLrKVC1h6ryqycVPOrQ1cUxiZe/HFL+eA7cnz59z+MVMMU+tuIhh1lCfL0eSla5oT21YCIbC0JhouhnM/q7eoiLcwlVd53JkGiBc7PATcWrxpO76eZ+CrF+fugd2nDuN+tTA/yqxTQOJ1vjYJNu+YOZ4Qelle9GP/P7vcw0xmkj+JLh8Iexdmf5uBvTyLCI0JkEAUuRaZP+1itqMAuqQBB4i0LC1SIy30J7n3jildJq2t9KlTlcTma13/Y+tldXbagxEuzsghQNggGyF1FQO7XDZVNaKycurX/DsYjZcJn3ntNrr0HEozPL9HpyRzgfPDsW3YjMEGuAuexoOcV7Ru4XIWs17w== 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 Reviewed-by: Lorenzo Stoakes Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 57 +++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 6304eb0947a3..d7366074e2a8 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -29,6 +29,7 @@ struct config { unsigned long long dest_alignment; unsigned long long region_size; int overlapping; + int dest_preamble_size; }; struct test { @@ -283,7 +284,7 @@ static void *get_source_mapping(struct config c) static long long remap_region(struct config c, unsigned int threshold_mb, char pattern_seed) { - void *addr, *src_addr, *dest_addr; + void *addr, *src_addr, *dest_addr, *dest_preamble_addr; unsigned long long i; struct timespec t_start = {0, 0}, t_end = {0, 0}; long long start_ns, end_ns, align_mask, ret, offset; @@ -300,7 +301,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, goto out; } - /* Set byte pattern */ + /* Set byte pattern for source block. */ srand(pattern_seed); for (i = 0; i < threshold; i++) memset((char *) src_addr + i, (char) rand(), 1); @@ -312,6 +313,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr = (void *) (((unsigned long long) src_addr + c.region_size + offset) & align_mask); + /* Remap after the destination block preamble. */ + addr += c.dest_preamble_size; + /* See comment in get_source_mapping() */ if (!((unsigned long long) addr & c.dest_alignment)) addr = (void *) ((unsigned long long) addr | c.dest_alignment); @@ -327,6 +331,24 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr += c.dest_alignment; } + if (c.dest_preamble_size) { + dest_preamble_addr = mmap((void *) addr - c.dest_preamble_size, c.dest_preamble_size, + PROT_READ | PROT_WRITE, + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); + if (dest_preamble_addr == MAP_FAILED) { + ksft_print_msg("Failed to map dest preamble region: %s\n", + strerror(errno)); + ret = -1; + goto clean_up_src; + } + + /* Set byte pattern for the dest preamble block. */ + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) + memset((char *) dest_preamble_addr + i, (char) rand(), 1); + } + clock_gettime(CLOCK_MONOTONIC, &t_start); dest_addr = mremap(src_addr, c.region_size, c.region_size, MREMAP_MAYMOVE|MREMAP_FIXED, (char *) addr); @@ -335,7 +357,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, if (dest_addr == MAP_FAILED) { ksft_print_msg("mremap failed: %s\n", strerror(errno)); ret = -1; - goto clean_up_src; + goto clean_up_dest_preamble; } /* Verify byte pattern after remapping */ @@ -353,6 +375,23 @@ static long long remap_region(struct config c, unsigned int threshold_mb, } } + /* Verify the dest preamble byte pattern after remapping */ + if (c.dest_preamble_size) { + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) { + char c = (char) rand(); + + if (((char *) dest_preamble_addr)[i] != c) { + ksft_print_msg("Preamble data after remap doesn't match at offset %d\n", + i); + ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, + ((char *) dest_preamble_addr)[i] & 0xff); + ret = -1; + goto clean_up_dest; + } + } + } + start_ns = t_start.tv_sec * NS_PER_SEC + t_start.tv_nsec; end_ns = t_end.tv_sec * NS_PER_SEC + t_end.tv_nsec; ret = end_ns - start_ns; @@ -365,6 +404,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, */ clean_up_dest: munmap(dest_addr, c.region_size); +clean_up_dest_preamble: + if (c.dest_preamble_size && dest_preamble_addr) + munmap(dest_preamble_addr, c.dest_preamble_size); clean_up_src: munmap(src_addr, c.region_size); out: @@ -440,7 +482,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb, return 0; } -#define MAX_TEST 14 +#define MAX_TEST 15 #define MAX_PERF_TEST 3 int main(int argc, char **argv) { @@ -449,7 +491,7 @@ int main(int argc, char **argv) unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests = 2; - struct test test_cases[MAX_TEST]; + struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; time_t t; @@ -510,6 +552,11 @@ int main(int argc, char **argv) test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[14] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Dest 1MB-aligned with 40MB Preamble"); + test_cases[14].config.dest_preamble_size = 10 * _4MB; + perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /* From patchwork Sun Sep 3 15:13:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13373276 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 7D9C7C83F2D for ; Sun, 3 Sep 2023 15:13:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3072B280016; Sun, 3 Sep 2023 11:13:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2C1D0280012; Sun, 3 Sep 2023 11:13:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0F10B280017; Sun, 3 Sep 2023 11:13:45 -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 D43C0280012 for ; Sun, 3 Sep 2023 11:13:45 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id ABB0A1604BD for ; Sun, 3 Sep 2023 15:13:45 +0000 (UTC) X-FDA: 81195630810.28.C6F2965 Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) by imf01.hostedemail.com (Postfix) with ESMTP id CA85E40017 for ; Sun, 3 Sep 2023 15:13:42 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=pM6S44Vh; spf=pass (imf01.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=1693754022; 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=JBAJc+/RO3zfkzT8oQUizmToikDAYdiXUobcga/v+/I=; b=QcPji7iZ170o7dk3988xXs4AydixB4dFtVknjcrcBkzOM9VBAnD68C1SEPh9LkRRkgOqZk 64LjPufPXoNBqWra1zzKleqwg2+xDdotY3o2GSIYcgklrmsbzsK1jebgrZhFvVh6SnCf8u Z4jFAGFpaWlmpqb6MH/TvazV6IDEXIg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693754022; a=rsa-sha256; cv=none; b=8AyXorqvoTBbtWnuYSb5sMzW1J796YQif7IH4NIYRDbzpOJ7JqEqCWlmdlnKkVQYhhqr87 gKR52mDW1S4Lkp0HVe2ronBgb03tFZPR0BgyNvCdv80McppPlhsN07+oeCjV734CoC0WU/ 1DeLj97YlDQ/IOoVnRc4+38/suUZZHw= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=pM6S44Vh; spf=pass (imf01.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-77acb04309dso33397939f.2 for ; Sun, 03 Sep 2023 08:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754022; x=1694358822; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JBAJc+/RO3zfkzT8oQUizmToikDAYdiXUobcga/v+/I=; b=pM6S44Vhy+mvVJLWWQu0gVpk4oknXyvY9eE62BJZqeXUy9IH5357AH2kcMabdaL/zn g5Vama/Tvy2OQqFJtwhzjfKQVrTZti9rUYCOct6IM3GlFp60dSB/pExYbmsRxkqsTMhT GWlwTkMmqvMOBNyVm8NLOcR16fRt/Wq2v3C+4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754022; x=1694358822; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JBAJc+/RO3zfkzT8oQUizmToikDAYdiXUobcga/v+/I=; b=kqMVUyImR3NtaPWpwh2XB4uK3N7Birl3B0ewpVqWwsyIp/tG61Eg+Fv1R33oCCfynH IEGjG/btnMILS43z7CSrTOWO+VA1s0iHItB3RxX/a4A5+3EuZfPngyVanq6Gh4qVVOVw 5gPCrSh49XKRxEXCE9xkyqOVbSNlhyeLastFJjlcWKHbTVh1ZKl/xSZn5RChb65Q94xl AuZEJhTEBbRfjCzkRKZbejfoAnWOXjcfZvNtSyH3m8a6y1wF2k6m5rTotuN8oy1tgVW5 OLpzurZS95g/oV6LOLMK1c/25hXSWOraYW8B2ccJ+gCig0mz5yt0vGce30+jdYsQ/p/V aWgA== X-Gm-Message-State: AOJu0YxttG+OokC1Fy5TQpN7RjVUoMwH3xtR+xxvLsakMS5d4LemBpj0 i46fsyZ/6egiFWwld3rcSmpLGQ== X-Google-Smtp-Source: AGHT+IEnJA2vqbUSl47p66mh9CCynh4MUM2TZrhlzcxgAiU4zPqoOBOaRdFGp3Nx/rofoZWjgNCIdw== X-Received: by 2002:a6b:7218:0:b0:77e:3598:e511 with SMTP id n24-20020a6b7218000000b0077e3598e511mr9517002ioc.2.1693754022005; Sun, 03 Sep 2023 08:13:42 -0700 (PDT) Received: from joelboxx5.corp.google.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id f5-20020a6b5105000000b007835a305f61sm2605897iob.36.2023.09.03.08.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:41 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v6 6/7] selftests: mm: Add a test for remapping within a range Date: Sun, 3 Sep 2023 15:13:27 +0000 Message-ID: <20230903151328.2981432-7-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog In-Reply-To: <20230903151328.2981432-1-joel@joelfernandes.org> References: <20230903151328.2981432-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: CA85E40017 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: xonnumxojec3ecf6ipet8msfye65qhbo X-HE-Tag: 1693754022-28386 X-HE-Meta: U2FsdGVkX18+S3OTke480V8QMI+sIxS0XO7KNFKOmcGpqUNHdIGqc2qhPQbiD1Xq0AXDlChYaTV651x++Sb2yTluA8GChUEX81juhg3uMcYYRvxGuvL8fvGPFKmsL9YnGNMvVesFryson5qvp/CER+vq3DArZtCLKRX2X+VrcyAnZd69cVzU/Cm5Q8xjlLBcVuGoueqT0xnghJgJNvvKJszeyd9FpYxPquOynTEbw3ncJmDYXs6JgDeHIH/D6voBocqodjHH2VEJsrkyiAUPQG2GmWILDy1rQNzbfxK0/Tg3Lou9rDQioC99Q59sp9oP0VQYaxws/aSID5YXMbeyVZNVqUKQD49N/8MMWmpstokVKkXxK18FD9LCli3DGT5PP3lVD1uPQYFLJmM4sMUSnOy5GtRnhxcWmGmVOBi0PK5I2k0khFpeS5EzjXDjjEfPLTUctCxKRHcBNZ9a2w0uu67AA/r2CiELHUUZmLqUlgRjnVpMy6taN0hxmU79qQUupxrhyr/h++ZPbFFxHUmVCwnpkTqlnZufPDCMSrDspTLcGyPPs/LxkJw6V1R0mWaxp7h+3ds2GeCHbpFm69CXPDch1ZBW97hpT8zH4wxtj5zJek+2imZ+nUvl6VxtQCbqSSGGkKfPmUFGOg/Q+G8047/goidXqymodEvNQwYfWgF0xARCXjdXm4xuNquEBdi9ElArJRgb4mYWkQ4j+j1rqSWKnqrnIt5MyUVpPG1a7qdZkNZHk9yGDMEMn76NIfwcxRblqRvpl7v3Vsk5dJO5APLai58qhTjbVa6D4jg9s1CftGxLjve8+49J+LcvkkQyIJewBdVvrNvEk98KD1n8LSPYusG8gdPrnNcxaddMyj+8DC/k5FRinx863XKFZVFdB92okSzLC5doEFETLVh9JfyUbYqvif6EhUKzHW6L6JRaUdxvCgYxhqWrHxNmNbkheSGMsD4/TG+Zkk0M2fH QvhNXVaN MI+USuZRjmsKMtH0lRnZfSkkduIagAk5CNjarqJLsGPzft5wqbbR5fD4PGZY9bGE2ko2TW/VSkgADg0Z7WU7TM5U5EhnHt7t2Ezw4riGzCbkoVxzCueY3cP7mtUqgxs/i5cmIuNEkXlqBIYOiJG92f78Kw5crNzP8HziCoN6M/oAqaidETPz2QtXU7UdcfwKmZ2dmQ8JgemP+r+uFqGn+0Vd4wK+4EfdCs25qe2KK4r91EbGEafB+NrHAhEX8R2CwMIF2C4kpWbcN1+NhYI8QfE4QjfDzNUF7H5kWoQTMIT7mmzrujpbpDAXD4K8JUZutW1UTzMXkVimTngy0EsS7GX5dSAtxA/MNGs6sScIK0oU0kIO6Zt5pkmlJZnxcpkZHxJlFdiwd1iebRTrgkP1nZt4kRcuTGyeElkkLh193asF4A2jZ5X3a31SjmiGQoYsHXtry1+Dps/SyVR/u5vUu51trM05uQyb5ThlC 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_to_align) 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..12a095457f4c 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -23,6 +23,7 @@ #define VALIDATION_NO_THRESHOLD 0 /* Verify the entire region */ #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 20MB range which is not shown. Each + * character is 256KB below making the source and destination + * 2MB each. The lower case letters are moved (s to d) and the + * upper case letters are not moved. The below test verifies + * that the upper case S letters are not corrupted by the + * adjacent mremap. + * + * |DDDDddddSSSSssss| + */ +static void mremap_move_within_range(char pattern_seed) +{ + char *test_name = "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 Sun Sep 3 15:13:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 13373275 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 83414C83F2D for ; Sun, 3 Sep 2023 15:13:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5260280015; Sun, 3 Sep 2023 11:13:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DEB12280016; Sun, 3 Sep 2023 11:13:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB6DE280015; Sun, 3 Sep 2023 11:13:45 -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 A7BC3280012 for ; Sun, 3 Sep 2023 11:13:45 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 8378BA04A2 for ; Sun, 3 Sep 2023 15:13:45 +0000 (UTC) X-FDA: 81195630810.18.329DF41 Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) by imf08.hostedemail.com (Postfix) with ESMTP id BB918160004 for ; Sun, 3 Sep 2023 15:13:43 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=A231ZIJX; spf=pass (imf08.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.50 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=1693754023; 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=f+nqtAseasZFOdOpIwYvU1wfrPMXCZ3Zt4BE+IzJOeI=; b=3wYasARv+QExGmxPEubc/Xf8J9N/3Fs2kts8BiQDdzdNCKI8Az131trVLm+4ulV7cMAGtA 9nplm7nd/7/hHIhPJUWyZMEB4dqTGOwKZlVY7/wchfyp5NttgJuGMnGM9FJdlSrgWEFDcA BvUvwj5MCv0dVYQomPALHEVkGGTzI1Q= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693754023; a=rsa-sha256; cv=none; b=OckiAko53t4UhfokWEevSMYxTpz5IDCfMzUJkWMl5fgcQlX+fJvQKk0PU75m0rq3/QKEob sY+NyMJ1x5OSjJizue5nRgv420++dgiAwXRLhwOor2Wbj87Zd7Nd/dnxFhLst0WWGYJADk 0Y5WNQfUnq01jhFD9COwkh5TWuesFZE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=A231ZIJX; spf=pass (imf08.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.166.50 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none Received: by mail-io1-f50.google.com with SMTP id ca18e2360f4ac-7927f241772so32597739f.1 for ; Sun, 03 Sep 2023 08:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1693754023; x=1694358823; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f+nqtAseasZFOdOpIwYvU1wfrPMXCZ3Zt4BE+IzJOeI=; b=A231ZIJXm8TsYIGGaLH7Ri9HM+010274Kdso1CqH2D/evgwYMDCso1CsZm8VSksKfl xrg+q9H1+3spVwBfMpJ1p2Yf0mEVqCchpNgLfALHmXFKFTedceyRNIfc/kMA1V1mXUhQ VBV2F7q3hB+hREJtb1og+pePxICPwVbhf2HIc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693754023; x=1694358823; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f+nqtAseasZFOdOpIwYvU1wfrPMXCZ3Zt4BE+IzJOeI=; b=MhUaHQ2t46C5Cmk1EQvZZsZWrqH9PN/RtrE4L4BomSiN++as9L8s4vArQD5TU03RRS GmR7iszBqSex7hKTKgKsDmU19EyiqeySMrRokuBIEgPXlaC6JCVARY0En/rQBjj2pwil XYOkzxPhTJ50ck4iskyNOQQ314vSiWCZ5FdG5Iglxy56l+HDOJjm1CQvAhB+szsCD3o1 Z3UoA4vynRi7nxM9bK4NALp7r5rM+dTdaOG55VnorTzq8tgbQUApStaS0mW+P+coc1v3 IPAj97/GXdxaZvyRv5O3n/CxrpzBaZoNp0llw6ptD9pGNVFP5rw3u0LzT974eZM8k+AY kdvA== X-Gm-Message-State: AOJu0Yzg5nxHAD57dwHua37Pc6CdcW3U0EDBCw0GCS69AMkr3Ga1iNeh 48q9K2IX8SIDpJ99fr2TiC4Scg== X-Google-Smtp-Source: AGHT+IG0ubtl3WQP2iLAfgo/8U3Gp+Qcadj9ljmVKqqAyOzu0TCZj645xHn8dTLLCtLKiiIphITokw== X-Received: by 2002:a6b:ec16:0:b0:792:82f8:6f90 with SMTP id c22-20020a6bec16000000b0079282f86f90mr8856879ioh.16.1693754022914; Sun, 03 Sep 2023 08:13:42 -0700 (PDT) Received: from joelboxx5.corp.google.com (156.190.123.34.bc.googleusercontent.com. [34.123.190.156]) by smtp.gmail.com with ESMTPSA id f5-20020a6b5105000000b007835a305f61sm2605897iob.36.2023.09.03.08.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 08:13:42 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: Joel Fernandes , Lorenzo Stoakes , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" , Suren Baghdasaryan , Kalesh Singh , Lokesh Gidra Subject: [PATCH v6 7/7] selftests: mm: Add a test for moving from an offset from start of mapping Date: Sun, 3 Sep 2023 15:13:28 +0000 Message-ID: <20230903151328.2981432-8-joel@joelfernandes.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog In-Reply-To: <20230903151328.2981432-1-joel@joelfernandes.org> References: <20230903151328.2981432-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Stat-Signature: yc6ozg9a5tdb9atzr6bo1auy6tzittac X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: BB918160004 X-Rspam-User: X-HE-Tag: 1693754023-618438 X-HE-Meta: U2FsdGVkX18RfecSG9iklJqk8MqvWOCWVns8o5jJryhxWg43jEsc51QxfMEJKEuFTz9k34NKWgWCrJE7KE7yEj9KRMQzvSTqglypmO6kpYlWRNX/1DnLDJDdfH9iUIYCH7UMa6ADipKVZZyTQexlAzqHku1kC+AA/2Nk4ZLvk3tnCZ/F+6Tq7JUux+ipI1KCDmeE5im2EN4x3fRnpyKdswKauuWSVL13sq9Qxinbn3Wc3ljH7FuVCCSW21lEo1gYc9LiLd4lzjCWWxygXcHiSWdEMN68/Jy3dZwtcf60MrTFrJk5y7oZi94EOAIpm1sIjFmcNFDWjwwez7zTWN0DF+oZPzl98Mx3eT+KZywMCYzTim4an9ijWqns8EKfrZOTkXQaTSGW7XpiQDEKKNkjGYVj4LejwzwjP35g1J9CCkVZqau7vR2yKXRTw2n50fAZIH2DghgFPb17WZX7RZpyT0RDzGzX/OwEeYZpjjyorXAPtw3u+y6o/57FluXLbSv/3HsCvKkLLd5qbVUycN4qWn4mfLHyLj/nFIOA6tt+P7cxw418S374fW1mQ/iFctmUbhDoxOfBrx+JQBFXftu2xLuasFKlJ8LszomHSQXaBsgjSe71qxaW2YO3GFwcHGxK9pwQ2fac/umNPF/TCq/LbnDZKDoH2DvoPSoB67mJPzeKUjoFsXlx3fmAcnAvlek88eiM4BG0ssMWxYCnFKtSjUZn6SwXIZbtm+T7SDXFe/jVQzqoSQQm54Lsa4zRS2V10bIn9n6yGIYS4wY5nWIEvSuCztLc2W1fnyh3yexqsdlAYDxRn0qFWBN3gwJwZwQEXfuieXHb2dT5qP2m+n2Nej5OLwHuG9rjYw8k1Kft2Izt624iV30aSPONtXJS9QMPPwzMaGuiZertZawWK45sSK8sMfmU+PdYuJZkjb+jQifxxdL9g2yEbU6VmkoKrWzr4oeuT5opQ3xsQ0z/v5w 5r6hICfz EOVLdWdqHgPrnnNB6yWk4+YP5C883oQcLbjA4/YqvgF6aoGUlbplkaY56T7+jep0s55aJhjHa7fKG+7SUnnv09t7/lZ3nXQU9It5JnBJlXSUf/y1wFDMhPTqDqZI2NvzLfLdeIUk+vE0T/KQ92fS3I/xa8ALJAbbQgVMBlSwgpxDIskq4NFVQ9tn5r3UD2ZE6LAAr719xktA0F15iX/ePNFHvlA3qkl6WqfzL0G+UH6uSV3n2xSeHT2ZmShwCKc0FW5aCs+m93tMoEUwiRtBDM3H7KgCN+icjFDaBiAdmYODKCIYVFVYr8H1DcL6dgJ0+7RCwKtGnXKUZIDSNLSNWID9j+ZEiClFe7EIGVbccEOrBZ/za+7GHc6W1Be33xinMEeUZQiRr0Op1oeCuT76CeIjouxobDExbGAqMFTxtz56pECF/cpqaHc+F/bgU0PV5asP+MiYsLp4U5wLbLspeDm7VPUGnv/ewWZ0KpBUFGPmcKI4j9A/ZSygmrA== 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. Reviewed-by: Lorenzo Stoakes Signed-off-by: Joel Fernandes (Google) --- 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 12a095457f4c..1f836e670a37 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 1MB+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",