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 6492CC6FD1D for ; Tue, 21 Mar 2023 20:46:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D9376B007B; Tue, 21 Mar 2023 16:46:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 11582900003; Tue, 21 Mar 2023 16:46:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE793900002; Tue, 21 Mar 2023 16:46:26 -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 C4D3B6B007B for ; Tue, 21 Mar 2023 16:46:26 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 784BD1401FD for ; Tue, 21 Mar 2023 20:46:26 +0000 (UTC) X-FDA: 80594088372.19.3EB6A35 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by imf27.hostedemail.com (Postfix) with ESMTP id AA2484001B for ; Tue, 21 Mar 2023 20:46:24 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Z7Gjn1KM; spf=pass (imf27.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679431584; 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=M+P4r5ohjfdtTt/Mfa4qHdLtxtbZQxPh6y+eJBbFwbQ=; b=iUaw/HueFRIXPVPm7vI+4zqWLDVGItuSEqug3p1Au1sY0p5EgAqpynxPOnCpysOOGcvm9s kre7fa5rbUDUVG8oBWtIza6r7Hsz0OqGGKKzrZfhsRM5nzB64Ih6ZRKtt3r1w9XBTeyAQR 19iMgcsKpSp8daWFXD29fVOD7ALyQ68= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Z7Gjn1KM; spf=pass (imf27.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679431584; a=rsa-sha256; cv=none; b=oXDCWCMzSz6ghoU3QBlMgds6IOnZlDrT4HC/Rx/6GPn5IdYG6iM88seWz0XV6EY6JZRTvL Dz57UPJhsUjQ9o8lkro9CxnIKi1RiqS0krN74rgGrly3u167/5GznYOmh+IJ9ckTr8PTM3 RomxeoG5fSm9sDfLH+7rqqzxstBdpqA= Received: by mail-wr1-f48.google.com with SMTP id r29so15007720wra.13 for ; Tue, 21 Mar 2023 13:46:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679431583; 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=M+P4r5ohjfdtTt/Mfa4qHdLtxtbZQxPh6y+eJBbFwbQ=; b=Z7Gjn1KMJVHvSI9APFNDg5uxS4keAM8LnCBQVHmEJD6yDXb22mgga2nC+Rwzpa3IcL RxnTpVHSK77c6WZjwYzcArWUEA11ZTfmBWGOCiHBjlXCKMRLXbs81gxYbP0IC48tal5g WRJExwimKVuHKEA3MMDUsaZEbLPRcUotIfTZpvdQWzQTIqaBDRVsGhmIY5eQjn/HmVY+ XB0ATW0xXz0JuaP839CKl/ExxesBCdeUyAjy45Hh+FiqMp4s1wi7/fmRN5+bjFdvP5ZS rvnko07nNRULJxK6AZtA4g7ZSCwxAA7z/iW+KMHwVR1NYBWCtfQtc4ZIRSNP4n/KeGhS c2IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679431583; 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=M+P4r5ohjfdtTt/Mfa4qHdLtxtbZQxPh6y+eJBbFwbQ=; b=l7SCCTs3NU2JjE9FrsnZdeNi8B+qdZluRNu59sNsvGmAzWU13lBwx7LBe05vAgamYO J1GF456sb7nbDPKwAMTfMbpAuXAZ8inLshnSRnsJh01HQt0JCXvczmJrX45uQk1+bGTG n3YvvlnYljG/ADbXFurAcuS5TVY2E4ZB5uUmt8bTkaZ69MK6WCq4Iq/HBnuq/vtyFL5d 72MlZ7jt9/S6AK6JElUom5j9+m5zK/+l/mgCJnQzh3C20OX07HDVRIlOmr7fx/kz1lih xym348ZXTqGr5gZYtlrNSCafgOaKTQDv+78TvmZwIJIQIlxzhYc2bymfcIjZJ5X/bDYP Mx8Q== X-Gm-Message-State: AO0yUKWJFl3C29UdmrelQ1BUb1DAWJ9ZAjI9tIEzqEveCdLxNEvx4Jxj ebXjVztoy7wKqdc5d1dJ7dN804L4P9I= X-Google-Smtp-Source: AK7set9qKf2MHVF0+P2hb8JkRBr8OZ1hgZ3RUsK5mnnQG8b6+tURR09MpVh1Xlja767sSCFdhoOAuA== X-Received: by 2002:adf:e242:0:b0:2ce:ad40:7705 with SMTP id bl2-20020adfe242000000b002cead407705mr3296806wrb.25.1679431582801; Tue, 21 Mar 2023 13:46:22 -0700 (PDT) Received: from lucifer.home (host86-146-209-214.range86-146.btcentralplus.com. [86.146.209.214]) by smtp.googlemail.com with ESMTPSA id a4-20020adffb84000000b002d322b9a7f5sm12142491wrr.88.2023.03.21.13.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 13:46:21 -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 v2 2/4] mm/mmap/vma_merge: set next to NULL if not applicable Date: Tue, 21 Mar 2023 20:45:56 +0000 Message-Id: <3506997a8146a287ec13ee7a53cf916707537bf8.1679431180.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-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: AA2484001B X-Stat-Signature: dsofedo39t8ucup1ixyi5ci318gwsueg X-HE-Tag: 1679431584-111544 X-HE-Meta: U2FsdGVkX19SR0+2Z1XVcfLGwpCTEqNb6hQnA7Bg4qOY4wzKK4rzMX1I7cT13yEPLyS3X+B2t58NDswKHlZux4gAzZX4TaUMTkCC6xD7PjuhpIeW3wR8i+DGc1/3IiOtQe2qADnM/1vzNlkaQqW+B7VHG+0l8Snk8gbR6QonCjQbcapFkFVk6WtNJ0mvTHBGHIvC1El8Cf/va/0er5iRG2DoRh9D/OvTAXY/+0Oa/j6fKCqYsDqME5QAx1SfFdbQY1k6rlwseuMXQeNXwrb8nDIgNT87iQ4xr0/ZFi205mC6vmEFWMdCD0j8vBI6DZyrszbrNoAhUpNktbN5X+B67jtZNQERJLV0/j7L1/NwdwOVOgZKPnOiQ3uMFwuLNqb88kxB+6+4d+ex0CBPlcoyzFGo7Zw91YgL7zGvRyQYMMMa85ow40HYG3xlvlZS/fmFDl3s40Cqfge9BHFZ3tBTfRxu1kSDloEJQydNLIl5mUZ4RRun3zqF3bzh/SqkFcJR/BHkVRU13nv/7yPkeyd/WsQCGZl+5zamnsbzifQCwUa87NX2e37uvf9VaiRYhxIz3tDYPW+K5lS2iSTrYRD98mp4paIiYydCyQSKAwmbufipgqnfJO0Jz6HprHt9KO4Mno+9VO0HHBpKL2O54O6fcCC3K7mZbbKKxyaj498fVriOdnaJ2dDmJuwolvQe8ry0wQz7T4RoJrjmPoLcBrmXNY805cGQqgVNXeYsg6mvkJCsz90lDALkKdG3AM/Z879XSxhdtGiHqVlv0nW74S7ToqNQxVe1bTfPAtAW069S5icc2PQPDFRLOMWL6FH/JePu/BzhVeL9Ai5S4ADcgF2x3hJ11KOh4PF4d+ECjjET98VCCfm6LqvxpdQu+iQtR6aQFs28w6eFgtvux10wCuGHtBKkGlJpPqxMU70AE3Vm4xTwPkV3i8VroIG5HL8q/eCKqyAOSlDmIXuYH+7THOW /M0yADAE c6/mzz74pCPwVilglucxXNgn2+jlyBTF9XjEC13WpMctv+6/U3jwmSalm23b0P69VBirKePyVS96/oCwht8Xim0tQXYUjnpvwK+OuybQ7Mz6YuKaaFwes+MZ//LN07k4FiMJ2yN/7UdK9UNeRQf8tLU2bDm/jgtf8FmZTPADNfi1mHvvZFpDJsowjlrtVwGWZ0p5+qFuzeOqG6BHT4bwpJETnOLuVlgUySOs2RSAUclgGp91hnsXXWPVLTtVh93A4GCvvOF/+IaqdGMIAwaJj32PD5Rsc5GyOE61PH1GV5xw0qpYVYnguWxFT3aCV99yvVne9Fh7rj/OzhixHwLeDqh/htDRTq9hszey+akEGKEwjbRFcuCVbSGJtpxPGPfTjg+fjSatQbiHvGQ3mi7NnYaXPO0xbUQ6Yd7bizudfm1VLAG08bKBYzbYNFj7YnqCsJVZexNr+Js7qHM+MyFa1zdDPAVB5SYBdI15x4aOR1QUnrgKd9doP0fetT9iw0UHp1erA 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: We are only interested in next if end == next->vm_start (in which case we check to see if we can set merge_next), so perform this check alongside checking whether curr should be set. This groups all of the simple range checks together and establishes the invariant that, if prev, curr or next are non-NULL then their positions are as expected. This has no functional impact. Signed-off-by: Lorenzo Stoakes --- mm/mmap.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index c9834364ac98..6361baf75601 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -930,15 +930,15 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, if (vm_flags & VM_SPECIAL) return NULL; - curr = find_vma(mm, prev ? prev->vm_end : 0); - if (curr && curr->vm_end == end) /* cases 6, 7, 8 */ - next = find_vma(mm, curr->vm_end); - else - next = curr; + /* Does the input range span an existing VMA? (cases 5 - 8) */ + curr = find_vma_intersection(mm, prev ? prev->vm_end : 0, end); - /* In cases 1 - 4 there's no CCCC vma */ - if (curr && end <= curr->vm_start) - curr = NULL; + if (curr && end == curr->vm_end) + /* Is there is a VMA immediately adjacent (cases 6 - 8)? */ + next = vma_lookup(mm, curr->vm_end); + else if (!curr) + /* Is there a VMA next to a hole (case 1 - 3) or prev (4)? */ + next = vma_lookup(mm, end); /* verify some invariant that must be enforced by the caller */ VM_WARN_ON(prev && addr <= prev->vm_start); @@ -959,11 +959,10 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, } } /* Can we merge the successor? */ - if (next && end == next->vm_start && - mpol_equal(policy, vma_policy(next)) && - can_vma_merge_before(next, vm_flags, - anon_vma, file, pgoff+pglen, - vm_userfaultfd_ctx, anon_name)) { + if (next && mpol_equal(policy, vma_policy(next)) && + can_vma_merge_before(next, vm_flags, + anon_vma, file, pgoff+pglen, + vm_userfaultfd_ctx, anon_name)) { merge_next = true; } -- 2.39.2