From patchwork Thu May 18 02:18: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: 13246055 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 ABBA5C77B75 for ; Thu, 18 May 2023 02:18:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F6A4900007; Wed, 17 May 2023 22:18:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 25806900006; Wed, 17 May 2023 22:18:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8C1B900007; Wed, 17 May 2023 22:18:48 -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 CCE8A900003 for ; Wed, 17 May 2023 22:18:48 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9A0471605AC for ; Thu, 18 May 2023 02:18:48 +0000 (UTC) X-FDA: 80801767536.07.53FD043 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by imf13.hostedemail.com (Postfix) with ESMTP id CD6A420007 for ; Thu, 18 May 2023 02:18:45 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=gpiRUjEC; dmarc=none; spf=pass (imf13.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.170 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=1684376325; 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=sKe+AGy/Knc6S6d8Do5DN/gqM9Uy00SAbxH28Kp1LUQ=; b=vZAtt8Bkn285OTKP3Evo1MDDNFANkQOqrRZhmdapg2hHolkFT5xz2qC2semVmvefduVtUF 0oxsTpxPkRXJWVW03E6SFxgty5aQcyJRcAtvF2rTySlITTGuZijn0l1zyN9rjMcDMbdorn 1Gq+FIKJgnS2Ozj2TULwFR9s9w01pxo= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=gpiRUjEC; dmarc=none; spf=pass (imf13.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.170 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684376325; a=rsa-sha256; cv=none; b=k6R9d1ZLTsUUuNIn/t9XjcyXTVHfFy7ilCzVibA0hE2dA/yGg3NP+GQibJI0SapMDxzkhl YOjvRUzwukCkddic9Qk4C1kXQl/T7m59t8wSPePJLXCesn2xrMMpuKvIs8Ete/2xqipa0E mFhPCopp6Ss5iBWVFtL3HmpfgTb0SW8= Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-7595561f2f0so85503585a.2 for ; Wed, 17 May 2023 19:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684376325; x=1686968325; 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=sKe+AGy/Knc6S6d8Do5DN/gqM9Uy00SAbxH28Kp1LUQ=; b=gpiRUjEC25YrRlvGt299DCLZarxkVMlPppBRMeGjpsXJgixg9Mf1V9AuFtBCGh5WIO zYyRiKyN25sNF/Dcpz8SONWOiUN5ginUd3c7nz+IsRYtc1emCT1YYGJXOzWz7hQjxiRf eGy+COuTrQdS11tlfAZg8TDkFkoBJhCtLoMlI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684376325; x=1686968325; 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=sKe+AGy/Knc6S6d8Do5DN/gqM9Uy00SAbxH28Kp1LUQ=; b=Cnd6FFnIYvzYa1fCTA+hfvTK73CHZQl8gz/VUp/1MW/vXymZXohWblCH0v5Q1UHqmQ J5hSkD43ka6reWEW/lkFrW2lxysH042WVK4YAdJSBUcJu2g13wDHkhw4Vu3hRx0wz7C/ rJoQC56taeS49EWLITQo8ONTZcIxCCVwovWYMrbGwZ3fr7O9FZZlG0aQhpPILcQ0ggXl Np6I11aZK3eF/ZqwFNjI+sTpMOYACwbmSV02U52SNmZ6NL5Z0agYSpBJ1/to1oKf2AUC xYgJIyZnxIJFc7e1MyPYFXFK5c/Uqcphvo5ARAzTX+5JqvJUkZnuhE0aql77fhjiLqPb 88lA== X-Gm-Message-State: AC+VfDyf9zjCXNoI1cnGkTjyoGBpAzOgK29Ioei7pzGaLdCzEj7DamvP kHykAz5IYTOh5IynUDm6DwpnNQ== X-Google-Smtp-Source: ACHHUZ777yYcb28ukvf7wMe6arbQau3nQ7xByk5Y74MW/Ag+xPWbEEnjrqrm1N1GiSy28LtIBX+nRg== X-Received: by 2002:a05:6214:2349:b0:5e8:3496:e641 with SMTP id hu9-20020a056214234900b005e83496e641mr2657341qvb.13.1684376324809; Wed, 17 May 2023 19:18:44 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id j13-20020a05620a000d00b007577ccf566asm85082qki.93.2023.05.17.19.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 19:18:44 -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" Subject: [PATCH RFC 1/4] mm/mremap: Optimize the start addresses in move_page_tables() Date: Thu, 18 May 2023 02:18:22 +0000 Message-ID: <20230518021825.712742-2-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <20230518021825.712742-1-joel@joelfernandes.org> References: <20230518021825.712742-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Stat-Signature: fymh64y8s8y446n837ssqyi6h6ncmj4d X-Rspam-User: X-Rspamd-Queue-Id: CD6A420007 X-Rspamd-Server: rspam07 X-HE-Tag: 1684376325-316503 X-HE-Meta: U2FsdGVkX1/bncB9CIkbIyVMGUClwIK+lnxYWenV+eUK7IIqhsoKQ2cYj1PaF+Q17NHEmfwFq+1qMA5+HDM03FGr4LKQ7Dc8p6PXU7ZjXqj7+2yy+cfCt3HdFtNRlF1pwKXLsQ7xf4C0NR63dbPTSPHnHi7SOobJY3RmvjSVm8DG9QbJyDczKTI8PNYOqUjdInykyWnCgQjYl2qjxa9nSKd1wfOdsvUG/UblsvI/uYvmSVTgO9T+V2U7OuFXcs4cfi8C1/68INLUWHxnIA+oqLRQN8cT9Sh8cAqfj9HruMDFhBiDrg52FEDrytgGhPWdlWvV+h5uPeM7+fRuaBs7wZfXz7FcAwVl/h3nARt8LI1RrQb9CTCyiF+OV0WK0oR+mNDitgFDjLadOYC5ve2XR8Knj9DYTVrCE+1l3c6QNfilq63PGN+8SnvWMQqUaplzevuiDQxHUTrr3HcyO4i1eCjAByfdx+GGpKuZwARfExlLBDl2jU8THJB6RbEqsjlRNDDkLjTw0Wcmlo6AOQXhI9k/LYx6gYV7PhFBhmPka7R0tgABfu65K3D0TJv05iJAtm2Yh0X0d3LvZSCydXodspynkhCDVQJ0ggDrTtrKyOz785Pqv3bHa1eLelCeiVEOspRDPydJdjUkiUNNqf19mcrf7B5NHq2pxb2Zi0pPuouI5TLArp4wXvpM/roAvZQTD7Er3xf5c3XWZWQz0p/VJELPXTd/2hF+b9mv/o4a5OlEXpirba7RI6V8Rsy7qVgdT4YxQJ1jSmMo/UjiYadxQoIpMUvdo1yVtAfvNnrmYAoiQbs5pg21uDJoclLR8kEBV7ITfQqFh3J2Spi0s3Vgd03bH0HDdmerV+DXMtXbEhp9nLKNeWFUiKOAXjyGxiQ3s0ib+uz4AYMIXuIRPMjjfXLZs3KdJzFpFJNivLawnkjjSvHAI/k6HCskZkozzPQpFwwAh9vSXu+xNr2yHd5 Mg0gpamV xO+oEH4zSQyxKf40wfMnQvxTbhIq2UhIU1HeT2nMPBmW8f94nAAyVF7ae3o3rqTiR1iIzl8DKH5tAgsQjmRUSya3kb3FS22phhTtcCDxd/rljvEPqTR10CrrWkL6eZ9Gg1gc22bQttV4Ob9BXWtpmGEYiBGDCNnMCQR0CZ4iLHI4UfXiyIp21ztY0ONywIxBQwh2wflXywiyLW3fqIypJagNw0HVwltTjSHiH06pEBpY/4tMpDSsEMZzu911OGvo0kE9yGxvjpy2mpGieBfOx9Qlz5nxsYcEu3v/9TEqgXuU8iI9qrlkuLIxfEPdtuIdmCbBq241wRo3snqbQZ4fDOVHYW2IQAPl+fx01XVvCL+W1M9GVzwNAwVZiGnfn4Mr7kuIiSZsgcGEjB9qFvwntwHxt22VNWeHz4Lof1ryTP4ZJZU5EUnlr2hCAvhOM77dcdYluEswyTOT0byVuyaBPp0XRWAQMQUTjqHHOYhANDrL0F+LmD3RismzyJ1AXsCKe5pATRzUObqGkQ/ftiOagqAB+p35GqTN680hR 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/destination. 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. [1] https://lore.kernel.org/all/ZB2GTBD%2FLWTrkOiO@dhcp22.suse.cz/ [2] https://lore.kernel.org/all/CAHk-=whd7msp8reJPfeGNyt0LiySMT0egExx3TVZSX3Ok6X=9g@mail.gmail.com/ Signed-off-by: Joel Fernandes (Google) --- mm/mremap.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/mm/mremap.c b/mm/mremap.c index 411a85682b58..d7ee3b20e170 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -478,6 +478,51 @@ 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 check_addr_in_prev(struct vm_area_struct *vma, unsigned long addr, + unsigned long mask) +{ + int addr_masked = addr & mask; + struct vm_area_struct *prev = NULL, *cur = NULL; + + /* If the masked address is within vma, there is no prev mapping of concern. */ + if (vma->vm_start <= addr_masked) + return false; + + /* + * Attempt to find vma before prev that contains the address. + * On any issue, assume the address is within a previous mapping. + * @mmap write lock is held here, so the lookup is safe. + */ + cur = find_vma_prev(vma->vm_mm, vma->vm_start, &prev); + if (!cur || cur != vma || !prev) + return true; + + /* The masked address fell within a previous mapping. */ + if (prev->vm_end > addr_masked) + return true; + + return false; +} + +/* Opportunistically realign to specified boundary for faster copy. */ +static void realign_addr(unsigned long *old_addr, struct vm_area_struct *old_vma, + unsigned long *new_addr, struct vm_area_struct *new_vma, + unsigned long mask) +{ + if ((*old_addr & ~mask) && + (*old_addr & ~mask) == (*new_addr & ~mask) && + !check_addr_in_prev(old_vma, *old_addr, mask) && + !check_addr_in_prev(new_vma, *new_addr, mask)) { + *old_addr = *old_addr & mask; + *new_addr = *new_addr & mask; + } +} + unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len, @@ -493,6 +538,10 @@ unsigned long move_page_tables(struct vm_area_struct *vma, old_end = old_addr + len; + /* If possible, realign addresses to PMD boundary for faster copy. */ + if (len >= PMD_SIZE) + realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK); + if (is_vm_hugetlb_page(vma)) return move_hugetlb_page_tables(vma, new_vma, old_addr, new_addr, len); From patchwork Thu May 18 02:18: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: 13246056 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 ECD3FC77B7F for ; Thu, 18 May 2023 02:18:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 56288900003; Wed, 17 May 2023 22:18:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4CD06280001; Wed, 17 May 2023 22:18:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0ABEF900003; Wed, 17 May 2023 22:18:48 -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 CF26D900006 for ; Wed, 17 May 2023 22:18:48 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 989E4C06D6 for ; Thu, 18 May 2023 02:18:48 +0000 (UTC) X-FDA: 80801767536.08.48B3E21 Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by imf30.hostedemail.com (Postfix) with ESMTP id C3DBF8000D for ; Thu, 18 May 2023 02:18:46 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=mQQrGh4h; spf=pass (imf30.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.160.181 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684376326; a=rsa-sha256; cv=none; b=zJUddC3l8hMtx7FLOYX87pgVLUdkVfuc86RFzvKOV9MIaaRjKrklXmouROQypmQqTPZG0J 7IcUBbmp6C9+z3ELRAucAy9OyifLNz/zxpuBClrDylxIX29s0F2Eg8quIWRdMJX2UXR6D5 B5avgX5SSNMoSAlNjlYM3VeC3vGweTQ= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=mQQrGh4h; spf=pass (imf30.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.160.181 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=1684376326; 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=RjDDJEmMByrSrRAzAnrYD81CTFNgsqIfOqapJ9IGu5M=; b=jK+7q/E+o3RyoFwiAS46pPlCLBpEFsIFcKOdZJ6SGz2fVclzhBx/dxDchdaS4M2iq4Co1r cXb9wqQrYcZmU5Ci9M1VD8foAWc7n53LCHsqsQUR3VpXIIimmxwz3G1VrQrR/dqu67ZPis 5DajFe4iyLwf588KBERGqxc4unKlU04= Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-3f5386d3e5dso3735971cf.0 for ; Wed, 17 May 2023 19:18:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684376326; x=1686968326; 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=RjDDJEmMByrSrRAzAnrYD81CTFNgsqIfOqapJ9IGu5M=; b=mQQrGh4h/KNWIK2PoMB6Pztwf3cVCXmBMz0qqgOhBsvYUoYmvpqwqduJIzlAMMC7YK ZrUS/hiBuG72PkbcadbIrnygdqpWVUoSGwOt1fIX6LFaYv2ZtLweuzoryGI5e/lbAEvj QAZwZXY/iYOPxIXmup+iJ05KpzCFPd+H+MV7k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684376326; x=1686968326; 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=RjDDJEmMByrSrRAzAnrYD81CTFNgsqIfOqapJ9IGu5M=; b=WWDy/DD/9uMguZ13Jm5CP891WisJaJk9z48uOvvYpquyluY2tk47YEt13VrFrGH0k3 Uy/GkQnFhqzVl7J/G51QEf+0QnsmUv1MVczDu4M/C8uAmTOEX7GJn/L0nd7oIUKF1O9e Sul5gydIO8D2V1h+dCslXbNZMU6b/vSMgFrvLOcYna7ZRri93xEiyEsImqRcharUdSVQ vFiMoHAVDDewsjfYdd9jWS7u+WkIDBd1j4UvowddPnjQ7QmjbS45/nbjZOVB1VQe7ADc vy40YjfxHj7Dfx/PLH0WCikc72Qu6gGCK4bpOMpUjBXGL/dTG5/mcukiBVu/bJbftrCF XOJg== X-Gm-Message-State: AC+VfDzIn2s0opRAlFg2RigJbYF7H9A6iGyScvRh9KpcaqCIJJgW9VwG AUUStBeb387vdMYl2N/V96AR8w== X-Google-Smtp-Source: ACHHUZ7onnyA0YRXFWFSrDrQsTcQvuLRzQPOgD7sBT31Y/nwpybDDjLCC9uzwGCwdRjZeUxjOoHbXw== X-Received: by 2002:ac8:588f:0:b0:3f5:2fa4:43bd with SMTP id t15-20020ac8588f000000b003f52fa443bdmr3399132qta.3.1684376325860; Wed, 17 May 2023 19:18:45 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id j13-20020a05620a000d00b007577ccf566asm85082qki.93.2023.05.17.19.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 19:18:45 -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" Subject: [PATCH RFC 2/4] selftests: mm: Fix failure case when new remap region was not found Date: Thu, 18 May 2023 02:18:23 +0000 Message-ID: <20230518021825.712742-3-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <20230518021825.712742-1-joel@joelfernandes.org> References: <20230518021825.712742-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C3DBF8000D X-Stat-Signature: sfjmbybmh8ocsriu3rqq5zrdy7t8dic5 X-HE-Tag: 1684376326-354086 X-HE-Meta: U2FsdGVkX18w0/Baru0GRQwOzv0p7tvb1W+Rhds5Xeh/Nwk27IXKd3z2JE17hj8Gr7daWXx8gJfv24e+8O5pMsxBsgpF6ZaMUi3b9NwJxJZX/G975Mq8GovD5s/OuVot4o4p/Esv/SKfEA1VAakRsALgE+TvgnMxMx41j87VmUizAPT66M3jhYoKttMAV6Ys/sQNqYTD5IbGKVFCt7Ar34W0v1RwmfW79rJiG4q0tJ8K2Lfq9p74kuWXrlnN+upqtsbG4FgOlCQC7YXldmBYbycRBavw9Y+gWtCYzxNb3RUULMpsWofrxbf0mFCVyoTPCqQ2CtCFv3RKxJPbgMEV5/KiNt8lBKosWfbZ3uATU7BJyTV/v283nJJluXGVKAZOfZ5H4u+WiTmwmFUJAtJd//3uYLKKMck3t4EdMM4OOuROh37NtDlgi74umvkP83N2Zyiff8nJyhbTvm2bN5mRRnUN6tzpZ6/DFIHTtjpJqY6QJ+973BFBGcljamw4Dk8SkRLCYZMBGllDN0J+W4D7GBga7epenbDKXFSfB6bdlCvxg2CcPYPDwFc37vEdXjCVYeAjcBzNmvP3S3oxrHlvLwEcbQ4CKCXlgwYUCoC46nwpNaU4/kCVlys/TmtochlWg26CgxdPwW1CTsPv6Oe+E7n8iAuenbbZ+OlxVDbJR9VvCO3ax6nF70WjHb1VvL+Mt4yh4lZwtUsIHJPGh7lEAxAyMEQNZyxPvRNhh4YT7n8YXthXjLMCp7SkSn3lHy842YrS7dmNPnUKxxG8UmtSkiGM4VD6qJxrjZUkmnPnwnk02kDI7PekkgpKZGzF/4EtePX/FLYxXOyuWNPlHmJDnGKSWDiphgtY2yi+MTd39XY1k5dNFOAHYTD4mVx356FiHaO+O4l8mCXzgarHc5hmaBJd6Qz7UH9LV+/KkSuBTcNgtLilMGr9qet1HQGKgMbS7NGr+gvkX+Lqda39w32 Zjqodz5t uBUesaN8CGUIsG3RymTBozxDFa5FaqJswGTV4hBD1CfdhqqbrqWyPgH0ZPURIK/04dDrw0U4s6tgPOigyIMfo80DXcA5HQTP83N/nh/AfJT5fUSCxAKLkhzoDT+whiRyih0QADUyHBJVJLadlqoszZPLRPhoFHcp50gxzAL2EkpwBZlpHmH3aM9ZVJsz20lO+3qT0hndGMmO9HCV3sPy/B8Zay0FlrKHMcA0jcbCvlqwBvN5kc7LdgG0y5V7+o8lOQdLi4CORxvdYkylrjmBv99uh9i9uwooiKfl+M8V7ZpwcGcjfua70RSqytUQDVmGRiUksPs9koFobjyfNQf+C//dcV4S00shKMN2A4agsWEE0ejwfHLyzh67ZAhbKezQhez7CmiqiWIIPSD142VsKE3X144Kc0l8RwIc1f6sI8snWsyU= 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. 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 Thu May 18 02:18: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: 13246057 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 90CEFC77B7A for ; Thu, 18 May 2023 02:18:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5948900006; Wed, 17 May 2023 22:18:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AE2FD280001; Wed, 17 May 2023 22:18:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90EB4900008; Wed, 17 May 2023 22:18:49 -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 75FE3900006 for ; Wed, 17 May 2023 22:18:49 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 47F73160627 for ; Thu, 18 May 2023 02:18:49 +0000 (UTC) X-FDA: 80801767578.08.1F2B386 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by imf05.hostedemail.com (Postfix) with ESMTP id 75259100012 for ; Thu, 18 May 2023 02:18:47 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=laThT9Km; dmarc=none; spf=pass (imf05.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.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=1684376327; 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=O+pMaJ78vDhX/WJumeumdh2Ew8rPwZqh+d939UbVmCI=; b=HPSRBT2eOgFdWk5bjekY4K2Piok1M/RfHSCz6mLXix7n8+l3vltX5Ea3IZaWGAzpLY4oq4 gdP8jUCHErRTD8kSEhX8Qbt0VOC/teOlFgDayisCcRM5U8lUe1MLC/GflUPCQE7jbEmSF8 5ffyTyaNh35ex6WtxuJPdOVsBQ9V45U= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=laThT9Km; dmarc=none; spf=pass (imf05.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.222.176 as permitted sender) smtp.mailfrom=joel@joelfernandes.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684376327; a=rsa-sha256; cv=none; b=pFO3FO+cgcOVpKd4LzNkea6dwKxLkOMnxJ25d5nNeIsoWfst91QSg26A1LRUM7dllxkJie 8uu8oyn4powVUivCjaAkTEFyJ5LjdCkTsce4QHHgO6e6r/adu1SGgLaSySsXPa5AxGhego yatVfJvDqpFcrrdfh0ktgQug6M98Hzs= Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-759200f12baso168394385a.3 for ; Wed, 17 May 2023 19:18:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684376326; x=1686968326; 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=O+pMaJ78vDhX/WJumeumdh2Ew8rPwZqh+d939UbVmCI=; b=laThT9KmuWwvZ+2Yoy5xsTan07ApYzz/BleFpSz8wK9Si/Q7ltWEJAFVbUqtOZ4D6L TMd2/Y9xWpgxsYsAa9xV49mMbN1y6fwgjT/pKe1dU8Islleu93aNaPSMOLxKyhX/jNrJ 4p5p9XM83q3qupRwXWj+wCh1LxpyNLzARQFWk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684376326; x=1686968326; 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=O+pMaJ78vDhX/WJumeumdh2Ew8rPwZqh+d939UbVmCI=; b=Vi17GFa4tJ1eYNaHnhyUAUFHG55nKt8l4Kue7YOrQoKfCKDuLQqaOU0lpwfXYUISUL OB5bIF8R9vWM1AGlv6BVkTgdVORlIBjVBvl/gjDpDfYURRWi7djQZHCNP6Vp9egj5R9Y VRjaSuaYR6wAGw/tN+R+8AGEaifKCAK510MWMjR1WuRfVmgiHkdAFFAM4N9GjIqdAa9+ yITRIIvMGLtjNjWmWM9OjMyt231bhkaQaRN/UEYLUWBKYUPd9GnNxvkTzmSRjB1VAUCU j8u1uXScIHohKXJs9WCxeNsqLasJ62bf5w1dU7xcC/Q5YJQOgVK0r5Sczs6sBaiecRti R9wQ== X-Gm-Message-State: AC+VfDzV91G1WU2U9V+K+Rr2f5leBiJdb7/sdP1vcMioDdxTMpCtMeY4 iWkgEMcpd4iOlgvlNHh9Nt4VLA== X-Google-Smtp-Source: ACHHUZ6UnCuj5Nq3VC1ze3Rr3HeldoNEZzJlJJp6jYqyiOJjllcKquWS6RDoPMf5upFCbGWuS1xJyg== X-Received: by 2002:ac8:59cf:0:b0:3f5:315f:5c19 with SMTP id f15-20020ac859cf000000b003f5315f5c19mr3147223qtf.62.1684376326582; Wed, 17 May 2023 19:18:46 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id j13-20020a05620a000d00b007577ccf566asm85082qki.93.2023.05.17.19.18.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 19:18:46 -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" Subject: [PATCH RFC 3/4] selftests: mm: Add a test for mutually aligned moves > PMD size Date: Thu, 18 May 2023 02:18:24 +0000 Message-ID: <20230518021825.712742-4-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <20230518021825.712742-1-joel@joelfernandes.org> References: <20230518021825.712742-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Stat-Signature: jx7sao1n14dpfkgo8xmf7u4jqcw73sno X-Rspam-User: X-Rspamd-Queue-Id: 75259100012 X-Rspamd-Server: rspam07 X-HE-Tag: 1684376327-586917 X-HE-Meta: U2FsdGVkX18W4OlHyx4MehrbXfsvbNQxZCW5PEoKwiIV/dyp2PcBZYVn4KtGUf3kzPEeF+G58/NSmeiLkrkTlGezCjOmV4WAwy4K1DCmpOWEWEOEUmBnL0Dhl6EELJShnuaCqDQVvbgrqM8z/S//ZFFIsGc9r7NmXkBRwdEHiO1q8rZVmz1XAhw3+ff7fpAMBe9nSjhPAVh1vlkaaLR6h/gKVUtpJynXavO/cHwVasJL81QyqmpRv1k8TTdjahvuAPMBEZbzozbjs07BzK7T5aHb9pkyHvCiF4T7oCBGaGHJC6AJ0Kx4ISVmnGlJ92l2VIFWxIZUEh0uQ2IMk4uI3GTFWH6xKJ8IknlDP8Dw2CeVFXm5Gk8XwDYMkn96R3Yy6huOERLv2Hdi7nIDGnliZzEwytIfGEQiNy8wEicUK8OLdUY/OIsywJqLAwkLA5m9mjhf4Mg3nzIGAWNP4ofRJe+Ms/MUMs++EiPsCeq2BjNH2mTUVE1ucLkw3ZBU+xVIYAupKpYg0pQf6xzFyhk7+FZRVhKrdm7wXp/RVakuzFh7XrATYyh8Sy5KRzzJQXWqsX4kb72yT/rzvGlIbddbu5gV+BZS6aWHgOaPVtQ4RfYi551/B3EWRMcxCHeQXWtjKL0Z/eT1EUmp0h5wnNIkzBf2/LbfeZ5gJahafioqFjqnHTTnmqxr0iWf95MAoCXrh4QhIntRL9YXgOnX0VfnSNmHlQqsqTHOX4lv0Bmp/beIy9r90lEKl9iITn5/5dyVFryfPeNB1x20M4fA56hyYI30MrDYtcclnZsfBFPMK61MT4ZCHTtYaaKDJR7PxWa8wtNzAFeVwbebGTxpTYG4lk1RGBcXpnnOpb66mMN0WWwepZ7y5QhIn6L1G7gmZZf4MbMd+glgud3Q5p4ZYwHkwyLNzb4R6xQXdcZiiaKzFklrrp3Jff6A7ya3SU+ptn+go887lplWxmJAgDiwJ8t r2e8meGz TYUL/ZWp2MurkAnjpEJhYL4PryVPNUVpLttF19kvGhb4Ze8FOt16Iapc943nkCC7H+BHFkR0JA42WGtP2fbKF0By5bSNK8ChhZjDzFu32k9KM5LdHn6ropb0nFlGlHRPUQyff12X65JzgGJ5NB2B7zwWuAYZlWOpN8lzUJlKwwlKK9VJfGs5Be9N9jN2uz3Vd9IXi74cNDBRQH5y3nVl21VI/7zhi/wCbhoHLvFhsnBg6ZjZlEj0mWATyRDmHgBa41+KAn/ShMECFhj5hEJH+KcqWdNIoHqDnd3H072vr2Z/FOK/TUbHABZ6VGjtIns9bwk9prKCeN6l/NA2Slf6GCuYucBan9OF1k3486JWdJKoIenPNW/cgrzwR5PoRolZEXEXTJ2d0BrPf9vMFBc+O8np21Q== 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) --- 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 Thu May 18 02:18: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: 13246058 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 EB328C77B75 for ; Thu, 18 May 2023 02:18:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 95F1A280002; Wed, 17 May 2023 22:18:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E872280001; Wed, 17 May 2023 22:18:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EC8D280002; Wed, 17 May 2023 22:18:50 -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 52F9B280001 for ; Wed, 17 May 2023 22:18:50 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3410F160627 for ; Thu, 18 May 2023 02:18:50 +0000 (UTC) X-FDA: 80801767578.30.A296FD1 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by imf02.hostedemail.com (Postfix) with ESMTP id 5DE6F80003 for ; Thu, 18 May 2023 02:18:48 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=XjEWVFgj; spf=pass (imf02.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.160.169 as permitted sender) smtp.mailfrom=joel@joelfernandes.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684376328; a=rsa-sha256; cv=none; b=kDJnERDtLkGSMv9dDFFEmn0jz9S1H/60tLXx4f+M0DCkllgVIFxYNA9BNoeh/iai/3w4M5 U9ULHA4Zd0KxMKGmsypcHG3T6hjdFjyLFQM0m68Oh+4Ws6qCbLUZ2TcUyIaqREldPaIOmU KHtWeaBa5RXe6z7XGxNI0NDZk4aU1wk= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=joelfernandes.org header.s=google header.b=XjEWVFgj; spf=pass (imf02.hostedemail.com: domain of joel@joelfernandes.org designates 209.85.160.169 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=1684376328; 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=tGuemAvtIS/ALPtC/Ke2yJXoSr37KqjSOh21F52Z0b4=; b=b1zdH4TOqs1MvJ9MzSLIN9K+rv4GqIq2u+GO+GMbnib5YZ5EYQjYnOqMaQbrs7VHEdBLYB c3bA2PKCvSLCNdp1EAYWsJ8HTq+KtDRuy14nj8FTV6mwl6rHZpb41hf0kU+GYC+NSArtcv bzVKuK6CtC9kFiniPLsUWsSv4aYDjEQ= Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-3f507edcaaaso15611051cf.2 for ; Wed, 17 May 2023 19:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684376327; x=1686968327; 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=tGuemAvtIS/ALPtC/Ke2yJXoSr37KqjSOh21F52Z0b4=; b=XjEWVFgjHhBSgx+JzMuzHzMuMMrg6ZCjBCCAdXf//YzfKBHsPOaTSvveyrxyVc63mB OszLdP5qzb0tPw+Ax1TNz+UB1DuNFET/RCjILS/7u5bCzvBBR1KOj19dWdhgLKcgBzef NYJtJv4KZejE9EsPY58w3IzlHS7ZNhsiLoXuY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684376327; x=1686968327; 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=tGuemAvtIS/ALPtC/Ke2yJXoSr37KqjSOh21F52Z0b4=; b=Y+WVh/ULEvk8JXxPNWyyCTkYYsBPN41bqJO9G+StNB0k1T2SXzRtSnUK5qBGdfj8b3 CHTmcUz/jKbioFp104nhNfIxY0Mmz03O12fpt3wcPEt0NhBYiZSS+fSpCiAxJyLSLYNa /oMI5vMvuJiXeB7FOQI4ycBInLGMXhkatueJrRtCCGNe4TUIaIcGs4MRcY33T6dMVfCZ /AwwNdv4QC0LBxTPXhZlI1216I1a1y5K4yFoA8Zl42DH+bpUEzsaXiJiG5PDyer8UC0a HPejgCe4Ub9LjTVyuf+s8tTrPzuU4ox0ue4vfaMy3TRhdb4maE/F9UtSa8TJFKqrWyH+ BGOw== X-Gm-Message-State: AC+VfDxcLOAF38t3CJKX+M3kmtU3GDt9OEeiacJU7rjgwrCSr83pK2cN 34tmdHbyFJYLnF42U5bYnkmdvg== X-Google-Smtp-Source: ACHHUZ4YcOJzn6aoVPNard/VpdQHjhpKxZ/STCMnHfkC5tH5L1a/155XBb4RZDt8EkvRYuJwqaMCWA== X-Received: by 2002:a05:622a:1d0:b0:3ef:366b:5afa with SMTP id t16-20020a05622a01d000b003ef366b5afamr3403956qtw.54.1684376327485; Wed, 17 May 2023 19:18:47 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id j13-20020a05620a000d00b007577ccf566asm85082qki.93.2023.05.17.19.18.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 19:18:46 -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" Subject: [PATCH RFC 4/4] selftests: mm: Add a test for remapping to area immediately after existing mapping Date: Thu, 18 May 2023 02:18:25 +0000 Message-ID: <20230518021825.712742-5-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <20230518021825.712742-1-joel@joelfernandes.org> References: <20230518021825.712742-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 5DE6F80003 X-Stat-Signature: 1f41p4p7deedsaxrwg7z1apqshd3zph4 X-HE-Tag: 1684376328-605093 X-HE-Meta: U2FsdGVkX1/XfyDIQvUhB2KTq6T/67NfWsWfreUylFnaoDNk0+e/yGeYNOAknst2slRNn8912CraLL+//VitXYeiI6Cs8vjvapawhrHD3X6ocy448LNMnORvh+GJtBAJYEJHAMDdQ+Jeao32qQuE2S51yaolucTjUDgAuqv4jMran3A6BNTO3IHk6CDW8PiCfum88y2t6LuzzZhJob7LjEApzg2FNmG2+Fr1XQB7ELyA5bh+bvaenyYHK+nc3Jw/26J1KrT2/DJk0geUeoXebnCGk5WDiveJNEro3FLW8vDrXhheXUedxPfLJNKUxbSam3On/7+t2ny6B6n3CGi0370p9q2FWvVfOcPTlURUZs4HXEKGvPCGzsAmo1WXiWgPbha4+2SDkmekVvu1Uk+0aWTI3Z7zs1nJhP+ltiBuP5KrsS2w5EaemsmCoKhEidOyCmv57qH/KIqT349rSWKKMibb5OyWnKSU6WviyEpVwFsiMbUIvmCeEvB3SXm3rwG4whwMqDrqOvCsQp8kdqEbhm8F0Y9Pot2USGOdH8uKuqc16GzZ68eBfU3nRzKoQhU0gr3p5DBFlovZJN6+hnNygtWRxycSzOs7y/95ZJW62hMy6w6vOgns953BZOFJ9XNJamyqssiFY8aeW7qDgczMMU6sn3beq5nbXKTPcgI7W/4jvH9yGt+Mwo8CHBh8WjpzU4MjwfYV+ZknZvfrPsHME3BzkrqiyBAGNklSchwfUNnBmRGkEIpbwG7/NadxGF1KS7GgkSerOG56Gwtg2g85BxeJPIwru887rQl4iXlxfNboJzjYPCkR4Ye9r5VpA1Q+H4CXoLVK3XAeG5VfEZErGFeC12orlXCv1AQkKVwJ33uyv7tDtIbaG2Z2F5p/f1BboNySh37KAg2EMsrq0u8UvlJqMy2fsEYbfrqjN2TV+anv9k/YYCbPVhR37czmjtppowCrdywpTujppX97lly vwZ5dfaD p+/VkqbKmk7zerr1sdnccOpw1GuhKE9uAdoZZgIObh2jX/OweNQWqEgU+mgHL9di0icALh6lxMD2LhL3eoxOm3jDcTlkLXPoz41oL+F6KLr38tl6WG4lS0R14G/IrqIEG6QleP95cDgLBaLTctoCw2+m0HdGm5PWowVzgZ+jYcSqLJy5P931/OWxjgGgizKSEqgszrxN2siw6L2azKHYwiWWs5alrAtQX9CvXHWrKpENWwVFbXjYCs78aljaQjwWUwHb3dEWt7Ls0dnnYptsxwzuHP+xbDSvfeVidJ0jXd+KPd5fm/A/WtXPN3cZsZ437iXgM20giJ8qtLDmWELt03/6bR77lJEw9YU1MnoWCYnPrB36cpAIOM2V0vZJLuK8tJV1qg9mEoRf9jtiT6yLoPW7BP/IGNBHdjyjjIO+MOWYcqC4ha0kODsVVusze/p7TGE059vbmGRqn9qGaeCqJXVW+MkXT9SdVKXFd 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). check_addr_in_prev(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 check_addr_in_prev(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 check_addr_in_prev() returns 1 for the destination mapping as we detected there is something there. check_addr_in_prev(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 check_addr_in_prev(new_vma->vm_start=5700000, new_addr=5700000, mask=-2097152): 1 === Starting move_page_tables === Doing move_ptes for 2900000 -> 5700000 of extent=100000 <-- Unoptimized Doing PUD move for 2a00000 -> 5800000 of extent=200000 Doing PUD move for 2c00000 -> 5a00000 of extent=200000 Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 57 +++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 6304eb0947a3..d7366074e2a8 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -29,6 +29,7 @@ struct config { unsigned long long dest_alignment; unsigned long long region_size; int overlapping; + int dest_preamble_size; }; struct test { @@ -283,7 +284,7 @@ static void *get_source_mapping(struct config c) static long long remap_region(struct config c, unsigned int threshold_mb, char pattern_seed) { - void *addr, *src_addr, *dest_addr; + void *addr, *src_addr, *dest_addr, *dest_preamble_addr; unsigned long long i; struct timespec t_start = {0, 0}, t_end = {0, 0}; long long start_ns, end_ns, align_mask, ret, offset; @@ -300,7 +301,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, goto out; } - /* Set byte pattern */ + /* Set byte pattern for source block. */ srand(pattern_seed); for (i = 0; i < threshold; i++) memset((char *) src_addr + i, (char) rand(), 1); @@ -312,6 +313,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr = (void *) (((unsigned long long) src_addr + c.region_size + offset) & align_mask); + /* Remap after the destination block preamble. */ + addr += c.dest_preamble_size; + /* See comment in get_source_mapping() */ if (!((unsigned long long) addr & c.dest_alignment)) addr = (void *) ((unsigned long long) addr | c.dest_alignment); @@ -327,6 +331,24 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr += c.dest_alignment; } + if (c.dest_preamble_size) { + dest_preamble_addr = mmap((void *) addr - c.dest_preamble_size, c.dest_preamble_size, + PROT_READ | PROT_WRITE, + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); + if (dest_preamble_addr == MAP_FAILED) { + ksft_print_msg("Failed to map dest preamble region: %s\n", + strerror(errno)); + ret = -1; + goto clean_up_src; + } + + /* Set byte pattern for the dest preamble block. */ + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) + memset((char *) dest_preamble_addr + i, (char) rand(), 1); + } + clock_gettime(CLOCK_MONOTONIC, &t_start); dest_addr = mremap(src_addr, c.region_size, c.region_size, MREMAP_MAYMOVE|MREMAP_FIXED, (char *) addr); @@ -335,7 +357,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, if (dest_addr == MAP_FAILED) { ksft_print_msg("mremap failed: %s\n", strerror(errno)); ret = -1; - goto clean_up_src; + goto clean_up_dest_preamble; } /* Verify byte pattern after remapping */ @@ -353,6 +375,23 @@ static long long remap_region(struct config c, unsigned int threshold_mb, } } + /* Verify the dest preamble byte pattern after remapping */ + if (c.dest_preamble_size) { + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) { + char c = (char) rand(); + + if (((char *) dest_preamble_addr)[i] != c) { + ksft_print_msg("Preamble data after remap doesn't match at offset %d\n", + i); + ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, + ((char *) dest_preamble_addr)[i] & 0xff); + ret = -1; + goto clean_up_dest; + } + } + } + start_ns = t_start.tv_sec * NS_PER_SEC + t_start.tv_nsec; end_ns = t_end.tv_sec * NS_PER_SEC + t_end.tv_nsec; ret = end_ns - start_ns; @@ -365,6 +404,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, */ clean_up_dest: munmap(dest_addr, c.region_size); +clean_up_dest_preamble: + if (c.dest_preamble_size && dest_preamble_addr) + munmap(dest_preamble_addr, c.dest_preamble_size); clean_up_src: munmap(src_addr, c.region_size); out: @@ -440,7 +482,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb, return 0; } -#define MAX_TEST 14 +#define MAX_TEST 15 #define MAX_PERF_TEST 3 int main(int argc, char **argv) { @@ -449,7 +491,7 @@ int main(int argc, char **argv) unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests = 2; - struct test test_cases[MAX_TEST]; + struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; time_t t; @@ -510,6 +552,11 @@ int main(int argc, char **argv) test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[14] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Dest 1MB-aligned with 40MB Preamble"); + test_cases[14].config.dest_preamble_size = 10 * _4MB; + perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /*