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 9010DC6FD20 for ; Tue, 21 Mar 2023 20:46:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C87FB6B0074; Tue, 21 Mar 2023 16:46:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0F816B0078; Tue, 21 Mar 2023 16:46:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8A086B007B; Tue, 21 Mar 2023 16:46:24 -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 94F4F6B0074 for ; Tue, 21 Mar 2023 16:46:24 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 55FA01401EC for ; Tue, 21 Mar 2023 20:46:24 +0000 (UTC) X-FDA: 80594088288.12.DA317D6 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by imf20.hostedemail.com (Postfix) with ESMTP id 3E03E1C001E for ; Tue, 21 Mar 2023 20:46:22 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=VhCMBbTc; spf=pass (imf20.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.53 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=1679431582; 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:references:dkim-signature; bh=JJZvn4i52w6uqtdykKTHiGurQP95OxTlrYhIRyImreM=; b=QAwxfHcMseUrGmoDfXvuItgDkw6lkPHqiiKoCgMHHW2j40vsYiLh+BaH8Fwd5B70dF0LdK g0+KIKfmvR1xwx86ueSG5R4kCrZAK3EVavEHL3jHE5+LMVnSIp+9HKBtpcVOYODjxQH1UI 6ljcIkzdFksGx/tLi+TZu6S4/g1Q8W0= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=VhCMBbTc; spf=pass (imf20.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.53 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=1679431582; a=rsa-sha256; cv=none; b=ZE6bs/Eoa60hxctpNcAib82n1qy+w0qIj4axgb6KTTF45cteQ1Qv0GIDCohwjhWpfZS54Y qR+2xLIFni3SY9OQhT4m4JFotT5G33iYVacHc3KDmBXCSq2bgQnoS/1cBV21X8amTCNSwI uhuQKyVVAd0aGUE4qIlmM90Em4GZe2E= Received: by mail-wr1-f53.google.com with SMTP id d17so6593105wrb.11 for ; Tue, 21 Mar 2023 13:46:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679431580; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JJZvn4i52w6uqtdykKTHiGurQP95OxTlrYhIRyImreM=; b=VhCMBbTc1OwR3ws5VjY1dvQYOrgszHYil4QhEBOmCLwzpY+7XdOZal9kptjh+z9glZ MiPXAojzxD95F8ZCsKXzE3PS7Vz0TXzVBjbZ+N3LLtrd/yA90/61Sh4YVLFxRKIaSktC PGXuRw4GjxulKbm+uw44ROlfhv22Ode6s+ii5EXNXG4pdZ9OWMyIwIdzb+MEkuNpJSEl H7KdnfPSiDsY29b2dwIz7fdOHMu5yZClfoVbQCHZ29fCDZ/RfimUnvrlabYOK7kvNivC aa65t++CkEfaQ6KiFXlAs++svwoE5EeNIdsjPTNs3aTOnRM4e4FtbZveBZTJ6RwLGM7w lODg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679431580; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JJZvn4i52w6uqtdykKTHiGurQP95OxTlrYhIRyImreM=; b=J5dfjXu4xZvoIHL3E0mMMq+js+T/kZuBZ4ngyDBBIcijYYp65TfGFNJF/g0efq2WoH PKt1mAZ/hPyFr7GEO24ckaeQYuhUal16YQx+WmYZkIrm8qixGdVkhpq2xMIaFHfXCPmf M8fK141LpZPi0a1WAZnaLKJNsxwT1jMZDG3r1mMILo6NK63lsoJAT6fmg+QfM+NESmQ1 xvEg0l4H6TlUx66jlI38bPM4A6nKfajgiQFdw4bZlDwQLscI3KX1bHd+4PDAhtdmAsvd 5b+JHlNV1tHCDDFvBrXI6QyApUdT8NSLe1qM2JA18a5hV8ZvoEc3q5gSeooBc+ZIpw2y f6kg== X-Gm-Message-State: AO0yUKVegQb18Pav8zSInklmzePBZeVo6GwNGcgcDr+KfuWwTb83rfLK +ETW5y1ri//fSfziZ60FdkKPOXejqfo= X-Google-Smtp-Source: AK7set8T1Bjs3C6ZFaqvWMtG5bf79ANPDPm22WVuGlwYFMNYV09cRjIKur+a7WziZ+AGag5aEINiaA== X-Received: by 2002:adf:e484:0:b0:2d8:a7df:bce9 with SMTP id i4-20020adfe484000000b002d8a7dfbce9mr3226350wrm.23.1679431579946; Tue, 21 Mar 2023 13:46:19 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 13:46:19 -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 0/4] further cleanup of vma_merge() Date: Tue, 21 Mar 2023 20:45:54 +0000 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3E03E1C001E X-Stat-Signature: y669swopgp5mzk65tb4n8mfmm6h7hp5s X-HE-Tag: 1679431582-199191 X-HE-Meta: U2FsdGVkX19GPm8iZL9/ombHA7l/BEppr3JVK1lal5TWuiMOYD0rL5P+w5sNR77YKlujYq/0D+VhTY6RDRGF1obJlNgNbwHlxGMEwOLfQURnMFRouLkHwqUCsxtQIVC8DYADetRBr8XsSLFsCxj19SuUF60mgnSxRgtPYS6SkGiS24QnVBOENYI4sakZj+2WUQytKoiu4cfZmewYJEUcNimxwJ94Wkc91DNxU0ze7MPtzbXrGXYLF6ONurgxUs8D2fx1tYYcdWz10cDr3frmdahojTw9vtRHX7ELmUjlWExgYiCSHdpzXKONM7b2Q+9CT/9a3iMtg5k4jTqRVt/WB4PdwPMjCEP0K8st8+2Igz06Ck2dUXWoSkwAKwjzOYvEBeZunf4hSPGEay7ILNt2X2jAShLoTPcWhtjfl3BWmqodxT08IXjYlS4JpyIPO0DrUsiTzASPb4DWYRr3r2K1R5QrRQTrfkr7cii7h57gz/IO9ELgiNanXbIoQw9loM3ViWXWLoaxIMufysf46mKkfM18wausTwab8sEip+wpKFun/OWg9yD2OcOaMtrX238jQam4qPkL6m6Kk60ucAXLIi1kO6EpfjBxjbnDz2hwHtY1tCJo8L8gSNdXZpRKzf/xo3Z0l/NG7qwNhraZr5zWkt55VLwSnC23SNWNxbPcAuYLLyrcvVBopxvJodO6wXcoRmBW11aFpMvKOJxYMD4KSNVvWObEk32R3YSpMfMGv8pD1L68Pv9ujtTHbQjozHXEtCo3A9g9jxexSqYUhOcsrRNBKjKYUMsth2xZa7/24cisE/sCMlRZhVjGpLuoGl7YgHl281CLd/YCn92lSFmgk08ylIo0ZldBgLP00Qj5FMjco2DynmWSsotoyAUST+nN5IP56odNwueBW75M0d6SvaND/tX4ri9K7I2TF0/u23mqrTUJJMVSlFkmTRTNbcD9GWWqHlpIB0R6dEJj15L MNGVpjbh wcHxTsEDarnWTSg3TS56vQ+1dAkCxG7/+K/u41kDHOt2dwABonfh4OeMyQs+vbRnPpqfiw+xwXjqIX1qTi94vVOvfiimP+vLUUYt7O9XTPKq96rLGchWDlyZ3vgRrksOfpZ1p4SvmXOsmiFTT3s1DFuYcwG5DmPaTEd0K24RObVxOBL6FNcI7njlghxNlVeWIR+iuHE/0MWSfLyKOHw4MMIprkqN2Q8b183RYDYd3UfHI19Vr8UFTChdInGUiquzotPbn3+B14VU6IfMa1w3bilRulWgU4qQWb7DkfFf9F0imBmRa6xfhD0Xm2sYjSn/GiutAzy5zOgKQaFBU7l83nn78rwUaZi5oMGLRSmg5qJ2DvjeJonv+KkxfMxjzKQo90LZWLmyA50h08qEfkOvtWshKYpENwOHdzDv+4+F2GKKnoknQz9kTTF93jduOsJY85SracI4oVsJyyVdfoXunc9YNTA0DX3qORlhC43T0Wcn0WdM6+97Hsl+Kj2ChxLRvp7Mpw8WkNxsLaLvdzEaS9RMp4ag07mKvhvr6EKwjgD6Z6LB5J3QYZdzL8A== 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: Following on from Vlastimil Babka's patch series "cleanup vma_merge() and improve mergeability tests" which was in turn based on Liam's prior cleanups, this patch series introduces changes discussed in review of Vlastimil's series and goes further in attempting to make the logic as clear as possible. Nearly all of this should have absolutely no functional impact, however it does add a singular VM_WARN_ON() case. With many thanks to Vernon for helping kick start the discussion around simplification - abstract use of vma did indeed turn out not to be necessary - and to Liam for his excellent suggestions which greatly simplified things. v2: - Put the patch series on a serious diet, cut comments down to avoid bloat. - Added clever use of find_vma_intersection() and vma_lookup() as suggested by Liam which improved clarity + brevity significantly. - Eliminated the use of a temporary vma local as suggested by Vernon, it does seem this was ultimately adding confusion and Liam's suggestions eliminated the need for this. - Moved around initial variables to be more sensible and to initialise each variable in one place where possible. v1: https://lore.kernel.org/all/cover.1679137163.git.lstoakes@gmail.com Lorenzo Stoakes (4): mm/mmap/vma_merge: further improve prev/next VMA naming mm/mmap/vma_merge: set next to NULL if not applicable mm/mmap/vma_merge: extend invariants, avoid invalid res, vma mm/mmap/vma_merge: init cleanup, be explicit about the non-mergeable case mm/mmap.c | 155 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 80 insertions(+), 75 deletions(-) -- 2.39.2