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 9438EC7619A for ; Wed, 22 Mar 2023 20:19:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0EF7F6B0078; Wed, 22 Mar 2023 16:19:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 09FEA6B007B; Wed, 22 Mar 2023 16:19:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E83386B007D; 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 D98BA6B0078 for ; Wed, 22 Mar 2023 16:19:08 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A79BFC05FB for ; Wed, 22 Mar 2023 20:19:08 +0000 (UTC) X-FDA: 80597648376.19.0C9353D Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by imf23.hostedemail.com (Postfix) with ESMTP id BE81714000C for ; Wed, 22 Mar 2023 20:19:06 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=m0qWeHwO; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=lstoakes@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:in-reply-to:references:references:dkim-signature; bh=K8Aesu5vvORZ6WL09YL+5IVo5FSwXDwhTdstOAf0sjY=; b=CYKqdyrCYw79QH3y9RiUs4kR7VXTH52w5ptpe9dzQwUFciZ2NwSrv2eXyyDY66mw/UQuQ8 wFqMi0mIW15awjJHF6k6K6RlxdQUDQCiSXkoZgL29iHQjacMvSgCVCkpoxxCu+SY7KiOIp GQlb+trxuSTwmjX3I0CrXFGY7B2QkIY= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=m0qWeHwO; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679516346; a=rsa-sha256; cv=none; b=swVMdSB+M55Evi3EvExjuere9Vk+TVyLjjQCHk1XfteLu1Z3FZJ7t6gQysMFTsPjzQ+SqH X0zIa3qSXRhKOnOd8yGHNF0V1/KKAKFA3fF77nOYt82g5uXWY1PYq29RWCtyx9xVsLNspf EoEnAtTe+5lUAwtSCHYwkVOgxrfwQR4= Received: by mail-wr1-f45.google.com with SMTP id t15so18340346wrz.7 for ; Wed, 22 Mar 2023 13:19:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679516345; 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=K8Aesu5vvORZ6WL09YL+5IVo5FSwXDwhTdstOAf0sjY=; b=m0qWeHwOMJ8+K/xX+Bb1LxQNyK6GgdwG/ZvemMiT6/Srh1pVGKrxNO+yiuXpYQ2bSU 1WMbVJUoHyXcNY7rc4CZ8HMLy1cKfUtWVh7dN+8ITINOJ5x8/tagbjxITi6MKlN9U7jx W3Caw8vjUBMw3NfVE3t7C2ySPfCIqFrNLqMV/1m1ETlDRpxUyqIXLWb+c+yaSHRqJGr3 G3TYsvtnyVzBBf9kp///nBJSVB093honAPmOWhn8MvqtD1ToiZUi/w9+0g50AT7WsSv1 DVlX0eRtR1PlWsC4YGNK3Tpz3h5TBf9pPtvPeSPs/+n7fEa73h0hVGu9x77mwhhZOyP9 wYBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679516345; 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=K8Aesu5vvORZ6WL09YL+5IVo5FSwXDwhTdstOAf0sjY=; b=ggsCPQaHmYEqSKnj4O2IdhK1zP4mjVPjKab3V44+3YdEP+vx1/OXUY397+jxDuvvul DnDyAhu9VCmHfx0n3b/Mk9S0r5sErA6n+nSUEOwJd+JCJY0o2jYrop0v1J3AUN5BGvGJ GOZR7Vq0qdt3jh7SKUicwvjNR1HCg9cgLy5OSzfDpoe640fDDGoZluxi1AWKSwM9dwAI OUP9EjZJkH8wisxiOEsPWQllfUeF59N2jmoG5wqZU4uqYFmyUEkZ7WsbZ66VE5rjTKZ+ CmJV+ymUDOY8UrNC2HFM2BPex97E6d2Q9y3Fh86Z/pICMRekNckTODF2RUkigcgptTxp iEbw== X-Gm-Message-State: AAQBX9cSp0PxkityKDJh7z9kt1Jzo8/VvJ/j8P4Xvtk0O46RpTgCv/nY w47Puo9tClvbPK75cu90bb56KOwgJME= X-Google-Smtp-Source: AKy350b6/PNGrU1z3zYstiHHWJmoHdwvwf1iQoFh6VemNDWFUaJZcr26zbVOFOfyXdBIoZKtBW1zTA== X-Received: by 2002:adf:ee02:0:b0:2cf:f279:378f with SMTP id y2-20020adfee02000000b002cff279378fmr727274wrn.44.1679516344797; Wed, 22 Mar 2023 13:19:04 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 13:19:04 -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 1/4] mm/mmap/vma_merge: further improve prev/next VMA naming Date: Wed, 22 Mar 2023 20:18:57 +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: BE81714000C X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 6tdirrp54yb98zht3zgiqefnf6i94ozy X-HE-Tag: 1679516346-164413 X-HE-Meta: U2FsdGVkX19VXyNpkD2ffUR1MPE4mrK5jCjVNoCI1lhh0/x4RzCWgsoBx7AlQbt49frW5a+kFznisEcRSFU9HQxlOvHurkCRdaHAczLKddQVTkU3SCq7mkkp9XV2HAfnu0wbYQB2ZgfMf656+IOrJesGFIkjklQOhrx2FCvryQ+R0crJAjxZHOUyRvOsvxWSF+sqb9jxiwNiO1zu6cgUZunOW3MdAcyL0EngSCKoBHu2WYlTodKR8Xwxsq5vovfS5lLnOWpP3F1bfHQJ5+2JHXSEBqrhoFiJoGun/73Ce7j7E1FYC+cJBGe8vOsZ9fuVd+nmfp5JBlvBz9Od2iTGckRt3WXyaiTxkN+nYVB6LBVA/KHHQZZHY10K+tdxUvjEFAX8JLcZckns3eogP30rz/6yLqo2iX4tHNbmajR+vhOiMCeq8p28DDdi0nOs79dFhPgEinLXu9NKtqnToxt9WYMCGBonyaVe0aGToK3Tu/8J0ghYOJczyLHEjQEhXXqpNYpXiRpdFsTla6gHiGzSH8NDitV1Jnp3qbwnmxdN8vnG3BQdQnqMDywGwQj36sLUB4K2mZa6fT1yVCQYSJYyJ49hxA0GK9di3DfxDW8vRIiyP2WoiLR0JfQj2d/Zrt5Dn+C+LFWSfCdM362pdnhHXkFFLg2zERWnWofbxnQtoGbPfPVzlCl6yvPuXrTwo5sC/V3ta4QLqdmPzk4zbnXtTRXt9RHLIKSyhLLSSI0jnKREx8AcZwte+PydxjNWsW0jnDq4mtVOPz5HK9xDhSwi8zJrTXpyrpWB+pnlagPuf/hddiY9EHqCtx5lZ6lBzz5WN7KU3H7VPqgbyDwYicRC+MqMNf7qy82s5YYAjdUmmdreSf6V+6gDzvQFbUj2mRnFI1FnLOItfi4ITKqjLaO4XlgVYtma3mmSlbNoEwViUyfoClKjKCMc77K0IjR89Dzwfg72VnteN4QAQ/dR57x 1BlE79P1 i5LJkYTelDpic9APkg1pxAl0T0akKglQMOEIOqlyp4/UDTDQSs7fdjzweMLUjFoAFoNseX/td7buiiOJl/knXCtBDBNT5CxJffcK/V6CETvrdiXFcFXLIEhI1aI8SuUrU+YmEgbhrer86Yn+tL5XbjQebIjK5f2xwEBqwWttmKlL0OKqEi8yjv68v0VzHueaTp+t0iSaReeu/rVm+IvqY7/TgEFX64EPevKJTQ+skB5MPg7xWylkVin4N9rOIY+5gf4cn9CYEnb2RhhA6KzBGMv51mtWLJ1SQnIXEFBIAe8/RO6NcegtnWIXhPauDBfQwHTnrsZt4HQlrjPE+9aSXeSSxkktnbSI+saFywmHePzepkwuT7gyrI7Bfer1vCvX5lGr3l7EPT86c2aJvLUWZqee1XiBcfbvQT28zVdldFPneJ+qTbZO405LuvUyzRx6d3yqZKc1F/OSVAxWxaNQjzOgg10ReO44Y+t+EEyqlo7KvDMudQvw4Zbq2CQAneK7PHqe3eQJswWu9hT8= 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: Previously the ASCII diagram above vma_merge() and the accompanying variable naming was rather confusing, however recent efforts by Liam Howlett and Vlastimil Babka have significantly improved matters. This patch goes a little further - replacing 'A' with '*' as it is clearer, 'X' with 'N', which feels more natural as this represents the _next_ VMA and finally 'N' with 'C' which represents the current VMA. No word quite describes a VMA that has coincident start as the input span, however 'concurrent' (or more simply 'current') abbreviated to 'curr' fits intuitions well alongside prev and next. This has no functional impact. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka Reviewed-by: Liam R. Howlett --- mm/mmap.c | 86 +++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 042d22e63528..c9834364ac98 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -861,44 +861,44 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags, * this area are about to be changed to vm_flags - and the no-change * case has already been eliminated. * - * The following mprotect cases have to be considered, where AAAA is + * The following mprotect cases have to be considered, where **** is * the area passed down from mprotect_fixup, never extending beyond one - * vma, PPPP is the previous vma, NNNN is a vma that starts at the same - * address as AAAA and is of the same or larger span, and XXXX the next - * vma after AAAA: + * vma, PPPP is the previous vma, CCCC is a concurrent vma that starts + * at the same address as **** and is of the same or larger span, and + * NNNN the next vma after ****: * - * AAAA AAAA AAAA - * PPPPPPXXXXXX PPPPPPXXXXXX PPPPPPNNNNNN + * **** **** **** + * PPPPPPNNNNNN PPPPPPNNNNNN PPPPPPCCCCCC * cannot merge might become might become - * PPXXXXXXXXXX PPPPPPPPPPNN + * PPNNNNNNNNNN PPPPPPPPPPCC * mmap, brk or case 4 below case 5 below * mremap move: - * AAAA AAAA - * PPPP XXXX PPPPNNNNXXXX + * **** **** + * PPPP NNNN PPPPCCCCNNNN * might become might become * PPPPPPPPPPPP 1 or PPPPPPPPPPPP 6 or - * PPPPPPPPXXXX 2 or PPPPPPPPXXXX 7 or - * PPPPXXXXXXXX 3 PPPPXXXXXXXX 8 + * PPPPPPPPNNNN 2 or PPPPPPPPNNNN 7 or + * PPPPNNNNNNNN 3 PPPPNNNNNNNN 8 * - * It is important for case 8 that the vma NNNN overlapping the - * region AAAA is never going to extended over XXXX. Instead XXXX must - * be extended in region AAAA and NNNN must be removed. This way in + * It is important for case 8 that the vma CCCC overlapping the + * region **** is never going to extended over NNNN. Instead NNNN must + * be extended in region **** and CCCC must be removed. This way in * all cases where vma_merge succeeds, the moment vma_merge drops the * rmap_locks, the properties of the merged vma will be already * correct for the whole merged range. Some of those properties like * vm_page_prot/vm_flags may be accessed by rmap_walks and they must * be correct for the whole merged range immediately after the - * rmap_locks are released. Otherwise if XXXX would be removed and - * NNNN would be extended over the XXXX range, remove_migration_ptes + * rmap_locks are released. Otherwise if NNNN would be removed and + * CCCC would be extended over the NNNN range, remove_migration_ptes * or other rmap walkers (if working on addresses beyond the "end" - * parameter) may establish ptes with the wrong permissions of NNNN - * instead of the right permissions of XXXX. + * parameter) may establish ptes with the wrong permissions of CCCC + * instead of the right permissions of NNNN. * * In the code below: * PPPP is represented by *prev - * NNNN is represented by *mid or not represented at all (NULL) - * XXXX is represented by *next or not represented at all (NULL) - * AAAA is not represented - it will be merged and the vma containing the + * CCCC is represented by *curr or not represented at all (NULL) + * NNNN is represented by *next or not represented at all (NULL) + * **** is not represented - it will be merged and the vma containing the * area is returned, or the function will return NULL */ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, @@ -911,7 +911,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, { pgoff_t pglen = (end - addr) >> PAGE_SHIFT; pgoff_t vma_pgoff; - struct vm_area_struct *mid, *next, *res = NULL; + struct vm_area_struct *curr, *next, *res = NULL; struct vm_area_struct *vma, *adjust, *remove, *remove2; int err = -1; bool merge_prev = false; @@ -930,19 +930,19 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, if (vm_flags & VM_SPECIAL) return NULL; - mid = find_vma(mm, prev ? prev->vm_end : 0); - if (mid && mid->vm_end == end) /* cases 6, 7, 8 */ - next = find_vma(mm, mid->vm_end); + 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 = mid; + next = curr; - /* In cases 1 - 4 there's no NNNN vma */ - if (mid && end <= mid->vm_start) - mid = NULL; + /* In cases 1 - 4 there's no CCCC vma */ + if (curr && end <= curr->vm_start) + curr = NULL; /* verify some invariant that must be enforced by the caller */ VM_WARN_ON(prev && addr <= prev->vm_start); - VM_WARN_ON(mid && end > mid->vm_end); + VM_WARN_ON(curr && end > curr->vm_end); VM_WARN_ON(addr >= end); if (prev) { @@ -974,21 +974,21 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, remove = next; /* case 1 */ vma_end = next->vm_end; err = dup_anon_vma(prev, next); - if (mid) { /* case 6 */ - remove = mid; + if (curr) { /* case 6 */ + remove = curr; remove2 = next; if (!next->anon_vma) - err = dup_anon_vma(prev, mid); + err = dup_anon_vma(prev, curr); } } else if (merge_prev) { err = 0; /* case 2 */ - if (mid) { - err = dup_anon_vma(prev, mid); - if (end == mid->vm_end) { /* case 7 */ - remove = mid; + if (curr) { + err = dup_anon_vma(prev, curr); + if (end == curr->vm_end) { /* case 7 */ + remove = curr; } else { /* case 5 */ - adjust = mid; - adj_start = (end - mid->vm_start); + adjust = curr; + adj_start = (end - curr->vm_start); } } } else if (merge_next) { @@ -1004,10 +1004,10 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, vma_end = next->vm_end; vma_pgoff = next->vm_pgoff; err = 0; - if (mid) { /* case 8 */ - vma_pgoff = mid->vm_pgoff; - remove = mid; - err = dup_anon_vma(next, mid); + if (curr) { /* case 8 */ + vma_pgoff = curr->vm_pgoff; + remove = curr; + err = dup_anon_vma(next, curr); } } } -- 2.39.2