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 2997AC6FD1C for ; Wed, 22 Mar 2023 20:19:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 670686B0071; Wed, 22 Mar 2023 16:19:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 61D566B0078; Wed, 22 Mar 2023 16:19:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E4BB6B007B; Wed, 22 Mar 2023 16:19:08 -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 3FBA36B0071 for ; Wed, 22 Mar 2023 16:19:08 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 060BF120411 for ; Wed, 22 Mar 2023 20:19:07 +0000 (UTC) X-FDA: 80597648376.27.01FAB0F Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by imf09.hostedemail.com (Postfix) with ESMTP id 3AD08140021 for ; Wed, 22 Mar 2023 20:19:05 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=DV82tGJ6; spf=pass (imf09.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=1679516346; a=rsa-sha256; cv=none; b=NpErN60aQuNeH5aAiJBvDSCVdJMrgKMp0fHlTjz+2uzMEivjU2Ni0I8sEx0gvBYDIZjwhf SyEJmvFyio1TccnsgmhEwitW5EvKISXeGzDylrnB/Sbw5BKUjP+BxE9ef9JdYMp4hfAQNI 47CH5bg87KP8JqOw75n5W6pQXsCYMRE= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=DV82tGJ6; spf=pass (imf09.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=1679516346; 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=ULNFGmgjlrGeScNdGFqUo+Do+eHDgxaOWgwKJGAicVc=; b=OaZftRH3aCxRulhTWzq3Baq704CM41+fOKNv1KYhqbG9+EgFJAz89Y5nL2H3q7fpHSAVPH S+p+jAmpG0DUKZ/eMMVL5/BqD2zZTKtaOFPZ4ruesaU4CnYf0zIx79cNUWw85H8jEKh9iI B6TtwfUYd0TlVu04KnzuHGNbQEjDixk= Received: by mail-wr1-f48.google.com with SMTP id y14so18352582wrq.4 for ; Wed, 22 Mar 2023 13:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679516344; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ULNFGmgjlrGeScNdGFqUo+Do+eHDgxaOWgwKJGAicVc=; b=DV82tGJ6ztr+hx8zuEea02ViH8ImWV2I9MZlbTPQ0lhLy+Lp7fQZfurPuCnBwUED5V NblGIrtNp/WMgHsGdLh1jH5e4e8DZtr7CZjXrR8/dAswGkoaSyoDMeef32bThqms3BCG 2/HJFXyfLS1LpqhxMWbgyNgbgylobOezGCOQ9sVf+EBT3iBBisLeeRZZSiV8lVwOu6Jg kDyfeCJPyAECAkd7CVGlfIwC7NsEUqfOpAsU0aRqq3fBAt+wVhLZ5BPVZjkH3LofwN1y BLgrPmw5yn45GGTK1PnPh+FBjv2lH2QaIrDXN/5hyvsNlyB6utPGtqXmBIOySsOfocdR VURA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679516344; 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=ULNFGmgjlrGeScNdGFqUo+Do+eHDgxaOWgwKJGAicVc=; b=AsQtMHiWAic0a2166boro79GYqFx0WxDlTSLvuArCoF3eTYsywrES8t68uHs5Xg2WS bhSEjFaqTzMcGOyjZ7dEPbWoGdaQmnLWiCAA6In8+Zg6JPh/dWWSg7X+5nsfWxphGd2v Fsrgw+u4mmBlgQc7/KOIHnc10hxbc0oyMwqJAQ7Zu39SqKRgXolVOBV+lK2gmnPnK4/A tVkN3Yuvf8Gu4W67P3txB3DbQBfBelzU5FhI+XQD3xZnbddbDLR+PV548s2dgh3/L/Gw ps1t7Ti8Rv6WwuH2wZONKMt+yqL2OF2tYXt2I5lupgHYhtVG23lRz3+pylTaNdLQoa5e cz+A== X-Gm-Message-State: AAQBX9cdnrIuTDs+UhaACZehE4F8DHze0hVSHuRvn0AvN8AAXZEeAqf/ 3UMcVlCNEm4fF2se3FMJFZp3JT1a+qY= X-Google-Smtp-Source: AKy350YpnNeH0mDZje6H1d+VJiZj5cUFCmhc6lDzBEFyHfpr5+NNkdcuV39QfuWdYgwwKy96OyurwA== X-Received: by 2002:adf:fc12:0:b0:2ce:a8e9:bb35 with SMTP id i18-20020adffc12000000b002cea8e9bb35mr825984wrr.3.1679516343637; Wed, 22 Mar 2023 13:19:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 13:19:02 -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 0/4] further cleanup of vma_merge() Date: Wed, 22 Mar 2023 20:18:56 +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: 3AD08140021 X-Rspamd-Server: rspam01 X-Stat-Signature: gymd19aezzqt7nzqhfm6bf7jk3984d8q X-HE-Tag: 1679516345-660248 X-HE-Meta: U2FsdGVkX1//RElo/tX5QDwXHlONxsMlTegyO+nANoE6hQS92ZgGb/epn47YwcBZAxbB1Pl5YLoZhP/eXZlLHQ/E2txZahjA9o+/OL6EvB1tgP0j3HqOo7AaEr4Znqjj+/kY8l+nI+/FxKPO/3J6Ha6dhWVb/KJhb3R883rj5P5pmZFVugi5jIY19JDQxbSo9KvrWONN2KQpLke5CmJXLTHP8vGzC5fUMZmta3o6MwGkweSMK8r0Cl3NR2BO5msF1zlXocnnUpqrZrcJB9wy5ugW5qjxaM7h0i9J206qXTGf1OyZTque6btqGirh6/rzMUazoDp3CIAFzlY4maHvN/2RlBtuMf5PN+SDBcAOsF9WeoIOYPmjFLka2svJ2XggS3fKpNzFz70gA8pvurlpoY5XYKrtN9YptP5rU96Q33Nn1RyQhHtl89PzZkZlSG0y2WZDP4Rs2wXxPom8Ja7sOPNDp/Jkxz7tI/g3/jtay+3VQc5RcHxQCd2cSnPhcEaL8UTNVxRV8lZolzovbk8R+gljxjk8zVFsacc/FnU+g0pSfK7UQTpkdXnrgMvrNNiPGJD8pzB5zAvl6aol15zUWQ4MAPVAMzIRlt8kr3bfTAWt9ruvUJdg/VOPZKJZu3oYUm/di+QIS+KiFLY/8tiBUGdYn/2FAfTQ3mMXlxGguTvfGjUSkLAoMeW6nvGKA2OzqOLnTwvLcUt5U4oXvHTalRJ8GRYb4XcULVUcnZYLBDr7JSZjqLqpYFzDxA+9/fesw7IPy9mX4ejtfjHzVz3+cHwLIyyVN21wujXwrj4xrONEQ3DJp+BZXQhfXi1xBsxBNpdFSkx6BmqI10MOKUn/EkjUO1Jib7WyaIZ4EMYXffpDMeZP2/y2AMzvsqnBfizAoy43gAO/N6UH5Hgb/Z8LF+ZN4Ssizx1Frc7ZQDZhIcwU3XezlodSZmMXFUX4P+7cO7mFgjkH8bHD+cqJrpn xhvDkoxd 7u/n/XBVDY02JN3qnfJTZ3GwFH1vr7MNQALSgfhdrUupF2jo/1/ZRqhCtT3SsFEkJ+TFovaGzrWuBkIVRgevT0oyirN3MMH/72WmiTJ1ToaP6Lhs1BNa4spyS2yNY9YZebvQxYPHIuiZGruydSKOAV7U/8+cthLB7a7lEA3ba5POX4tZXYcAvnQtV0gbIPoX9AqTNjaqmZEN6mWfZaEL6TAU+3jrlqrHEP/HkLZeXIA4mXk087JgnhZBgfvIKEtipJLi3GyJ0JZ069TcrTEJhayZVSacUh65isNvUVs/dIHONhA6yLScRCjEhojnxCVwabVSU6dv4EuoIuomix0KTbvIO+lcA/4lXcadhDH745X4K7EPz0usrwTeOxUF/fucMX/FqUZ+WGgue5muT6DnZVrW8sSOv3Vqaz+A3NoNlW4/k4kLq4l0Zjqd0vFPHEV4l+km1gzL98T+4wgSQDy3zEEjjRRWXBNYVzfZFg0/3IT2oHcJIwI4PFJyaomHLEytVz773 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, Liam for his excellent suggestions which greatly simplified things, and Vlastimil for his careful review and feedback. v5: - Fixup typo. - Fix email client snafu with duplicate cover letter. v4: - Mention 'A' -> '*' in commit message. - Various small nits. https://lore.kernel.org/all/cover.1679515236.git.lstoakes@gmail.com 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