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 E033AC7619A for ; Wed, 22 Mar 2023 07:13:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48FDA6B0075; Wed, 22 Mar 2023 03:13:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 43F806B0078; Wed, 22 Mar 2023 03:13:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 308C46B007B; Wed, 22 Mar 2023 03:13:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 217416B0075 for ; Wed, 22 Mar 2023 03:13:12 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E4A31140135 for ; Wed, 22 Mar 2023 07:13:11 +0000 (UTC) X-FDA: 80595667782.11.06EB99D Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by imf25.hostedemail.com (Postfix) with ESMTP id 2D155A000C for ; Wed, 22 Mar 2023 07:13:09 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=OfGg+3vR; spf=pass (imf25.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.54 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=1679469190; a=rsa-sha256; cv=none; b=GStXFe9ZauqLsr3k9Z343CFyJXFTZ54R/4cBfnx5zvfQxCnFwwSti7n+tkNIMAp8b7jcpT Pv/1U8LXNSYWF16jqdsODGFO9e38JyjrRHpSk7QGh/k/Cdo8g7WRxzxHajs6QO/PwXA2Nc F0bUjgtYV4/1x6Q8DEgkIjnHd4ZnVQI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=OfGg+3vR; spf=pass (imf25.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.54 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=1679469190; 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=hOWk7YshIJ3bAzOKHevB0NjwThFmEQUviYz81y3yVro=; b=XFuWX+tMJ6IjJAnYPkp/hVCtLArjDqR8Vvh23KDeonBhYS9WEoZJrUaEi0wkue1X0Nvhs8 IX+ReZJ9zbwKKrOojy8NllLYR8HQVv8cxJJIFC7nJ9UHZjGvkSkeU5kdeZzNbS6/ArB/DI BQ2mRFHtWS3h9NqHYQfXo5Wp+8LwZ4A= Received: by mail-wr1-f54.google.com with SMTP id e18so4400507wra.9 for ; Wed, 22 Mar 2023 00:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679469188; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hOWk7YshIJ3bAzOKHevB0NjwThFmEQUviYz81y3yVro=; b=OfGg+3vRl0hYao7J6L4VmeF3SU8YV/Dx4kqQYkaTjG1leI45PZOqZi+gXJacEru9lo tP33YLN8dOKwUx7EdqvNIkDeLzIRUAkI+0qufByS0SyRE9vM4Txdr7aSmg/g1mnTuBaZ m/sXDdJbmzQskzKXpa2a5eKgpamXT7oGEaJxf08HB+3TXheSaIfG0ylFXtXHi/69UQxH tn8huyVWIqR3c0gj5PuF2E02N1XigRF97Cbmsx9jZDGxSENm7p+Ic2LXd/Hr5Eq9dbXY XkkvXSbNP+AQuxO3Q7tXtW18HVRSX2wR4owMiT49iXmq7Km2yDxtBiKpUotqYT679cxo eksg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679469188; 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=hOWk7YshIJ3bAzOKHevB0NjwThFmEQUviYz81y3yVro=; b=51ED/Ms2F3SLPZCdk/ZiQPUCB/CKAiu11OTSJdZQavxTi8Q7SNLYKomV02jBs8cnFw SkKuehXORtyLjpCCr1P51E5SrqTHLYVvhs6VG8rqndgFp9eLWwjZ+SCx1JMUCKpvnXk0 hwSljzk9z0SrukF3ZJBw9CKYy2/yXOHhr90aq8BjzTCDg/W2Y3mXPT8wIS4IXgkk56RL DBCp1a2+b2UR1Jb/pvE1f0DjEg/9Rp1sGvfmNMefoLmBhwflaPsywXLhqTYsrTUrlkjw 7gIDMmISZ9OkGT7XCc2wZmGI4g4MGZhyye24IH5Sfhr+m8qCwlN61q83dleAxCCZLN0o szZA== X-Gm-Message-State: AAQBX9eGxe29zS5ChKeHkdxXyPfA5IFel86GeeBmohuWuzhfArRGS8Qz aaQO4JlZB0rRBs3uONmP9kUhwoQmOXQ= X-Google-Smtp-Source: AKy350YsBorfu/JIqWuUd6pWRpKb6V8wI0uyrdpYeWiFLQq+ewqJB5vOX+/m1p+bA7UvV2dAsDTgOg== X-Received: by 2002:a5d:6408:0:b0:2da:a4df:d04c with SMTP id z8-20020a5d6408000000b002daa4dfd04cmr469529wru.19.1679469188048; Wed, 22 Mar 2023 00:13:08 -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 u4-20020a5d4344000000b002c5526234d2sm13290279wrr.8.2023.03.22.00.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 00:13:07 -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 v3 0/4] further cleanup of vma_merge() Date: Wed, 22 Mar 2023 07:13:00 +0000 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 2D155A000C X-Rspamd-Server: rspam01 X-Stat-Signature: dcz4y8o1a97a6u44y663g4txtxd9j7hf X-HE-Tag: 1679469189-496659 X-HE-Meta: U2FsdGVkX18TyCXpmIHR29DLaep0QDuVnlxRiVWN03c3AbR8s+7gwEiU3BVaJccf7OYgwf320CWu+EI9N5uG8jaEhhRQTTp91hNklf8ViQQ7D1PUFyZR1rNNMFkB2hxa0R/ep5sfpwTCRkide38UDycYkoFz443XstWskhPeQ+zJPrhCiR0cSuRTGDMWNtjLzd/za0aVxz0rrrmEUHi+Qr2R8Kc79pRGRcsf3TIK7mcgyQNtwlJUugm8crmE+e67Sqj/yJvi1lBKLdTM+T4n8DRxjFYV4v8F4hFyJQc+HWLdRY4+HvfESqg9LqSqaHXJHU6hGdnv3lpeZo3PHmDiPlpu5QC1Kl8r7+txvxVhlfhK59+UErnTZOMXoxyebPQUKmYhrdnjmkZ132A9zoN6pALhDcC2IGx8xaMHK3xAH4oGzz/dYm//socx61wGcXhSRKsNJG5k1L1j8h4947dn91TCrQIFBTee3QgYCIQ8BMkqxh61bs6qLyDiuo/IioSn4xyCKoShXNXvgOAaYJQpXudFFwvrdAkMKtdHQg/YA8X/DQ6BSt2ElyX1Za3UiYiBB3cz73dcaixWzpS08n8li/PuycoPtteJvwVRHnZZ6RHd2mLQJIcNDFRto9Gb7zpuSl+1acR9IZEJIFYDzykVP9ThqZLMT58vajtsl+GhLAuJOmyeuiCkCqudHP8HDKtvAKqu0YvWidfTIG8WBNNQbbGWAd2nRpGwcNYzHBl48ES9/uHeGXwES6DbLC2gJNzpeH3v5zKsiQ7o3kPuXzDVszjExa8CYyYqqWyS9CiOjP4yVP0LBvkHztv0N42YNiL9BYB6vruQj5RJtSaAT9yBOPpqUBTiq1xH43t8dobb5f8bQ6F3JEuqDKthyNDcBxR7hC0KEfsLYL9g3ux/yOqNddmlno5WW9XJ4UrLoImyyJhhhxxIztXpDxNMNd05MM66jSqcD55FDUbT2W0acI9 R8XEdswS 7cAzTHOkQgvaAIvsfPj8kb/enw3CSEnR/rfHrzWkDv69/X00X1M4kFqJY9bnP3CPzvJdYauoRtkCxMALez5BEAYq3tNaXm3H340arbL0frjWllewb/z77FcwNrTtIr7O1aFd8PFfWaP+7/ubttl7nCJ3C7pVeQQv2opMBw2ZmzFA49oA+w1u+hZ4/UHnriRVVild3Ws7p5cfhjKey2WouqF5Zq6KLqEGpqKyY3JdzHVVW65sHTzEmYhOARqd1GMdUHkk/fh5+b2IoGfev+3Y3qhC4r6zBlYsDQmWXeUGyglbUv+uOF6DnCbGxdPSVlNdSj/gR6RgE3qaD13uLrSqjkMOh7FADmWK3crdK7ujz8SeoL5pqzFMKp6HGW+sb/3kmJ3pChHL+YoD8TghEODSu9VoKsr7P0rcKwo0aLKybcH9w5E+hiBgjDOZ2mkPbhz/+Q9tBgyXpNhmq0S//5S+7bfjzfn8XqIQfr2mcNcjfKg0f0JkqV1QnRyAU311I7asEf069y0Zl+EaPhrWXln00mVqbOg== 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. v3: - Combine vma_lookup() cases and reinsert accidentally excluded next = NULL assignment. - Reword commit messages to more correctly reflect the current changes. - Avoid multiple assignment to prev, take vma_start, vma_pgoff assignment out of the local variable declarations and revert to setting in if (prev) block. 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. https://lore.kernel.org/all/cover.1679431180.git.lstoakes@gmail.com 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: fold curr, next assignment logic mm/mmap/vma_merge: explicitly assign res, vma, extend invariants mm/mmap/vma_merge: init cleanup, be explicit about the non-mergeable case mm/mmap.c | 144 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 76 insertions(+), 68 deletions(-) -- 2.39.2