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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B1F7BCA5FB1 for ; Wed, 30 Sep 2026 11:22:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D4B8B6B008A; Wed, 30 Sep 2026 07:22:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D235B6B008C; Wed, 30 Sep 2026 07:22:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C3A016B0092; Wed, 30 Sep 2026 07:22:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 8F04C6B008A for ; Wed, 30 Sep 2026 07:22:15 -0400 (EDT) Received: from smtpin02.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E6D4FC071D for ; Wed, 30 Sep 2026 11:22:14 +0000 (UTC) X-FDA: 85270189788.02.58414EA Received: from mail-wm2-f12.google.com (mail-wm2-f12.google.com [74.125.225.140]) by imf06.hostedemail.com (Postfix) with ESMTP id 1EEAF18000B for ; Wed, 30 Sep 2026 11:22:12 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gourry.net header.s=google header.b=clJx82Yy; dmarc=none; spf=pass (imf06.hostedemail.com: domain of gourry@gourry.net designates 74.125.225.140 as permitted sender) smtp.mailfrom=gourry@gourry.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1790767333; 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=zIw+KKdVSvnmdxpFXC8KfAVy8bK/hfC5OXGzj2ui4Nc=; b=wkd5g0rftV/zTSiLD4C41q2JIdGI9eowdkZP7ciwNxWJH/hZgpRNS1tLFCaK3sEsi45xkb sTg3rq3oO+ZezfDcRfp4pfq9j0Y7He1PQxaOOMv/Q+fZmw1fHXXgYeyToY4gJrPaPLBPbm RuLQhsVWIYP+3QwZq5nlOkb3BFf4GpM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gourry.net header.s=google header.b=clJx82Yy; dmarc=none; spf=pass (imf06.hostedemail.com: domain of gourry@gourry.net designates 74.125.225.140 as permitted sender) smtp.mailfrom=gourry@gourry.net ARC-Seal: i=1; a=rsa-sha256; d=hostedemail.com; s=arc-20220608; cv=none; t=1790767333; b=aM/BpjqPicLNqxC9CyK+tuhlVXOA6bOxxEDMF5Qwnwr3iZyGqrRrSfiFhaOgG66lKNv0Gs cQ18tOxxzAH+D/QtaxcNt9KcFSzjqzz4OHrr7ajLMRINHspA7XqLZyK05d7PFrmI/cIPrB gH/Q6wTXnF+UJNm4Gx4CqJ3VWQ82Q9w= Received: by mail-wm2-f12.google.com with SMTP id 5b1f17b1804b1-4a00713639cso23390925e9.1 for ; Wed, 30 Sep 2026 04:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1790767332; x=1791372132; darn=kvack.org; 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:content-type; bh=zIw+KKdVSvnmdxpFXC8KfAVy8bK/hfC5OXGzj2ui4Nc=; b=clJx82YyWoQkSaEhZJr0+QNXvq0zhnZdzmkDa9x2iikE1CCZf6CTG7c3snLa2dHPDj 2phLSC4M88QBIX2sPxUemVcT7Vw7bezgVAL/1OranJiBrA744uUOeIrZMx7LTX6KsceH C9G074EgV/0yBxs0rZRurIhcHfURNkjNaV0pN10g/GQEWeY0FjSi3EqZyGLMTHz/t/vP 2rkFhWKxowbYEQ+LzvSG0tVpvYsI5npObSVuNhlyS/gaUooDsEnw6pIW2ZBZyFcAj/hF 9qyvFVE8qdfU3NkT8ZR6VXC4ivAkMYSNhjserKqOCHgKQ6rdOrPHfpDpXSU8cLkfn4mA YUGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790767332; x=1791372132; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=zIw+KKdVSvnmdxpFXC8KfAVy8bK/hfC5OXGzj2ui4Nc=; b=dYRnTAgF33vRc1qDVAzB0TL/prAZLw0pg/vKyW8gtDZGXshB4C0h8mGT0Lgs0GWiQM og1nOT33co0sCdV0qG6KXSHWpYbIhELB+f9RzK7AkvveuvqUGONS9IdFCuNObmdlEpbP IbjBaOEwLgPn+kE1jYaiq2D9S5mvU6aHYQiEDBz4q4UCcDoRpepZ2Hukca79KfjvUwHE qeAoZpJjsAi6DcCCyuWfYECSr+c988Lnbx8whWkB6KM5LEFM4+mW7BPneqliVZD0Z3W2 TLbE/2nCLoOC1aVO8Uw7f8NCdtgFKMyVXjces2CK/AN5NHyMlriKFNBEGSq3TgaxETfv ZY1Q== X-Gm-Message-State: AFuF++kUsMY+ixvt25/73bdYlhWACd1hpT3sKN8mxlE5768fbisCOEYr dsll/zuD+BaULoNhHwOOt7417GKZlpPRYji9tiYc5evA42wuOW1UIZsoXJjySBUHhpehXsVJQRj aUEslmcfhNA== X-Gm-Gg: AYBFou3dQxze9I2pXnVQZdc1EVb0lJW76HDjUq0EnUek9IrrlXyqageSSFlBYXlJrXY 1sUpItCTePTmnjX4PurJhcu0yy1IkxqAeM1gUMcYfTaK+PP68NkG16xbTPpkccBPGcElropvUrl aUpxfk3zMaT+KDCAX4ivNIxEjMtOSAA6pvWNuEDczqwDSkdwfqLW14RmQxLX1Bix4wvB6CT7mZ5 wxwyZg5Bcz4CZmz7no8Lvz1WrPYZjypgE5szDbNH86GkXgd9+wD42XEB/D0R2zuhgXPOpD+cbsr ZfyJA6Mc5Lt0f7pQqTpESxQsqCWLd0ZR3A38PlSqT18GMgsX86zqAGd676Wwnf4ubPyESPVxMsw lI5x1xMidakfAVPm+PyDRJIOdCYxCMnNSbnBS7+gejSDd63shXr+735Uiz3mg5wKAAHsAi6QaUi +YBs6NW7zJbayJYVD64WpigsMNJrMQGFN/IUIkgXUZeoOLiMgNpQjP6Vx7YCwansmjLUkfkP5hP M/KE/K6F5eaKjSp X-Received: by 2002:a05:600c:4514:b0:49f:cbf1:e77b with SMTP id 5b1f17b1804b1-4a01affe8dfmr18099155e9.10.1790767331659; Wed, 30 Sep 2026 04:22:11 -0700 (PDT) Received: from gourry-fedora-PF4VCD3F.thefacebook.com ([2620:10d:c092:500::6:13b8]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a019740c34sm34097095e9.9.2026.09.30.04.22.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2026 04:22:11 -0700 (PDT) From: Gregory Price To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, liam@infradead.org, vbabka@kernel.org, rppt@kernel.org, surenb@google.com, mhocko@suse.com, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, kprateek.nayak@amd.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, nico.pache@linux.dev, ryan.roberts@arm.com, dev.jain@arm.com, baohua@kernel.org, lance.yang@linux.dev, usama.arif@linux.dev, kas@kernel.org, gourry@gourry.net, joshua.hahnjy@gmail.com, rakie.kim@sk.com, ying.huang@linux.alibaba.com, matthew.brost@intel.com, byungchul@sk.com, apopple@nvidia.com, jannh@google.com, pfalcato@suse.de, hannes@cmpxchg.org, shy828301@gmail.com, osalvador@suse.de, raghavendra.kt@amd.com, stable@vger.kernel.org Subject: [PATCH v4 1/7] mm: support promotion-only NUMA hinting scans Date: Wed, 30 Sep 2026 07:22:00 -0400 Message-ID: <20260930112206.205083-2-gourry@gourry.net> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930112206.205083-1-gourry@gourry.net> References: <20260930112206.205083-1-gourry@gourry.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: kp9jqzg5nya8sbpnk7qhm5ugzbt55xj9 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1EEAF18000B X-HE-Tag: 1790767332-764004 X-HE-Meta: U2FsdGVkX1+kXPgRUkt2hkbJDwEpINvUi5hSvfDbxyJYBpUTRYpkGCCMYt0lEc1WRlBVWcYKFSlJ/n/rNGDdbCQOJsgOO7qleoNZ5O7gkR5+RjQydI5+iaxetiEyIMHaoJUwCnb+eBrqZpwq4z2x7BBbqg99ATrB68mGEzfi268iqyew0pysOUhvB4/3XSWzV4dti00LbpqTCGqh2nNS5Djn+tdnMIZ1GvqgYWZbxn8m7C0ulOg3E260TsWyjCuRPhv4dPAbD13lZ1R8tMayXKW6N5PHPhmI+nKuvgFyjdcoPRJX2owtHbj2kgbwlbWj69yeuz/odAPTlZgYlkhS/YJMDnxrT2kcol9qv6C+h45MJc5i5dtVCHYeQKDexj52zhnu6T32l8TJFYsZKy0Efj0df17fE9oSBUduPlmrCT1hYR7Tkxkpjgoogynvq8MKifGNKLPPZC4JngPic49O1h1IiOLsZqT4D5c6JGFfY62sVh0uMQil2tdbDu8YEVgS3Bd8jySqWZ6Mg7hDnvVVBCk9vyAJ7K9yMHW+GuX6JzpDpybSTRzS71hpkn3c9QjKPFaeqYOHwtA0kgM/sp88nHmpbvuHD+3td/AiwnBIUX5v+GhIr4pFWMX1jacyWcSjW14QCVYCBtRURjQG8eGE0JzQWbz2JAmMwlBsxAzktC8+/4vAt3qrswWVYEY7jzmFECLV9bqtTvFK6IzxP51MMSEgpZ7RwpPNGWxSh6LtY8i4ubGqjludSMsgg+p+5WvT3i1Z+z7Zdu9lps5402WE7Be420iaHPv1vuxyv9/eYo8e+u9Bpo5UOFhUM2vfSQOvTqJIAuGAjNrOt3Pfp0q9Gv3HPAUf9Jmu2R+nN5KE2q1rFei1JPdXI2VXodav87j1ZYy9VyKqVRwoJipCG7wkiiPacK8Y3dB1YbCISTQqUNtAlIhlMXaUtROzPm1R0RJ+7amJ7VsY76CiiYCbSPp hQROraSf sz0WOqbOpZvnvk7wVUNxHk+xhMOk+Ajj3pO7dnySxqmawqIaIdaravfmbjJJ/V40EmtGa4k0traOlXJkH17azjMLevvaaJ1iD+2Ns2hl71CgtGr+q30PsxpV4wy6+hkv/41SC8EET9of3tTPEkw0fD7X0YPTiUkhhA4IpeYzVIDXCgNPioyd/NER5J6fKQJzZfTGq0GSptBpHPoi72Kb2pps7vbZx7vYY6dUAmVKUNvJSvvbp6vefQhe96QmClj0SMQrxYqREEztqXfprfVgJnd/Nz5B1P5Ianb+v+ipZiMxMmnVZa87L6ZXdEpLpTgQ+rOxP+joejedwvpL+WJbbH9aWSYDoBD/oPHXeKnNfV2480rgwHpEuf7zcpnkacrUpzJh7LbMQjeg9294il8Cc73k7SA== Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Gregory Price (Meta)" folio_can_map_prot_numa() derives folio eligibility from the global balancing mode. The mode (normal, tiering, or combined) describes which balancing mechanisms are enabled (placement vs promotion). The global setting itself cannot describe the intent of an individual protection walk because normal-mode tempers its scanning activity based on a number of heuristics (read-only VMAs, activeness of VMA, etc). In tiering or combined mode, applying these normal-mode optimizations to an entire VMA is incorrect and breaks tiering. - Opting VMAs out of scanning because they became inactive obviously breaks tiering - because the intent is to identify when a VMA becomes active. Applying it in tiering modes causes VMAs to become permanently stranded on lower tiers. - Opting Read-only file VMAs out of scanning is just incorrect for tiering modes because its intent is to prevent bouncing between sockets (east-west), while tiering controls tier migration (north-south). The result is hot read-only files can overload lower tier bandwidth. Add MM_CP_PROT_NUMA_PROMO_ONLY and let task_numa_work() select the type of walk from a single read of the balancing mode. Build the change-protection flags there and pass them unchanged through change_prot_numa() so its PTE/PMD paths use the same decision. Have folio_can_map_prot_numa() derive the single-threaded private state at the point of use instead of adding another precomputed boolean to the protection-walk interface. This keeps the interface focused on scan intent and avoids plumbing VMA-derived state beside cp_flags. The tradeoff for the cleaner interface is an atomic mm_users read for each folio, rather than once per PTE range. Check the promotion-only top-tier exclusion bit first as a mild optimization. The scan-intent interface is required by the following memory-tiering fixes and must accompany them when backported. Fixes: c574bbe91703 ("NUMA balancing: optimize page placement for memory tiering system") Cc: stable@vger.kernel.org Suggested-by: David Hildenbrand Link: https://lore.kernel.org/r/4d2853c9-edf4-4685-b186-7214ed6abd84@kernel.org Assisted-by: LLM Signed-off-by: Gregory Price (Meta) Acked-by: David Hildenbrand (Arm) --- include/linux/mm.h | 6 ++++-- kernel/sched/fair.c | 9 ++++++++- mm/huge_memory.c | 3 +-- mm/internal.h | 4 ++-- mm/mempolicy.c | 26 ++++++++++++-------------- mm/mprotect.c | 7 +------ 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index c038d06825c3..623ae61e52cb 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3609,6 +3609,8 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen); #define MM_CP_UFFD_RWP_RESOLVE (1UL << 5) /* resolve rwp */ #define MM_CP_UFFD_RWP_ALL (MM_CP_UFFD_RWP | \ MM_CP_UFFD_RWP_RESOLVE) +/* Whether a MM_CP_PROT_NUMA change is for promotion only */ +#define MM_CP_PROT_NUMA_PROMO_ONLY (1UL << 6) bool can_change_pte_writable(struct vm_area_struct *vma, unsigned long addr, pte_t pte); @@ -4984,8 +4986,8 @@ static inline void vma_set_page_prot(struct vm_area_struct *vma) void vma_set_file(struct vm_area_struct *vma, struct file *file); #ifdef CONFIG_NUMA_BALANCING -unsigned long change_prot_numa(struct vm_area_struct *vma, - unsigned long start, unsigned long end); +unsigned long change_prot_numa(struct vm_area_struct *vma, unsigned long start, + unsigned long end, unsigned long cp_flags); #endif struct vm_area_struct *find_extend_vma_locked(struct mm_struct *, diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 3fe1d35b17dc..c3dfa398d0bd 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4127,11 +4127,14 @@ static bool vma_is_accessed(struct mm_struct *mm, struct vm_area_struct *vma) */ static void task_numa_work(struct callback_head *work) { + const unsigned int numab_mode = READ_ONCE(sysctl_numa_balancing_mode); + const bool balancing = numab_mode & NUMA_BALANCING_NORMAL; unsigned long migrate, next_scan, now = jiffies; struct task_struct *p = current; struct mm_struct *mm = p->mm; u64 runtime = p->se.sum_exec_runtime; struct vm_area_struct *vma; + unsigned long cp_flags = MM_CP_PROT_NUMA; unsigned long start, end; unsigned long nr_pte_updates = 0; long pages, virtpages; @@ -4139,6 +4142,9 @@ static void task_numa_work(struct callback_head *work) bool vma_pids_skipped; bool vma_pids_forced = false; + if (!balancing) + cp_flags |= MM_CP_PROT_NUMA_PROMO_ONLY; + WARN_ON_ONCE(p != container_of(work, struct task_struct, numa_work)); work->next = work; @@ -4315,7 +4321,8 @@ static void task_numa_work(struct callback_head *work) start = max(start, vma->vm_start); end = ALIGN(start + (pages << PAGE_SHIFT), HPAGE_SIZE); end = min(end, vma->vm_end); - nr_pte_updates = change_prot_numa(vma, start, end); + nr_pte_updates = change_prot_numa(vma, start, end, + cp_flags); /* * Try to scan sysctl_numa_balancing_size worth of diff --git a/mm/huge_memory.c b/mm/huge_memory.c index ddc631a388b9..b844b63549a6 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2768,8 +2768,7 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, if (is_huge_zero_pmd(*pmd)) goto unlock; - if (!folio_can_map_prot_numa(pmd_folio(*pmd), vma, - vma_is_single_threaded_private(vma))) + if (!folio_can_map_prot_numa(pmd_folio(*pmd), vma, cp_flags)) goto unlock; } /* diff --git a/mm/internal.h b/mm/internal.h index 0434dfcfc36f..cbeaf1fc38cf 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1248,11 +1248,11 @@ static inline bool vma_is_single_threaded_private(struct vm_area_struct *vma) #ifdef CONFIG_NUMA_BALANCING bool folio_can_map_prot_numa(struct folio *folio, struct vm_area_struct *vma, - bool is_private_single_threaded); + unsigned long cp_flags); #else static inline bool folio_can_map_prot_numa(struct folio *folio, - struct vm_area_struct *vma, bool is_private_single_threaded) + struct vm_area_struct *vma, unsigned long cp_flags) { return false; } diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 4c0b8ff1a7e6..8ff37f60b710 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -847,7 +847,7 @@ static int queue_folios_hugetlb(pte_t *pte, unsigned long hmask, * folio_can_map_prot_numa() - check whether the folio can map prot numa * @folio: The folio whose mapping considered for being made NUMA hintable * @vma: The VMA that the folio belongs to. - * @is_private_single_threaded: Is this a single-threaded private VMA or not + * @cp_flags: Flags describing the protection change * * This function checks to see if the folio actually indicates that * we need to make the mapping one which causes a NUMA hinting fault, @@ -857,7 +857,7 @@ static int queue_folios_hugetlb(pte_t *pte, unsigned long hmask, * Return: True if the mapping of the folio needs to be changed, false otherwise. */ bool folio_can_map_prot_numa(struct folio *folio, struct vm_area_struct *vma, - bool is_private_single_threaded) + unsigned long cp_flags) { int nid; @@ -880,20 +880,16 @@ bool folio_can_map_prot_numa(struct folio *folio, struct vm_area_struct *vma, if (folio_is_file_lru(folio) && folio_test_dirty(folio)) return false; - /* - * Don't mess with PTEs if folio is already on the node - * a single-threaded process is running on. - */ nid = folio_nid(folio); - if (is_private_single_threaded && (nid == numa_node_id())) + /* Promotion-only scans do not mark top-tier folios. */ + if ((cp_flags & MM_CP_PROT_NUMA_PROMO_ONLY) && node_is_toptier(nid)) return false; /* - * Skip scanning top tier node if normal numa - * balancing is disabled + * Don't mess with PTEs if folio is already on the node + * a single-threaded process is running on. */ - if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_NORMAL) && - node_is_toptier(nid)) + if (vma_is_single_threaded_private(vma) && nid == numa_node_id()) return false; if (folio_use_access_time(folio)) @@ -907,19 +903,21 @@ bool folio_can_map_prot_numa(struct folio *folio, struct vm_area_struct *vma, * These are later cleared by a NUMA hinting fault. Depending on these * faults, pages may be migrated for better NUMA placement. * + * @cp_flags carries the NUMA scan policy through the protection walk. + * * This is assuming that NUMA faults are handled using PROT_NONE. If * an architecture makes a different choice, it will need further * changes to the core. */ -unsigned long change_prot_numa(struct vm_area_struct *vma, - unsigned long addr, unsigned long end) +unsigned long change_prot_numa(struct vm_area_struct *vma, unsigned long addr, + unsigned long end, unsigned long cp_flags) { struct mmu_gather tlb; long nr_updated; tlb_gather_mmu(&tlb, vma->vm_mm); - nr_updated = change_protection(&tlb, vma, addr, end, MM_CP_PROT_NUMA); + nr_updated = change_protection(&tlb, vma, addr, end, cp_flags); if (nr_updated > 0) { count_vm_numa_events(NUMA_PTE_UPDATES, nr_updated); count_memcg_events_mm(vma->vm_mm, NUMA_PTE_UPDATES, nr_updated); diff --git a/mm/mprotect.c b/mm/mprotect.c index e59c69cb5a23..7a247ed4cd55 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -335,7 +335,6 @@ static long change_pte_range(struct mmu_gather *tlb, pte_t *pte, oldpte; spinlock_t *ptl; long pages = 0; - bool is_private_single_threaded; bool prot_numa = cp_flags & MM_CP_PROT_NUMA; bool uffd_rwp = cp_flags & MM_CP_UFFD_RWP; bool uffd_wp = cp_flags & MM_CP_UFFD_WP; @@ -346,9 +345,6 @@ static long change_pte_range(struct mmu_gather *tlb, if (!pte) return -EAGAIN; - if (prot_numa) - is_private_single_threaded = vma_is_single_threaded_private(vma); - flush_tlb_batched_pending(vma->vm_mm); lazy_mmu_mode_enable(); do { @@ -383,8 +379,7 @@ static long change_pte_range(struct mmu_gather *tlb, * must set protnone regardless of NUMA placement. */ if (prot_numa && - !folio_can_map_prot_numa(folio, vma, - is_private_single_threaded)) { + !folio_can_map_prot_numa(folio, vma, cp_flags)) { /* determine batch to skip */ nr_ptes = mprotect_folio_pte_batch(folio, -- 2.55.0