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 09FD4C433EF for ; Fri, 27 May 2022 23:45:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3BB8E8D0003; Fri, 27 May 2022 19:45:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 367498D0001; Fri, 27 May 2022 19:45:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 231DB8D0003; Fri, 27 May 2022 19:45:03 -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 14DC78D0001 for ; Fri, 27 May 2022 19:45:03 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CAC9934DF0 for ; Fri, 27 May 2022 23:45:02 +0000 (UTC) X-FDA: 79513156044.29.587FAA2 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by imf31.hostedemail.com (Postfix) with ESMTP id 334982005D for ; Fri, 27 May 2022 23:44:25 +0000 (UTC) Received: by mail-lf1-f47.google.com with SMTP id p4so8997031lfg.4 for ; Fri, 27 May 2022 16:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=IALt29wlC4JKslLVMsLFRhR5StYJLg09Im2CzgSWtjU=; b=BSKfdkBpBFTf6f+PiPWq/EXSKA9i8id4uv80ipDYcRnsAuJgnz/nDzvg02VDbWclCK 1TAP2co9doBzOdEdmkdVHP8qaNrTPtRuT7tuB4UXYWjHiP/oWai5WXRAVAtk8lZJeJik zzPZ5AQ/Epvcm6XRPzH+jWa0V+SFaFv+OGLsrS5r+m8oB253MVhhyqZL447hADuQyV/y 0Nw031lvGm96EZhNUMbUaK4GF3vPSZO4tONyWX2dqdmllE0icr1nUcfAF1zNjNLeSSkl zCA+TmnbcOmXugIUnJ8to7IfOB1iJr1RLAiQPDxiXgFXwZMeedcnL2Mva5gSpKT5gaWg qJJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=IALt29wlC4JKslLVMsLFRhR5StYJLg09Im2CzgSWtjU=; b=z+bMI6HKB66ymbwNg8wXQWsjwuUhs2CxsCiUpBCATRzjLPgfScS8IkrSzMzwA4av+K 0JItnbJTbVrFyQQysUSwXJJvrRZW8iiTT/hBvCPLn0TjyxWrR1KgHL3nox4DdtPcTiUj BLnf05lypcAD+AUYVRcfx+bsM1gzqTensbHa/HHwCOJ62Yb2EdS7cXkBlkz3fID43nSq XZYwRXOzrWJEOuWlFm7wmionAWxnmzWCublAAyovf+h9VvikSueLz8gAedPql5H7DBt1 l7wth+pb1sob/r6amLD4B+iu+NDhQaxN5vkorQyyoqZixhHqylnFr8jhs4jeVESmGaM2 deAw== X-Gm-Message-State: AOAM532OY1Vq9RPgJtCgvEc4TZIqxn+U8/hT4WtIBBA7r5l5N2G0lCoG 0ZlXaFmx1hKI5ZznYmIgAecMFOjJy++L/hcD X-Google-Smtp-Source: ABdhPJztWwtE94iIyLx6oVtYfG/pmmvgHHVHI/8vyuAAuATDZ9rdARTLukXZNRS229FkwcWe0iv5VQ== X-Received: by 2002:a05:6512:130a:b0:477:b632:27eb with SMTP id x10-20020a056512130a00b00477b63227ebmr31008546lfu.131.1653695100867; Fri, 27 May 2022 16:45:00 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id q20-20020a05651232b400b00473c87152bcsm1061360lfe.127.2022.05.27.16.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 16:45:00 -0700 (PDT) Received: by box.localdomain (Postfix, from userid 1000) id 783451094B9; Sat, 28 May 2022 02:46:57 +0300 (+03) Date: Sat, 28 May 2022 02:46:57 +0300 From: "Kirill A. Shutemov" To: Jakub =?utf-8?Q?Mat=C4=9Bna?= Cc: akpm@linux-foundation.org, linux-mm@kvack.org, patches@lists.linux.dev, linux-kernel@vger.kernel.org, vbabka@suse.cz, mhocko@kernel.org, mgorman@techsingularity.net, willy@infradead.org, liam.howlett@oracle.com, hughd@google.com, riel@surriel.com, rostedt@goodmis.org, peterz@infradead.org Subject: Re: [PATCH 2/2] [PATCH 2/2] mm: add merging after mremap resize Message-ID: <20220527234657.nsn6e7jjwttblzyi@box.shutemov.name> References: <20220527104810.24736-1-matenajakub@gmail.com> <20220527104810.24736-3-matenajakub@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220527104810.24736-3-matenajakub@gmail.com> Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=shutemov-name.20210112.gappssmtp.com header.s=20210112 header.b=BSKfdkBp; dmarc=none; spf=none (imf31.hostedemail.com: domain of kirill@shutemov.name has no SPF policy when checking 209.85.167.47) smtp.mailfrom=kirill@shutemov.name X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 334982005D X-Stat-Signature: c14brepcqoyt7d3pxihxxn8wp1g957r6 X-HE-Tag: 1653695065-642577 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 Fri, May 27, 2022 at 12:48:10PM +0200, Jakub Matěna wrote: > When mremap call results in expansion, it might be possible to merge the > VMA with the next VMA which might become adjacent. This patch adds > vma_merge call after the expansion is done to try and merge. > > Signed-off-by: Jakub Matěna > --- > mm/mremap.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/mm/mremap.c b/mm/mremap.c > index 303d3290b938..c41237e62156 100644 > --- a/mm/mremap.c > +++ b/mm/mremap.c > @@ -9,6 +9,7 @@ > */ > > #include > +#include > #include > #include > #include > @@ -1022,8 +1023,11 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, > } > } > > - if (vma_adjust(vma, vma->vm_start, addr + new_len, > - vma->vm_pgoff, NULL)) { > + vma = vma_merge(mm, vma, addr + old_len, addr + new_len, > + vma->vm_flags, vma->anon_vma, vma->vm_file, > + vma->vm_pgoff + (old_len >> PAGE_SHIFT), vma_policy(vma), > + vma->vm_userfaultfd_ctx, anon_vma_name(vma)); The arguement list gets busy. Maybe some variables would help. Calculation around vm_pgoff is not obvious and requires some explanation. > + if (!vma) { > vm_unacct_memory(pages); > ret = -ENOMEM; > goto out; > -- > 2.35.1 > -- Kirill A. Shutemov