From mboxrd@z Thu Jan 1 00:00:00 1970 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 C9F5BC6FD1D for ; Wed, 15 Mar 2023 22:20:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F05E26B0071; Wed, 15 Mar 2023 18:20:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EB5C96B0072; Wed, 15 Mar 2023 18:20:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7D2E6B0075; Wed, 15 Mar 2023 18:20:51 -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 C93F86B0071 for ; Wed, 15 Mar 2023 18:20:51 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8B9CD1612E6 for ; Wed, 15 Mar 2023 22:20:51 +0000 (UTC) X-FDA: 80572553502.09.6BBEC73 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by imf19.hostedemail.com (Postfix) with ESMTP id 9E5291A0014 for ; Wed, 15 Mar 2023 22:20:49 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=VK2E0LRR; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678918849; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Uy2xay+QSUr4LgGqR0bhvHEFtaFjUeaP9/Kp4kYC9Bo=; b=8BBDyRDi0Wo5FvF5KGAw1+t3Kd8Hl7IV2nDVdbYe4j/VgbrFH2NheD9iOcDrHbbx33RydP L6nKXHjIxYPnhvy36+7lRPOiKlMyZa4K8Lo/Q4pPbsBpsLQD3HYCTc1mHCaDx/Dal+Q7RW C4FJaQxHuzmO/Dvp4/Zxxwc99Hxk3M4= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=VK2E0LRR; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678918849; a=rsa-sha256; cv=none; b=sHNqy1Ff+cZD0eIoQAKzs2C+d9is/v4vjStX2Q7S44LfYxnVppFSEU9SPn3aSyJoWm9z24 k/P6ig6k1b3HcrwC1ZIPw3/t0vegDGkx90QgWr8PHK9vEYPwo7x4ypL6/rHfQKZM3XLxQ2 3wEapCsR9ad+GaXWCUyeFLDWPLS3Il0= Received: by mail-wm1-f50.google.com with SMTP id k25-20020a7bc419000000b003ed23114fa7so1962646wmi.4 for ; Wed, 15 Mar 2023 15:20:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678918848; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Uy2xay+QSUr4LgGqR0bhvHEFtaFjUeaP9/Kp4kYC9Bo=; b=VK2E0LRRwXPvr2BrU58q54QsjK/IXgxcnzSYcW3VRPEBLaf54GioNZ05oSTd/ucR2t rQhg7TEAd4eFqrVoliQ2odDOKXJi1lBxfmMMwvPtX1ozJ9ia28d0RIO2piNfpssTm6wi 6sUn4xQ3vqT4WXgqDY/eeT4HvB1UYtDs+k1Y4N53aF58yks2SeZxQnykVS91L3W0zdXS S1e/rt4z4fTHdgS3UPw8wFKgcdGGITR33ubTe/OGm87rcfUk+RAhJRTQU6Qds6yHc+RT 9NknRhvy2ou9cEh8IkYTNmtVqrtaEsgIvbBoTexX/Q5jhSsuRmvE1tpRndSC5HLo/4cz wbkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678918848; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Uy2xay+QSUr4LgGqR0bhvHEFtaFjUeaP9/Kp4kYC9Bo=; b=cp4ujQHAW04o85pbwm2pFhogK4IfV5fvbaofv//02WWME8/3qlFa4j2/3+IPrVySOV ufnN4VRrWUAKJ+D+zFBkZFZ+yQXVCOwHBZTgKy5RV+uMjoLJW0Iyp/tTwYU2k3OX57jK rh33ks/wzYtjTfuNrgiH8PHoa+U+kPoc2AbVB7bAvDM/L1Tg7aAvIUac/9o2KcvS9y0F PiMke1mn1d6D305ZgUh+h7pw/Y891Cvh1+et3EvtpCHiqvxhAZ1py6LXVFdyRBWogBk5 zfSsJ6j7fE6NEMAdOZ0N/LDyIb086S1B3DXr9Cc8P/kFeZTyRN2Ip2eob9BzqujmeUfT HfHQ== X-Gm-Message-State: AO0yUKWY1XlL2VZTjqnUFC20zO5W2XZurJaELm/C9lNzx9yOWM+BK/at zhFzmkMtlUdyimpQz6o7wLM= X-Google-Smtp-Source: AK7set+NT9e2NIMUlIy8tS9ZTx0pBweJ9iVltZKFNL5/Duj3rL8QABA5ZO6mvjxWUXtFQ/KfR9truw== X-Received: by 2002:a05:600c:354f:b0:3eb:395b:19dc with SMTP id i15-20020a05600c354f00b003eb395b19dcmr19390422wmq.9.1678918848183; Wed, 15 Mar 2023 15:20:48 -0700 (PDT) Received: from localhost (host86-146-209-214.range86-146.btcentralplus.com. [86.146.209.214]) by smtp.gmail.com with ESMTPSA id t8-20020a1c7708000000b003ed2276cd0dsm3057428wmi.38.2023.03.15.15.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 15:20:47 -0700 (PDT) Date: Wed, 15 Mar 2023 22:20:46 +0000 From: Lorenzo Stoakes To: Vlastimil Babka Cc: Andrew Morton , "Liam R. Howlett" , Matthew Wilcox , linux-mm@kvack.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, maple-tree@lists.infradead.org Subject: Re: [PATCH 10/10] mm/mremap: simplify vma expansion again Message-ID: <7a9ca4a6-9713-4e31-9c0f-11ec31817c7a@lucifer.local> References: <20230309111258.24079-1-vbabka@suse.cz> <20230309111258.24079-11-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230309111258.24079-11-vbabka@suse.cz> X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 9E5291A0014 X-Stat-Signature: zqhhgsdnxcdzoqx8dgw5sjzcjgszmcks X-HE-Tag: 1678918849-572447 X-HE-Meta: U2FsdGVkX19daq+SV/59LfYnd/hXgMYHQikRqH3Ebs9X8YFemFrfcYQjHdynaJPTrX8RsbwE9Du49HsYlASNmxhGfZHsLM6eTogTl8xECAj6e6YOlSCRwzqZyAcScPZGI6uLq6eS+sk6RXs3B0x2/uI3uWD+pSAeot/MboizV0yl2RUqyYziKFhOR7wXyM7kvhKWr0Y4E1ZPzbUYYuKfA3tl/3S4ZWeFMi0n9C8hDV47ojkTgkDgTXti+RZWdyszsTif9ZcTfznMYdd3IA6aFwErn7S+H3XHJXh/4GzZ3q3GK2hD1rNxkSiWSzFMTzsk4rA1OF+Nne61QMaulczaERIm46p64ydrhq1uLWOZRqrnNFIgS2l66je6l+lttSlAI0A9jiz2+yiKaQdlgdxgFSY6hSfjffSYF/ikYsGD4H8pZQhf3MoJgCofSxAJqVxf/MSy3R6SYquOOqMzZ/cTivaUYD1SOv04ZjcgIdXirw4m/M7tK0FUxcAyvPvS5Y1QsX+fPMF1AoblVlDjm0fgqX2NJ2zJTWy+B674Ny7IBCUWT6sX7Syb0LOwqeVj6OkuiGuKhKlIzQhwMnofqV1LnSSL9VmqPsVgwl9jzLJvznshsEkzIVzSe7tGl3QQrwRy5RatUzZBzc2VHTIYp3IT3kt+2QlnWWbskLt+bNww1ozvXDu4NsYRs6egT47QCBxmEXsnva6UZ04lmB6QZ7631xUcFAmE75bkew4TLFfRRWxFd2iAPDaOYsLQLCFC2T+MhHWTQjPYOjRVhrx9cAW0QyuQCauFvfPAI94/8UySR33WA28vLjwC3NSSTie8sERPYzjPHfQEOtmyj8o79ey7J/XWRZF3VwNLpc+r4ogZflvDoyquU2bTS3a7TA+YJ+sgZevDt4P/T897gTa7lsqrTYX/25cJEhBkEk19evlssR61iIW85VLvVTyxuf0CWgtD4kPhc6pkUL4liXmfMSq FJpmAmW6 5ESf/muBPiMnk8AzdO5wUPwWym0JCfzErnQY443Bm3NzvxCC2JIYYHiBUAUei+5XZcgafGr7Xizr2HlsAEuLnYo51PdQcc6PMxVLTks6SyZMU0wweYRVrymPjaJYV9P3lFIGrOi69ZK1tKrAn7Fio0rqm7BI8puI2KYjt6quY12aqLg0qS4tzKY2bYbhe3c1M7TmhohgwTg2W/F1oqz053kUpS8B4+i4+CHlSstnqDUAivHPl6GHCv6tIPOiQVyiuiTXkWbKG/wU4JJ8AhaRBNJhQ6MCLOQQppALmHuRGQlmc8bI/6V/LNKjPOAZXI1alHd/h/60XNF2T+ZJXSIeNu1gC/ncGlqOnJunGdpL1d+cbzhNgssSAh+pjcP8RJe1XvOeg+CnIpgpGMNBJaDqikxsfDfQZ9z/zQLCc58SqiW+Cgg91LuGfIsMCYw== 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: On Thu, Mar 09, 2023 at 12:12:58PM +0100, Vlastimil Babka wrote: > This effectively reverts d014cd7c1c35 ("mm, mremap: fix mremap() > expanding for vma's with vm_ops->close()"). After the recent changes, > vma_merge() is able to handle the expansion properly even when the vma > being expanded has a vm_ops->close operation, so we don't need to > special case it anymore. > > Signed-off-by: Vlastimil Babka > --- > mm/mremap.c | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/mm/mremap.c b/mm/mremap.c > index 411a85682b58..65f5b545601e 100644 > --- a/mm/mremap.c > +++ b/mm/mremap.c > @@ -1040,23 +1040,11 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, > * vma (expand operation itself) and possibly also with > * the next vma if it becomes adjacent to the expanded > * vma and otherwise compatible. > - * > - * However, vma_merge() can currently fail due to > - * is_mergeable_vma() check for vm_ops->close (see the > - * comment there). Yet this should not prevent vma > - * expanding, so perform a simple expand for such vma. > - * Ideally the check for close op should be only done > - * when a vma would be actually removed due to a merge. > */ > - if (!vma->vm_ops || !vma->vm_ops->close) { > - vma = vma_merge(&vmi, mm, vma, extension_start, > - extension_end, vma->vm_flags, vma->anon_vma, > - vma->vm_file, extension_pgoff, vma_policy(vma), > - vma->vm_userfaultfd_ctx, anon_vma_name(vma)); > - } else if (vma_expand(&vmi, vma, vma->vm_start, > - addr + new_len, vma->vm_pgoff, NULL)) { > - vma = NULL; > - } > + vma = vma_merge(&vmi, mm, vma, extension_start, > + extension_end, vma->vm_flags, vma->anon_vma, > + vma->vm_file, extension_pgoff, vma_policy(vma), > + vma->vm_userfaultfd_ctx, anon_vma_name(vma)); > if (!vma) { > vm_unacct_memory(pages); > ret = -ENOMEM; > -- > 2.39.2 > Good to eliminate this edge case! Do we have a self-test for this case to assert that the issue is fixed by this? I guess a little tricky due to the need for the the owning VMA to have ->close() specified. In any case, the changes you have made in the previous patch should ensure the edge case is no longer required, hence:- Reviewed-by: Lorenzo Stoakes