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 34868C76196 for ; Wed, 22 Mar 2023 20:09:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4A1906B0072; Wed, 22 Mar 2023 16:09:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 451176B0075; Wed, 22 Mar 2023 16:09:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F23F6B0078; Wed, 22 Mar 2023 16:09:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1DF236B0072 for ; Wed, 22 Mar 2023 16:09:31 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D2F49AB0BB for ; Wed, 22 Mar 2023 20:09:30 +0000 (UTC) X-FDA: 80597624100.14.615F435 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by imf01.hostedemail.com (Postfix) with ESMTP id D453D4001F for ; Wed, 22 Mar 2023 20:09:28 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=g0oMOR67; spf=pass (imf01.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.49 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=1679515768; 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=CFiAU6kcHoigzDtMXwhFSfPfpz2SNfjgCvziPh6MpgE=; b=Y1D0MdYaMyWvwxApI4d+LnttFni4sx+FPVEtxyMCmcaSWKGHerHyLBtRnBKiQ4VR8r8zAJ B7M5QlQkIxV1U+HGlB5UofGabmTSryJfyASgckUHAOZvvvuPpN9XzrfTdAXUkW9xb3MxYd +3wnziwHg57u3YyjprtQJGqdDlqkdLA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=g0oMOR67; spf=pass (imf01.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.49 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=1679515768; a=rsa-sha256; cv=none; b=djpM4PKdZuTqPV6Dx5ysNQrEfJfsVZxikGdeYGaBYNfyRS90V9Oc1DJ79EgGxBo33+AlBm AJ/oNosvczazKz1DgKEGoyWudhATc+hscekceDiZNqbV48z0V5/4yZhZtGrorP87ViFgwd 1tlth19kT2hMq0dc8bLaHGZFWCsd3+I= Received: by mail-wr1-f49.google.com with SMTP id j24so9430851wrd.0 for ; Wed, 22 Mar 2023 13:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679515767; 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=CFiAU6kcHoigzDtMXwhFSfPfpz2SNfjgCvziPh6MpgE=; b=g0oMOR67khKD+EmgWCaa5Bd2pTHSpJN5yRpqyHrXr2cyO+zAtd0D3Vl+FUouPFy1fO T/HmIw1ImffUyL5uxX43xNllJpxgFsU43DjUP5lTfEHtSyGgxTRaE6lgazp1CZvDWkko Ck2UCrA6f7vibk0oN1gHcKuvg23IRhjOFDKu5Xz7zOJc/+Dh78onJdH5HTjyviTIEnTI MtYtonaudyGyU7WRvn7IO8ornijieNWluVuY/Qsa3bdk4QS/ZdqPe+L1KhH8T3lVMBWn xRsA6C8FGt3TEm1ZA9gMVUX2TxMuLIojI4RvHVjPDlWZzk6b3ncrsOHoNwYgVi6Fb5zp 27gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679515767; 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=CFiAU6kcHoigzDtMXwhFSfPfpz2SNfjgCvziPh6MpgE=; b=rOHfx73wA//NggUQSHObawHHMb2glO70ODjciuP1tvG1SXyCxq6PokVUB6G3xge04e nMXDxmISVR5tvbA6CvPvAegp3JRDHLPd+bAjuwSEEvVtf+/fWxFMN9I3eJXx08+ZtaG0 Ieav+p6Bi/etCFTXszEP6LNsnloGRs7G3Dam58Wepgs6YAXYgUus2j5GfFFhD2KG4329 RFQouYHyDLLrw+RKS/aVF3QD7N0W8XXBjmWNmQG/a9y5OwvSWpUrMPGnJ0nzT/MnY0QL B3yeg4gEdtkeMe+8wGziu/fLggdnGcU9ZkZqCowqOV4WUqX8FqCWWresgC+7OUPTuTXl RC3w== X-Gm-Message-State: AAQBX9cKTG7Q/25lMlaEqgTpvPUHJFRqs5SJWOSigiC5GrEFVuHGjiL8 +X0K0a5e5EQ1ml07/3drGSRRake5D68= X-Google-Smtp-Source: AKy350aApIAm05g+oGrDEowgzBjL2AWZ53JF9GvZ19wuoZTvd2RNvqJHEhAcM2mxUeFvn7u3DRMYHw== X-Received: by 2002:adf:dd52:0:b0:2d9:457a:1069 with SMTP id u18-20020adfdd52000000b002d9457a1069mr777390wrm.37.1679515766954; Wed, 22 Mar 2023 13:09:26 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id a7-20020adff7c7000000b002c70ce264bfsm14664342wrq.76.2023.03.22.13.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 13:09:26 -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 v4 0/4] further cleanup of vma_merge() Date: Wed, 22 Mar 2023 20:09:18 +0000 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D453D4001F X-Stat-Signature: gzmn1r459us8nqk3yfjq4msqnqq7rou8 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1679515768-13931 X-HE-Meta: U2FsdGVkX1+svmD7pOCKx/JbWVFXhZBYqjnBhKLBIA1agcYV7uK7W3Iuv2xfD3ZpAamyLLoeax+Fl8VC3qamNXrcLuVbIpa/3LXtpfB9zSf8mWWK1dS6fJUa0nK+fjCtW3CeVPnnI31vzIRBv8nGhHPkbA0tSJwZKV8jljswh7ScuurLYtwjsa9D8LVDR7Eenp8sqHQToVml73lL/x6RgxWR2OzNWEXmMqn3oi0kJIUeB+g6f8acjBFI9RTOkg+lhm37XPoIPkSBNxk+aRN4fITDe/mSn2nxWBV6CfVgq6vlgOOAO5Ll81/Z3hwrnY0XWIt4Lskwthz6Vb/FIDKVMJ1QBEGK+0EWMXtJEjLHBm6tYQWDiQEi+3N9Wzn7J/7qO4tZkaI5kyybng1ULmRy8W1Q3+u1t0SSThe38fCRE1Ck5GJddz3X/WIBqFxgzQa2KGZqhcKwGr0LA7YpXLlEdpQWFeQFN7l5M0epyuiMTS03MRr6uPS076SRCu9KsqNNrFjkHGxGjqwgLPR3JkGx76dTJ28JX0+Zka6CW8s1de0l5gI0HRqDmUy3RPibo9OdL32Z1Z60A6we2JpxwZSid2mJc8hrQNdtn2oNg8s5K8aGxROXCdsPrwxXXkXARKtOZvKB6r0gugNH/WEHcwhwT0fzCBx7DnPodXRj5TGsWJNC0pYd+EjDhfpili01/5FhBo7PKQzgV12PQeHNWJe9Y4oFD9IBfmdqoMqEYCyUuvqEiAXdRm+lVAQTIlakbvrTyUY8eqWHZgT6E2xq/iCTKPXb1yBYZYPQbefR1bEC1b3s7wSqYjGDV36CjyhNh/MxVu/fjbur8rzjUzsG1tAKROoY6a2WgMwQiEeciEWMORc4y2R3wSURR86nMwazdM3uyQ9pZelKjqRzHmlpPU/BRlogE7g3hg59Ee6R27g/igDargLHTS1mX4fhSuzZRwQTR18mmDEk5BtRFNjlRRt hGr6LVm1 N+6K3Ws6j2rLLgeBtqBcLRMS2Sifi5EAXA4g+0qD2rO5OFIJ1YqAxSaqKAWPsIsFvWHrVK4tMCalsCwwNFKl2h6WZ3QtxTgOA/OduPPQfxx51vFRUg6udM19k6Ti/y3MUpcGgxbauQ1zPS4+eKfWFfVvJa9aG91b/wIugFGxaNduabmx56rGAU1Lt7+RxrQdksPS7JvWRj7aOfSqR61XIqbWzL9N6wfdTuSaKMwwWA3+4qaBe4xhJPqdrLmnfP8R0GhQcEvmE678v6enW1G6YVYJn2HhgDSzg9u/IZa1UfHzF74d4GrCqrLfyuNgtRp5rFZG1otBLYuIsFHzyjI+r5G7YdYzCznzXEApGjki0VAUXsZXsYvHJT0LjcECyyC0TU1r4gAhkJcSEMKeKjBceV8VWXw3nXwFlRG1dfD25/dqkEqhMErUq7APpHv7V8OxaUvsB1IOPsS6hVIwCpNh1FNSGHRIJJt2KT1nBtbmutSPLovQKxQMm87dr90qO1LIyrZh7 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: Message-ID: <20230322200918.SU_IAEzHUl7oIYBTK3WdrUX6pxLC3mCcu3akBouDbWc@z> 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, Liam for his excellent suggestions which greatly simplified things, and Vlastimil for his careful review and feedback. v4: - Mention 'A' -> '*' in commit message. - Various small nits. 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. https://lore.kernel.org/all/cover.1679468982.git.lstoakes@gmail.com 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 | 138 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 67 deletions(-) -- 2.39.2