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 C1B49C83F17 for ; Fri, 18 Jul 2025 09:03:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 361D46B009C; Fri, 18 Jul 2025 05:03:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 311D16B009D; Fri, 18 Jul 2025 05:03:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DA0A6B009E; Fri, 18 Jul 2025 05:03:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 07D066B009C for ; Fri, 18 Jul 2025 05:03:12 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8573912DC78 for ; Fri, 18 Jul 2025 09:03:11 +0000 (UTC) X-FDA: 83676796182.02.E5F008A Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf10.hostedemail.com (Postfix) with ESMTP id D4E91C0014 for ; Fri, 18 Jul 2025 09:03:09 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf10.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752829390; 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; bh=VhDCjH6stdqZo9ZnL0wmZ30wbFq9dPNv+va0qFU4qrs=; b=6i5Sr+Z3BYXTpEaOORmb/A5eaHIm5zBfzZBCLi4TmCUxUngwLpBED+TgbGbtQM+u5HhDNH LuMeS0HcnUpPxJ2Tar71wlF4LXCvbHXHqg5g6eaLCoM0C5dwQtQmNFm0Uhq8V7RnIr8nmb dXYtOVc6C0vOCFxhP073EuUGWmvTq3c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752829390; a=rsa-sha256; cv=none; b=2pu5xXI7HhpV0/K+vfMLYxDx90/owdl1ct4auiexIVj4SzbSOE7PgQZdCUeoHVkefq06Jl lFpM3jTv3t8dOH0XZLN+nBNPtLLAS99rHaWaNDddD+db2eELztPqGpGUfIyftrTxu/3vsp 5815s1j5A53T+9Cv7CBY7dizR92ln8Y= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf10.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 633DF1A32; Fri, 18 Jul 2025 02:03:01 -0700 (PDT) Received: from MacBook-Pro.blr.arm.com (unknown [10.164.18.51]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A9B413F66E; Fri, 18 Jul 2025 02:03:00 -0700 (PDT) From: Dev Jain To: akpm@linux-foundation.org Cc: ryan.roberts@arm.com, david@redhat.com, willy@infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will@kernel.org, Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, vbabka@suse.cz, jannh@google.com, anshuman.khandual@arm.com, peterx@redhat.com, joey.gouly@arm.com, ioworker0@gmail.com, baohua@kernel.org, kevin.brodsky@arm.com, quic_zhenhuah@quicinc.com, christophe.leroy@csgroup.eu, yangyicong@hisilicon.com, linux-arm-kernel@lists.infradead.org, hughd@google.com, yang@os.amperecomputing.com, ziy@nvidia.com, Dev Jain Subject: [PATCH v5 1/7] mm: Refactor MM_CP_PROT_NUMA skipping case into new function Date: Fri, 18 Jul 2025 14:32:38 +0530 Message-Id: <20250718090244.21092-2-dev.jain@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250718090244.21092-1-dev.jain@arm.com> References: <20250718090244.21092-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D4E91C0014 X-Stat-Signature: mm4yokq5qr7ity1q1e1hk6tb1tx97nti X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1752829389-255051 X-HE-Meta: U2FsdGVkX1+msRO1vDW3qmxE/is4tRzurBL53ceC3eWf+NmaNimOlxtWFTmTWcbzssC60PTp7+IHE54ub7peYVzC+AoSH8fQHD7Zbw1sKVVcYuQ+yVMWoa7ZQmv54dT6nt67FRj7oCvpjyEbAk/qtr4JG9ot8vI9DUhUiLkkcnGdIphApSyA7m4xMO4zIRq3FM42HGZh1hKl1LRJLRKg4HKFwPW+Bc1zmngekhdWwsqGAwZUYih8FHl/cuzV4R4/7Qib4e/lj6HIkAoWnfn6Pna2FA2SGzboQrbix4alaPuitKKuf8hYJ47xBcCBb91LhNa4eMSHro9Zb4UtBB4Kc/70h0NWzZQdKeJSwmyfLyOWkVknMcg6rn1IqWVglXAxvJ8l1k9lZYqdv2XPUFA0Cg4dVNXvL+9hK2/LWy1eUf8MOo109oa/RUzdmpCs7pX1r96z2sb+M0okPoEug+BGhXXliKO3xHEM+Yl99x80MOgZaqNatqSPBHfml2MnXrAvbDUrC6drupY+o5cjA5/+lAMCLmxfko3M8dkUrHQVq4pepVE7HHzXgKCUx20/jka/ONPDSO/LaspZ4FmOrge1q+rxRY9lq1VffdTtGj86u3cKhfhACGGoVJKsjU+nBg91TycLco3+qTx5J9RNH/8Bsawt6sC5vVdkJG1AWBR9Ee6UpbFLmamwQIVdbtwjRk408ttZ54lP7vqvf5swsfycY0qYvcVlqEMs90Mz9nbM6SAnlqTu5mU1SBdthHGJex4Z59KCM1qHqeBi+ZrSIIVS0vFbDG5arq1+W4M81c8q1HcYReb45+pYc77tRl+ZSKjBrfmEowUiBI0PLHsagf4OwOeVY+k8/SmbRtweyiExzxjxw38Il7dEm3Th7E0WU13XiO9oi0+s6CAg0oygvRUQQueMm4Erp706Kz/8GqNuMWwWAkmpMQ2uJLIDiGr73u6+CD9Ud6ughDEXVE6gLUH 235l4gNB 0zzpiEYz21HyG+2U9fDUl5NUMJKqpxxaf5PxHmFFWVUaM9OZJmFSazgHDdGb3/oPABOssTp4ViBg2S1k4t6vBhwhnRzpiXkZ72EIt6r+Rgp4L7UHqFkyfuQTTD4DyeguxRzTn4MHQul5Cko0+FKPim31wDB1oIfUhy3fhyFBbE6Db97hE4a+sXVpasWqbRz7admExlFW7elyFAF1okagEO3JsECZcTkurYHji2M+u8BSjtss= 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: List-Subscribe: List-Unsubscribe: Reduce indentation by refactoring the prot_numa case into a new function. No functional change intended. Signed-off-by: Dev Jain --- mm/mprotect.c | 101 +++++++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 46 deletions(-) diff --git a/mm/mprotect.c b/mm/mprotect.c index 88709c01177b..2a9c73bd0778 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -83,6 +83,59 @@ bool can_change_pte_writable(struct vm_area_struct *vma, unsigned long addr, return pte_dirty(pte); } +static bool prot_numa_skip(struct vm_area_struct *vma, unsigned long addr, + pte_t oldpte, pte_t *pte, int target_node) +{ + struct folio *folio; + bool toptier; + int nid; + + /* Avoid TLB flush if possible */ + if (pte_protnone(oldpte)) + return true; + + folio = vm_normal_folio(vma, addr, oldpte); + if (!folio) + return true; + + if (folio_is_zone_device(folio) || folio_test_ksm(folio)) + return true; + + /* Also skip shared copy-on-write pages */ + if (is_cow_mapping(vma->vm_flags) && + (folio_maybe_dma_pinned(folio) || folio_maybe_mapped_shared(folio))) + return true; + + /* + * While migration can move some dirty pages, + * it cannot move them all from MIGRATE_ASYNC + * context. + */ + if (folio_is_file_lru(folio) && folio_test_dirty(folio)) + return true; + + /* + * Don't mess with PTEs if page is already on the node + * a single-threaded process is running on. + */ + nid = folio_nid(folio); + if (target_node == nid) + return true; + + toptier = node_is_toptier(nid); + + /* + * Skip scanning top tier node if normal numa + * balancing is disabled + */ + if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_NORMAL) && toptier) + return true; + + if (folio_use_access_time(folio)) + folio_xchg_access_time(folio, jiffies_to_msecs(jiffies)); + return false; +} + static long change_pte_range(struct mmu_gather *tlb, struct vm_area_struct *vma, pmd_t *pmd, unsigned long addr, unsigned long end, pgprot_t newprot, unsigned long cp_flags) @@ -117,53 +170,9 @@ static long change_pte_range(struct mmu_gather *tlb, * pages. See similar comment in change_huge_pmd. */ if (prot_numa) { - struct folio *folio; - int nid; - bool toptier; - - /* Avoid TLB flush if possible */ - if (pte_protnone(oldpte)) - continue; - - folio = vm_normal_folio(vma, addr, oldpte); - if (!folio || folio_is_zone_device(folio) || - folio_test_ksm(folio)) - continue; - - /* Also skip shared copy-on-write pages */ - if (is_cow_mapping(vma->vm_flags) && - (folio_maybe_dma_pinned(folio) || - folio_maybe_mapped_shared(folio))) - continue; - - /* - * While migration can move some dirty pages, - * it cannot move them all from MIGRATE_ASYNC - * context. - */ - if (folio_is_file_lru(folio) && - folio_test_dirty(folio)) - continue; - - /* - * Don't mess with PTEs if page is already on the node - * a single-threaded process is running on. - */ - nid = folio_nid(folio); - if (target_node == nid) - continue; - toptier = node_is_toptier(nid); - - /* - * Skip scanning top tier node if normal numa - * balancing is disabled - */ - if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_NORMAL) && - toptier) + if (prot_numa_skip(vma, addr, oldpte, pte, + target_node)) continue; - if (folio_use_access_time(folio)) - folio_xchg_access_time(folio, - jiffies_to_msecs(jiffies)); } oldpte = ptep_modify_prot_start(vma, addr, pte); -- 2.30.2