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 D6D95C3ABA5 for ; Tue, 29 Apr 2025 05:24:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8BC0C6B000C; Tue, 29 Apr 2025 01:24:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 846136B000D; Tue, 29 Apr 2025 01:24:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 735506B000E; Tue, 29 Apr 2025 01:24:04 -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 53DB06B000C for ; Tue, 29 Apr 2025 01:24:04 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7D9B81CE0C6 for ; Tue, 29 Apr 2025 05:24:04 +0000 (UTC) X-FDA: 83385940008.30.3464282 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf17.hostedemail.com (Postfix) with ESMTP id E135240007 for ; Tue, 29 Apr 2025 05:24:02 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf17.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745904243; a=rsa-sha256; cv=none; b=C//dvyaXv0Y22jxyExtekq4NorX0E5GtXKNH7BLxG1/nQlZvg23FZJwjRWFNoYo8ZkB5ap Sr0LhHUL+CqG9QDHcOMP1uI86A+G8O5NPvZulG/fTCAywZnhDIIER7N2xbBEJXDKeYxz0Q 2lsvHlZhmvg039/bIuOm9pdXZo0TEj0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf17.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=1745904243; 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=/GoV8Ij9KxONnykpkjkgvycprc6mXZ4H5gzdtcHChwc=; b=oiImXRDYD5ctPxQiMXqRY+kdrRXE1vJAKGJPFmG/sC0s3nOZ+QeheNkuCrIDPzM/OS/sgd wJExtf52Xo1PJD8ztDZMbow8WEje1xqcl0O6gykqCD5fWgx7MewwmeGpVQTmReyL/DrQFi JFqfdRgpP5CwIGoFYPWfG3XSezu4rYs= 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 259331515; Mon, 28 Apr 2025 22:23:55 -0700 (PDT) Received: from K4MQJ0H1H2.arm.com (unknown [10.163.78.253]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 421023F5A1; Mon, 28 Apr 2025 22:23:51 -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, namit@vmware.com, hughd@google.com, yang@os.amperecomputing.com, ziy@nvidia.com, Dev Jain Subject: [PATCH v2 1/7] mm: Refactor code in mprotect Date: Tue, 29 Apr 2025 10:53:30 +0530 Message-Id: <20250429052336.18912-2-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250429052336.18912-1-dev.jain@arm.com> References: <20250429052336.18912-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: E135240007 X-Rspamd-Server: rspam04 X-Stat-Signature: fmtbx788nrw1tjood1c8ektz3zok3es8 X-HE-Tag: 1745904242-866122 X-HE-Meta: U2FsdGVkX183BdZ69DxWrzBMgNd57GKuYNJwfDtrdQcyQOv6+z8m+VgbaQ4dYtzeKfTS+2ykQEx24C5gEQHWXQIKV1YvjSukCxnTBKId2IveU1vM7dW44us4chLABAvupp3AMTehe4dfO4w4sZVWUHu8wkfPr5ZR7B9SPk7Be2ApwKOxM57p7NjD1kn9GtHuD2tblgvXAkaCx+AFwREgXuCOX6IyrOkaja1Hys79/F2rwgrZq/jsS+RpmcTHvq744l0WHYQoFwCexblbWnCjgS9aY79UVNalXkAOH+LtNxQAxGYqsv/I/WybuAiKzHyvleNOf3qijahsuM9d5MMw9exEY/NFJNisguQWvN6cR30FSNjxGDS/srEqNd30+bC5zqG3npgolKplQlSX3KiScWXFtN91YqsPw84foLDldUSiaCTf6kxgS3pziekZ+kVR7cj7Tx0/qKWITjA+Ye8Dlm+bMyOK9rE4kIIvRNRu++7z+45FEtXmA0S86vmE2hhDotxZe/KcjD0YR4ArwkZq86tSJuzWWa9Z9ZGG604ZwU0zPJ7WfZJPW7Qec3yLNTU13cN3WJwONvw92QmfytRtJS9SwnKy02KSzC5ezBE5Ff9NINnlO2b9wTLttcRivf16nuyCfkecbMrLWimYDnJSbfuikmFCNFM5bU5u+C/Imr5lIjENZWOfwChd+ZSUREdB1KeD2sNYDXt3dB878vmxOO9mAPC1Q5wUjLwd8QtHZ5oZY+nrkaYn+pyaZQWYI4UuVG4h3142Xx3NJavCC7nuVdwgYGiRAoldIekoA79Iyw7XSCG3coFA4pC1ie49yPGl9JyxTJu9WqhLMs3mK5K1NlezESAWB00lUsGkZjxlgIimiWOXO0AtubE2trjbhKFo4mtnKrSAdORcwr+2ePQR+MtS9/IK3H/OIwj7QszXXevfPDP8NP9m2z3N/fEX61aad1zuFiR+nLfOS7u1uQF B44d4YFw bTsJbYSJJ1HfGtaQ2qjOYTCCIzj1aZbZJQFCRjOarHcggLelMNj3xjJFxRWEglG2GqysWe1gJE8zLbF4QXpK2/ygpSagU219fU9wXn8AY2E2QBrldXkFxO7Cem7qoao/Q2JgwYv+7jjAMqUW3AkaXx5M5Yg== 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 in change_pte_range() by refactoring some of the code into a new function. No functional change. Signed-off-by: Dev Jain --- mm/mprotect.c | 116 +++++++++++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 48 deletions(-) diff --git a/mm/mprotect.c b/mm/mprotect.c index 88608d0dc2c2..70f59aa8c2a8 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -83,6 +83,71 @@ 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, struct folio *folio, + int target_node) +{ + bool toptier; + int nid; + + /* 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; + return false; +} + +static bool prot_numa_avoid_fault(struct vm_area_struct *vma, + unsigned long addr, pte_t oldpte, int target_node) +{ + struct folio *folio; + int ret; + + /* Avoid TLB flush if possible */ + if (pte_protnone(oldpte)) + return true; + + folio = vm_normal_folio(vma, addr, oldpte); + if (!folio || folio_is_zone_device(folio) || + folio_test_ksm(folio)) + return true; + ret = prot_numa_skip(vma, folio, target_node); + if (ret) + return ret; + 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) @@ -116,56 +181,11 @@ static long change_pte_range(struct mmu_gather *tlb, * Avoid trapping faults against the zero or KSM * 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)) + if (prot_numa && + prot_numa_avoid_fault(vma, addr, + oldpte, target_node)) 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) - continue; - if (folio_use_access_time(folio)) - folio_xchg_access_time(folio, - jiffies_to_msecs(jiffies)); - } - oldpte = ptep_modify_prot_start(vma, addr, pte); ptent = pte_modify(oldpte, newprot); -- 2.30.2