mm-hugetlb-sort-out-global-lock-annotations.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: sort out global lock annotations
has been removed from the -mm tree. Its filename was
mm-hugetlb-sort-out-global-lock-annotations.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: Mateusz Guzik <[email protected]>
Subject: mm/hugetlb: sort out global lock annotations
Date: Wed, 28 Aug 2024 18:07:04 +0200
The mutex array pointer shares a cacheline with the spinlock:ffffffff84187480 B hugetlb_fault_mutex_table ffffffff84187488 B hugetlb_lock
This is because the former is annotated with a macro forcing cacheline alignment. I suspect it was meant to be the variant which on top of it makes sure the object does not share the cacheline with anyone.
Since array pointer itself is de facto read-only such an annotation does not make sense there anyway. Instead mark it __ro_after_init along with the size var.
Do however move the spinlock out of the way.
---
mm/hugetlb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-sort-out-global-lock-annotations +3 -3
@@ -72,14 +72,14 @@ static unsigned int default_hugepages_in* Protects updates to hugepage_freelists, hugepage_activelist, nr_huge_pages, * free_huge_pages, and surplus_huge_pages. */ -DEFINE_SPINLOCK (hugetlb_lock); +__cacheline_aligned_in_smp DEFINE_SPINLOCK (hugetlb_lock );/* * Serializes faults on the same logical page. This is used to * prevent spurious OOMs when the hugepage pool is fully utilized. */ -static int num_fault_mutexes; -struct mutex *hugetlb_fault_mutex_table____cacheline_aligned_in_smp ; +static int num_fault_mutexes__ro_after_init ; +struct mutex *hugetlb_fault_mutex_table__ro_after_init ;/* Forward declaration */ static int hugetlb_acct_memory (struct hstate *h,long delta);
_
Patches currently in -mm which might be from [email protected] are