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 406D7C369DC for ; Mon, 28 Apr 2025 12:04:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 761386B0010; Mon, 28 Apr 2025 08:04:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 70CBA6B0023; Mon, 28 Apr 2025 08:04:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5AD6A6B00B0; Mon, 28 Apr 2025 08:04:50 -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 367B16B0010 for ; Mon, 28 Apr 2025 08:04:50 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0CCE51A18E1 for ; Mon, 28 Apr 2025 12:04:51 +0000 (UTC) X-FDA: 83383321182.27.5DD176E Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf01.hostedemail.com (Postfix) with ESMTP id 6040340017 for ; Mon, 28 Apr 2025 12:04:49 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf01.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=1745841889; 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=l2fqn0sLuea+GgAXaF6jDMicxFyeS8CTiS9Ax1VxD1A=; b=FxFp59oybFHtRwd5dkeCUaK9C7GRLuzEt/B6d9XfNh4vaOBkQV4uHOdhb4Cjnnm4Nr9Nf2 Khaa0yseOxQQZyaOGtGh57M4P32uVTRw/A/N+d38O2ur24GCBxQCklluYHwdjV3BCG0ton k7EAcLAZuB6zKEDZ3taZVUmzs7RFf9k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745841889; a=rsa-sha256; cv=none; b=Cadcpw1F7FXbdDeFJXXJXp8wo89zyTyGK+5TyfsjnlrabizhzmoPTmjlCnP0O71pZrhsCY 40O/kdxeDWwdiQy/7isl3Sp2TXoWJEbOk3B1AXpD0DyW4ug34IqgMPwcOPhwcC1utWgd4A mOe7p9U3rJA4/z7kH6e6ghrjyWYZsUA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf01.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 BF0C21595; Mon, 28 Apr 2025 05:04:41 -0700 (PDT) Received: from K4MQJ0H1H2.arm.com (unknown [10.163.78.210]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 54F5D3F66E; Mon, 28 Apr 2025 05:04:37 -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 1/7] mm: Refactor code in mprotect Date: Mon, 28 Apr 2025 17:34:08 +0530 Message-Id: <20250428120414.12101-2-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250428120414.12101-1-dev.jain@arm.com> References: <20250428120414.12101-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 6040340017 X-Rspam-User: X-Stat-Signature: aw5jg7ybrj6c5my8jnie5h5aijodyixw X-HE-Tag: 1745841889-338383 X-HE-Meta: U2FsdGVkX18PZdASK8SzlSsa4KV+O+8KQdFpJk1G6O0pmxaeLcUHwQa0lmiW672Ob5qYQrXYtix6zKFDnwgk1v9QNQdAo9fvGLuLSwZrzpq2hLvEBKjA4f1c3k8VRCXwI8BkhRX9RH887voxVKYkSqCES55qRnn8jgpY1Hv53hgVnGHKRd118U3e+psJV/SA28OVFWvYs8s5mU/ArUxBDB7pX/QRl3Zf4X7AZ+PpMoWc+K6XTQRRWU3rBAlPSFqvDr+fsbHmzQFKurV+e64iqyo0hw62JaBn6RZj7ssS8PN5Cd3Cyr8/gqUepWs4prmt+4xqZgXnuPU8X80fzd7S+g5FSqq+vbNfexubC5QfByop5YDBuroZEOAkCgDJ9FcRssPrZGE9xF2mx4QaXST7C9R0GtP4wAxrkns7HYD+V1cyFYHthkF/BglirugvoAQ5NUHITUT7u+VTJg3q9UxssQZIizwiY2AXXc0Rd/HHXu0ZYg5pY1FgEH98wNuQqfga7QsAp5t2RA/T6cCu3BQYRLTfLTDE3D3jYPEZvFKBKfmTnGJKsLk20AEDySS89cW8Lwa4iG3lNgqsZV4robEVwzVtKZqgynjFgOvhz8k0IWHDPeBTCS9mrqTj0o7f8kAz2oBtG6TqyFmahQURxh0uCyi8jP3lw3ecy/Y5BR2rpMtENTlt5fYoHiK8XZqVcanOSg5Qzrezpizwka8T2bL7goukC0071gClWcPaPf/fPN70oyr4/dRmtoJpw4oSvPWbCfrdrjFo3L40V/qtuSKifmtpCH6FVzqIvLVWDutqaZPQCDLsZizkzs8gtqAV+a4bA2f0NhIRB4w8CN9PuBx1yySUKfGmCUb53chJehaDljgA0RzaOi25lOkd1D8O6gYkRy/SglT7XDdnsotEX3kApgZTu9L8UBquxXsJJeyoXAqtw9vKQDDJMRqrmLMMIm97SEbEVdD0u9woutZLc03 sPqx4sUc PApihi8JmpsPSyGI0uTk7o23hTx/W7kih61NqJDh6EXZYnquIcm2FFZWqxJIjZuCGsETjE14FA6aKncRsDpr4AQWgDnhO+P1SMXY1bSWISiAuzGAUlEZG2Q4ybX4kjQBBAgqvFJoPfDZiFndmSJTMybe5vg== 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 62c1f7945741..8d635c7fc81f 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