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 D6B86C433F5 for ; Fri, 27 May 2022 21:16:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C9E7F8D0006; Fri, 27 May 2022 17:16:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C64838D0005; Fri, 27 May 2022 17:16:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AFA828D0005; Fri, 27 May 2022 17:16:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A00A18D0002 for ; Fri, 27 May 2022 17:16:43 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 630541619 for ; Fri, 27 May 2022 21:16:43 +0000 (UTC) X-FDA: 79512782286.30.0A7EE8D Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by imf07.hostedemail.com (Postfix) with ESMTP id 9133340035 for ; Fri, 27 May 2022 21:16:31 +0000 (UTC) Received: by mail-ed1-f49.google.com with SMTP id v15so4419686edl.9 for ; Fri, 27 May 2022 14:16:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i6lPNcDzycIov1mSkrT1DuTIerHURYERHQ0SJ25h8ww=; b=SoBDYj9niVpCHTx5kJvkoGyZ8mBE7SuG/84fscSrduUQp5/ePxiInmUat6IaNSgsWR ga004ByY6lw6IyWbt1dkH46Wj6IaADkMP3e5Gr3o/YxGu7aLpNsUSeMImlSmPOV5JL9b MYZK/V+iUSyuYcIK8JFWFYdacOEe5yZ7LExyb91R0DRWdJAnW9ujXjGT1dN84xF1og+d vUZDh5DE6ZhFqolekBXBC9iauZdKhFOKYHdJ9unGcfGmEMYt/yuM1k4r8H/RDsTUx7AN isJw5LmdbEKVHxH2uzfveIU92LLMo+YNrBVdUuMQA4ivCIozuBJlQKuiAhEDpc4eXWyg xFtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i6lPNcDzycIov1mSkrT1DuTIerHURYERHQ0SJ25h8ww=; b=H0b6E9b+gRmcMroweABi6mZe6QaXfJP9U39T8jMNjbM2B17bv7xj9nQIblcG4QQ3O6 C4I+AJquPZR3pK5KSYv6b8Y5B0KX1zzg2+yC30jfGr+vOeykB+6FLN1h+14JQdoVcXyE aW8hrKrhVdYNjJpP9JQSphH+2gvJKdmWqmMUo3CDj5pIdv5gH5NmYxqTNYs9eQfvIZwl 3CN6c02MdepWQJuGs15/CRx6FHket0cOHtWAnAqo6jb5GLGZIIQk1x0DAOy8PuLOn+P1 ++x3JqBUiwii9OsngruqRZ+eAWc/+XF5Tdsjh+jeSiWhJDDswTvsUXutj7oTABS9iVvH WWTQ== X-Gm-Message-State: AOAM532BRsyFcjkA7X84rVY+lLCiGLTMc6BAi4iLSgmH8+xz4ufAhMqH YqQNYLqKyaM7KEM1nyWKT3M= X-Google-Smtp-Source: ABdhPJxFAs7eRYdqOiXTG1ydQhgXTOtFZa6dkQhVCr12wsO14FNnGTH7jFVGtNHeUysMTLDZpoIM7Q== X-Received: by 2002:a05:6402:2071:b0:42b:dfa4:d4e1 with SMTP id bd17-20020a056402207100b0042bdfa4d4e1mr8968698edb.70.1653686201430; Fri, 27 May 2022 14:16:41 -0700 (PDT) Received: from orion.localdomain ([93.99.228.15]) by smtp.gmail.com with ESMTPSA id o8-20020a1709064f8800b006f3ef214e70sm1746739eju.214.2022.05.27.14.16.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 14:16:40 -0700 (PDT) Received: by orion.localdomain (Postfix, from userid 1003) id 14EF4A0019; Fri, 27 May 2022 23:17:10 +0200 (CEST) From: =?UTF-8?q?Jakub=20Mat=C4=9Bna?= To: akpm@linux-foundation.org Cc: 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, kirill@shutemov.name, riel@surriel.com, rostedt@goodmis.org, peterz@infradead.org, =?UTF-8?q?Jakub=20Mat=C4=9Bna?= Subject: [PATCH v2 2/2] [PATCH 2/2] mm: add merging after mremap resize Date: Fri, 27 May 2022 23:17:08 +0200 Message-Id: <20220527211708.839033-3-matenajakub@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220527211708.839033-1-matenajakub@gmail.com> References: <20220527211708.839033-1-matenajakub@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 9133340035 X-Stat-Signature: mfwy6q3r68xapjhraw1qjf4k7igeized Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=SoBDYj9n; spf=pass (imf07.hostedemail.com: domain of matenajakub@gmail.com designates 209.85.208.49 as permitted sender) smtp.mailfrom=matenajakub@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam09 X-HE-Tag: 1653686191-794779 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 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 303d3290b938..21dfa15e8200 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -23,6 +24,7 @@ #include #include #include +#include #include #include @@ -1022,8 +1024,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)); + if (!vma) { vm_unacct_memory(pages); ret = -ENOMEM; goto out; -- 2.35.1