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 2400BC6FD1C for ; Wed, 22 Mar 2023 20:19:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 389D06B0081; Wed, 22 Mar 2023 16:19:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 310806B0082; Wed, 22 Mar 2023 16:19:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13BE66B0083; Wed, 22 Mar 2023 16:19:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 05BEB6B0081 for ; Wed, 22 Mar 2023 16:19:13 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CAB211A05FA for ; Wed, 22 Mar 2023 20:19:12 +0000 (UTC) X-FDA: 80597648544.18.2715BF8 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by imf03.hostedemail.com (Postfix) with ESMTP id E4F3D20018 for ; Wed, 22 Mar 2023 20:19:10 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JuadwNsI; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf03.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.48 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=1679516351; 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=Y03ABEGM1iKLlme/gXEiM5NZEzoEuVUqbJDwPp/dx0w=; b=rDd8S+alAlNZ/v8bIn765d5XgYQNIrg5IcllycViuMLnRuR9CaXTqXh92gJ64XxLzuSERY k3YHgKG15xu5wFgZnHx4IVlFHC/DUaDwXEui9DfBcqjXCv3DyAX19mjRiEbp1hpqVGEh8O 8H5oQmSMw9MkEjp4Lokc3LoXGb5ISGQ= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JuadwNsI; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf03.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679516351; a=rsa-sha256; cv=none; b=fT+iAhw6FDXU9M81xI/FnaHyco9dWJx9nDRj+9KDUmE0dXbiNgv3xbDEDUj8KFic1o+o5g 37c3+AQTWHCT86c1Zm1v8I7JqwuFSSsA4KetFrM2Jj9FNJtI4BFUTQsH9Uf72xsKtKZEuL cT06soQkOUdPAY09qZZ01/hK3vbdihU= Received: by mail-wr1-f48.google.com with SMTP id j24so9453365wrd.0 for ; Wed, 22 Mar 2023 13:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679516349; 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=Y03ABEGM1iKLlme/gXEiM5NZEzoEuVUqbJDwPp/dx0w=; b=JuadwNsIZE2z/zJh7KttoUHsZSOV64bXHf0wYV3NZRNw5P46APeVp2CD4NtQ/UNFTD lXrA+LRbhk9k2I23hap3SdJ90UMtx27o1hpcOQ+E0v8OsA6ztAd10VE7wDFuG1PnVb8J OyEMM8C0lVxo86bSnXgbpTyxmeTW34oOYu6U5MhfG0xdl7V7x16YSoIGdkFexrHIp1Dy kDv1lJ6sWMoFMZIYcBvT07cPXsPHRZ5utbgYPAdba1yjeP3JSnWVG548i+FYJI0YDVSz BWK9c4xb0xohwyvPbD/QU6s1alH+WhC112pmLlMbykAMnICx14EfTpYTP5tYgXQFrbDT GsMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679516349; 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=Y03ABEGM1iKLlme/gXEiM5NZEzoEuVUqbJDwPp/dx0w=; b=NUfUAUkhDueFz9GiVLL95n6xWF8Souy7/Cp0ersx8/2/5b4aA1AyCYvg+K+0TwqkfH iV/qmXuw8Khf6T4awovEQdYdJN/X0Jr/Fqo+viIELPefI7vnnfoMEZhSBl1VRcCP/53N YMJHi94aMHuP/vz56FCMTgpUBlnHELIQq/4e+WiVRBSv+6ZssYdXKU/h1jwFviSkRZZT O7H9A6NGz3t5QLVbMtuPRNTn/6GzSfFvL3H7qOu1yQCZh+8L4/FHwuoxT/ZfyvVYAgAV f92HHiGp6qNRpu4I2shgHLA76IVJ2DXQt1c96ewCo7t+19ewrCRr7oSyT0JgyHAEe7RK He/A== X-Gm-Message-State: AAQBX9eRN9Itw+CmXFMrkhzTQK+DNHxYEPmG1X0jhSplKkVMkPVe+iN6 5EWMdPWovVnQfXVduD9RZwanMDqZ3QA= X-Google-Smtp-Source: AKy350YjSXpKJOG/me9kHcIbf3a1DDS+FBHwNhe1vy7I5CQPb9fmUP37fZXOYz52TdKxRyZGjr1yuQ== X-Received: by 2002:a5d:640b:0:b0:2cf:ee9d:ce2f with SMTP id z11-20020a5d640b000000b002cfee9dce2fmr923855wru.19.1679516349137; Wed, 22 Mar 2023 13:19:09 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id e4-20020a5d4e84000000b002ceac2ccc4asm14570690wru.23.2023.03.22.13.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 13:19:08 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: David Hildenbrand , Matthew Wilcox , Vlastimil Babka , "Liam R . Howlett" , maple-tree@lists.infradead.org, Vernon Yang , Lorenzo Stoakes Subject: [PATCH v5 4/4] mm/mmap/vma_merge: init cleanup, be explicit about the non-mergeable case Date: Wed, 22 Mar 2023 20:19:00 +0000 Message-Id: <99259fbc6403e80e270e1cc4612abbc8620b121b.1679516210.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E4F3D20018 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: ssft85i3o4o6gsu84inj9fuowy4mt38n X-HE-Tag: 1679516350-241352 X-HE-Meta: U2FsdGVkX1/DznJZSk2CQ71eR/BkaWeL5UeLgdMbeOHyHVyAuvJ1YjgyL4tFRBx4KrlO0dIRFEN128RFll9eZGgrceAG+GK4mkPdhGklErtHW1zm9Y2gt4OcYCLloEecQqFPfKZKOBGxZB4cclqWF4YwoF35b5LMsw2ml+fuoe/MndoejPYPYYhM4tP5MyNnxqpqCwe/c+Fs1F2KO1UZiD7x8RoTG2fyp0Fg/kIfrtuTzJI4ovEuTcj+l2Z8YSo6XpNwk7nrsAYrDoTN+Qi9Bfpl1HjvPMEPjycSQlJQdA9eIAp3hC+T+fP98vFAZRixTnoSdaww8ocsEAM+LOmAXGOcesaDnrPhAnsOO/1mcbr598TmAq76ezwMv6cu5TojqhFPt7bOylm/buMHW/4ZgqFrMrFQ7IGujFv4WvC0M8ZkdMGP4HkG+NL96xp8Lqkbgn3aCXJg4y8XpKISWX9AFGIc70MADnpt8H2ZXviLP04VC2lVQLQarS58lt9h0BuzV5leGVmJ2jDPzRMIEWJj0hKTy9l9P6rFqGFCNvrcdxLQcN8NUY9EpBh0YF7SHgJfSGwioD9Q4YthuEAo7EWWX2M2VlquZdnS39cXHrlH+D+aPO5bagndOLXNK9hDE0F+GA71PXrAHa9/uZetPPzh8VsYYXqgBH+FAue6f5NCfKYATWIfBDn/uuupKim6WUyKLfKoHzGhBENSmAxFqJi/8+upzA85Um7HMf2Z3NqLGrCiHP3E11a2IM+VmbmCkbzL37m34+xiovxjzrRxZJUKk+9CYIcLbFU6ktjNAV8SRxPyeAnK5gweyV4Gr85o3wNAQN2pR0COql1nZgwVLiG9JmuV0kjR0hwM/wW/kIT6vOI3GF/S30JzNhrvyvFayeSXzyAutwUoMDOBakDqCt2TrY1lAacW4+8PgTJcwLifzAo1VFgL1YPV3b0qfydFMj0a8CQ6lfxIq++uATIQKco uz4UNZEL Lsyg/lrG7tTDujvIDLUJnVl+9DihtFXvkb01HEGiP9J1cY7divUDt9M/RiSnlu5J/3CmG3nlmC3G1UuBZXye/NnMs/roHjfWLgm9T3mqzCFxOAGSM+HfgxiKTKQX6fR7Epk4snTH0wYU7g8vomedeOOTFhaz2sO/2TgGoeupO6lmR7bwZr75uOT1mEdz9W6Or0+weX5FMApUb7PKc0nmiIOcjMQDeKSvGrqu5k0m8XE8x1Udkcsr+vLObFkT3HZ+1Q2/waQ8Guaiw6sSk4SdXxbhT0BVO2n1pBLMm0CBS1EPsgM5QsEVO08ixMLjczd8eandnUK0WWcGH7qD7XTGhnMFziz/LeaHU1wGfcKq82cFgvp5NG+0R8VzRia7BmWhlUhBxthSanyC5LBwscrvqgU03MotEAg6+G7Ws8KZgONrXossA3Z1JP8cF+89hqwe/TtKtImqXcUXUzLd2Ogx0vRvG62z2t1o2TYknsaBmwkJZ/WU= 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: Rather than setting err = -1 and only resetting if we hit merge cases, explicitly check the non-mergeable case to make it abundantly clear that we only proceed with the rest if something is mergeable, default err to 0 and only update if an error might occur. Move the merge_prev, merge_next cases closer to the logic determining curr, next and reorder initial variables so they are more logically grouped. This has no functional impact. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/mmap.c | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 2a4f63716231..1064e6341a7a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -909,18 +909,18 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, struct vm_userfaultfd_ctx vm_userfaultfd_ctx, struct anon_vma_name *anon_name) { - pgoff_t pglen = (end - addr) >> PAGE_SHIFT; - pgoff_t vma_pgoff; struct vm_area_struct *curr, *next, *res; struct vm_area_struct *vma, *adjust, *remove, *remove2; - int err = -1; + struct vma_prepare vp; + pgoff_t vma_pgoff; + int err = 0; bool merge_prev = false; bool merge_next = false; bool vma_expanded = false; - struct vma_prepare vp; + unsigned long vma_start = addr; unsigned long vma_end = end; + pgoff_t pglen = (end - addr) >> PAGE_SHIFT; long adj_start = 0; - unsigned long vma_start = addr; validate_mm(mm); /* @@ -939,24 +939,14 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, else next = NULL; /* case 5 */ - /* - * By default, we return prev. Cases 3, 4, 8 will instead return next - * and cases 3, 8 will also update vma to point at next. - */ - res = vma = prev; - - /* Verify some invariant that must be enforced by the caller. */ - VM_WARN_ON(prev && addr <= prev->vm_start); - VM_WARN_ON(curr && (addr != curr->vm_start || end > curr->vm_end)); - VM_WARN_ON(addr >= end); - if (prev) { vma_start = prev->vm_start; vma_pgoff = prev->vm_pgoff; + /* Can we merge the predecessor? */ - if (prev->vm_end == addr && mpol_equal(vma_policy(prev), policy) + if (addr == prev->vm_end && mpol_equal(vma_policy(prev), policy) && can_vma_merge_after(prev, vm_flags, anon_vma, file, - pgoff, vm_userfaultfd_ctx, anon_name)) { + pgoff, vm_userfaultfd_ctx, anon_name)) { merge_prev = true; vma_prev(vmi); } @@ -964,13 +954,22 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, /* Can we merge the successor? */ if (next && mpol_equal(policy, vma_policy(next)) && - can_vma_merge_before(next, vm_flags, - anon_vma, file, pgoff+pglen, + can_vma_merge_before(next, vm_flags, anon_vma, file, pgoff+pglen, vm_userfaultfd_ctx, anon_name)) { merge_next = true; } + if (!merge_prev && !merge_next) + return NULL; /* Not mergeable. */ + + res = vma = prev; remove = remove2 = adjust = NULL; + + /* Verify some invariant that must be enforced by the caller. */ + VM_WARN_ON(prev && addr <= prev->vm_start); + VM_WARN_ON(curr && (addr != curr->vm_start || end > curr->vm_end)); + VM_WARN_ON(addr >= end); + /* Can we merge both the predecessor and the successor? */ if (merge_prev && merge_next && is_mergeable_anon_vma(prev->anon_vma, next->anon_vma, NULL)) { @@ -983,8 +982,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, if (!next->anon_vma) err = dup_anon_vma(prev, curr); } - } else if (merge_prev) { - err = 0; /* case 2 */ + } else if (merge_prev) { /* case 2 */ if (curr) { err = dup_anon_vma(prev, curr); if (end == curr->vm_end) { /* case 7 */ @@ -994,7 +992,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, adj_start = (end - curr->vm_start); } } - } else if (merge_next) { + } else { /* merge_next */ res = next; if (prev && addr < prev->vm_end) { /* case 4 */ vma_end = addr; @@ -1010,7 +1008,6 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, vma_start = addr; vma_end = next->vm_end; vma_pgoff = next->vm_pgoff; - err = 0; if (curr) { /* case 8 */ vma_pgoff = curr->vm_pgoff; remove = curr; @@ -1019,7 +1016,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, } } - /* Cannot merge or error in anon_vma clone */ + /* Error in anon_vma clone. */ if (err) return NULL; -- 2.39.2