Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 392677E782 for ; Wed, 4 Sep 2024 04:19:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725423584; cv=none; b=DFPfNGrkYyfep8WfubRp5Dp9HOYU3m49CSk8opXnwXm/zlXbrPMBfGbosjPnQ4OOP7tsoRUtLi8VD85UXhpkkBTuPoU6+3qNE24/71L5UoKVHWO4Q+VI9B4CoQsabDdDve3WrgA03yygtHQwSi8C+7jD7r2P0Kzvjg2E70o1RO8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725423584; c=relaxed/simple; bh=X6ABGWdfh8erY5vH00fU1sLYOu9dIAMGfsHmoGxEvxs=; h=Date:To:From:Subject:Message-Id; b=s4gCloNfZj0t+cwnfz6C4nk91JrzF57CDgRN8yBYlEQVjL3RZFOBCHLLIz6rUank37VHffaGWsv3h1Or72XITR6M37TeeqH8raVOnpmsukCT6RP7uggFw+hjxFyDMiWlGGHSzCZIo87iLkWHR8i1nfCGjOaZf/ddOtp+hlWQ3tY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=Yqy7DluE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="Yqy7DluE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1130CC4CEC2; Wed, 4 Sep 2024 04:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1725423584; bh=X6ABGWdfh8erY5vH00fU1sLYOu9dIAMGfsHmoGxEvxs=; h=Date:To:From:Subject:From; b=Yqy7DluEqh/7JcBJT/ryJoYE7vK77NIQosy/ITM1dHuNrB452dLRcx9ahoyRtgN+H a3uwuNvh2Y/HawbKXcaaBIF5vRQxq0F+1HVBkrlOb8UEXIMVmw4lI/H4cWf+nTIKYf teAY+BuQGho5cMr6gp7JcBrQQbOI7f/XNuGJ+P18= Date: Tue, 03 Sep 2024 21:19:43 -0700 To: mm-commits@vger.kernel.org,willy@infradead.org,vbabka@suse.cz,surenb@google.com,spasswolf@web.de,sidhartha.kumar@oracle.com,paul@paul-moore.com,paulmck@kernel.org,olsajiri@gmail.com,lstoakes@gmail.com,Liam.Howlett@oracle.com,kees@kernel.org,jeffxu@chromium.org,broonie@kernel.org,lorenzo.stoakes@oracle.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-remove-duplicated-open-coded-vma-policy-check.patch removed from -mm tree Message-Id: <20240904041944.1130CC4CEC2@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm: remove duplicated open-coded VMA policy check has been removed from the -mm tree. Its filename was mm-remove-duplicated-open-coded-vma-policy-check.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Lorenzo Stoakes Subject: mm: remove duplicated open-coded VMA policy check Date: Fri, 30 Aug 2024 19:10:16 +0100 Both can_vma_merge_before() and can_vma_merge_after() are invoked after checking for compatible VMA NUMA policy, we can simply move this to is_mergeable_vma() and abstract this altogether. In mmap_region() we set vmg->policy to NULL, so the policy comparisons checked in can_vma_merge_before() and can_vma_merge_after() are exactly equivalent to !vma_policy(vmg.next) and !vma_policy(vmg.prev). Equally, in do_brk_flags(), vmg->policy is NULL, so the can_vma_merge_after() is checking !vma_policy(vma), as we set vmg.prev to vma. In vma_merge(), we compare prev and next policies with vmg->policy before checking can_vma_merge_after() and can_vma_merge_before() respectively, which this patch causes to be checked in precisely the same way. This therefore maintains precisely the same logic as before, only now abstracted into is_mergeable_vma(). Link: https://lkml.kernel.org/r/0dbff286d9c4988333bc6f4ff3734cb95dd5410a.1725040657.git.lorenzo.stoakes@oracle.com Signed-off-by: Lorenzo Stoakes Acked-by: Vlastimil Babka Reviewed-by: Liam R. Howlett Cc: Mark Brown Cc: Bert Karwatzki Cc: Jeff Xu Cc: Jiri Olsa Cc: Kees Cook Cc: Lorenzo Stoakes Cc: Matthew Wilcox Cc: "Paul E. McKenney" Cc: Paul Moore Cc: Sidhartha Kumar Cc: Suren Baghdasaryan Signed-off-by: Andrew Morton --- mm/mmap.c | 8 +++----- mm/vma.c | 9 ++++----- 2 files changed, 7 insertions(+), 10 deletions(-) --- a/mm/mmap.c~mm-remove-duplicated-open-coded-vma-policy-check +++ a/mm/mmap.c @@ -1423,8 +1423,7 @@ unsigned long mmap_region(struct file *f /* Attempt to expand an old mapping */ /* Check next */ - if (next && next->vm_start == end && !vma_policy(next) && - can_vma_merge_before(&vmg)) { + if (next && next->vm_start == end && can_vma_merge_before(&vmg)) { merge_end = next->vm_end; vma = next; vmg.pgoff = next->vm_pgoff - pglen; @@ -1438,8 +1437,7 @@ unsigned long mmap_region(struct file *f } /* Check prev */ - if (prev && prev->vm_end == addr && !vma_policy(prev) && - can_vma_merge_after(&vmg)) { + if (prev && prev->vm_end == addr && can_vma_merge_after(&vmg)) { merge_start = prev->vm_start; vma = prev; vmg.pgoff = prev->vm_pgoff; @@ -1779,7 +1777,7 @@ static int do_brk_flags(struct vma_itera * Expand the existing vma if possible; Note that singular lists do not * occur after forking, so the expand will only happen on new VMAs. */ - if (vma && vma->vm_end == addr && !vma_policy(vma)) { + if (vma && vma->vm_end == addr) { VMG_STATE(vmg, mm, vmi, addr, addr + len, flags, PHYS_PFN(addr)); vmg.prev = vma; --- a/mm/vma.c~mm-remove-duplicated-open-coded-vma-policy-check +++ a/mm/vma.c @@ -19,6 +19,8 @@ static inline bool is_mergeable_vma(stru */ bool may_remove_vma = merge_next; + if (!mpol_equal(vmg->policy, vma_policy(vma))) + return false; /* * VM_SOFTDIRTY should not prevent from VMA merging, if we * match the flags but dirty bit -- the caller should mark @@ -1053,17 +1055,14 @@ static struct vm_area_struct *vma_merge( vma_pgoff = prev->vm_pgoff; /* Can we merge the predecessor? */ - if (addr == prev->vm_end && mpol_equal(vma_policy(prev), vmg->policy) - && can_vma_merge_after(vmg)) { - + if (addr == prev->vm_end && can_vma_merge_after(vmg)) { merge_prev = true; vma_prev(vmg->vmi); } } /* Can we merge the successor? */ - if (next && mpol_equal(vmg->policy, vma_policy(next)) && - can_vma_merge_before(vmg)) { + if (next && can_vma_merge_before(vmg)) { merge_next = true; } _ Patches currently in -mm which might be from lorenzo.stoakes@oracle.com are