From patchwork Thu Jun 13 08:38:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13696346 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 F2DB8C41513 for ; Thu, 13 Jun 2024 08:39:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 951626B0096; Thu, 13 Jun 2024 04:39:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 927816B0098; Thu, 13 Jun 2024 04:39:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7EF026B009B; Thu, 13 Jun 2024 04:39:18 -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 649A06B0096 for ; Thu, 13 Jun 2024 04:39:18 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1DBAC1419BD for ; Thu, 13 Jun 2024 08:39:18 +0000 (UTC) X-FDA: 82225215996.22.9029314 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by imf15.hostedemail.com (Postfix) with ESMTP id 4C2D3A000E for ; Thu, 13 Jun 2024 08:39:16 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=A5L854jG; spf=pass (imf15.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.173 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718267956; 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=A5Cg5Bw8hj6kh0AKq+CP9F+WzciGspxa+25MjItj/4s=; b=z/VA405rYNEwInrNcFCY+UjG4rWYDVz5tQdRDFHoStea9KBQBwNBdKs5ah86pD+7lvfsJE Z8+uS1uoa2kytIRAkj4gs4oywxUWYKF48tmpYZVId8FYusrENBnL9RCFknfFjpG6/By2dq xXDTjc6/YXNWd2nV4V2p5oQol0SPKKE= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=A5L854jG; spf=pass (imf15.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.173 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718267956; a=rsa-sha256; cv=none; b=luz3zeBFRXWIyNF9Q4TDVIbha+d491rqu0+pm7wFQQaYt9ZirKbWPNou8wIvH4ae6WZNJn 2APHiYK6mGNEnmI934gG+XZL8lbjndpgBI61wrGc+gjuf750XgLKAuFzb++0JpdBDvC/Fg 9EEBuo72DvUiEB3ewaFtohKw2QRKPA0= Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-6c386a3ac43so40917a12.0 for ; Thu, 13 Jun 2024 01:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1718267955; x=1718872755; 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; bh=A5Cg5Bw8hj6kh0AKq+CP9F+WzciGspxa+25MjItj/4s=; b=A5L854jGwMH6GQ0TkT6fnktjgnjGeW4Q8HJpxJmsQ6fg9cw/5iA7s5Wi0FzXBOANEG WKszqGF1Fc6t89Uq5pHbw7z+Cf89zTIP/W9uoQ+npvTqWLrpVXJ0OmpPaKni7bq6L28k +WdsMyW/n76sBJHk9XKq4GLgjnRNbxe0BpYvZsncBLHjzVX+qdnPgUloI5rfdgW6kTN+ 2M6aZBznqH+LNzgmObs1nNNvmjJTyS/ZKoeB5bUGRsNHibD4EAFTDQBXA0C1rhqZW61m DXaxkGiU9nIYcUlCZ7WIvKO1Fl4ONkeLuv9Oyy1Bou58/enl5KMJCrOBYcAGXZLGECvl jsvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718267955; x=1718872755; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A5Cg5Bw8hj6kh0AKq+CP9F+WzciGspxa+25MjItj/4s=; b=iFQsawvzzSeDv1d6xKnQCxENagtIy+Alaqy3lycrfT95bDbRYoW/NJRwLs4tmhjzGc T7AXZKg2wD6GUFLhezv6GFhnRBrxldv0MUfUsVMIgrUxDLQi3rpdcO73TbBtoBUejUg3 iUy3QJnKfKm7wVSAcJg7yy2ZvdjWEVn9OtFUreSFeJtN/doOmSPnAtqjErxxdwR5497U jEqXuP5GFcWYHC5MiCALgh1skdRS8kuty4uA/NsVi72pO3Q80IwpSTjI23n+Xb0cT3N7 92O8ElOt8ISp6WAX4D3Mh0Jspfi1mFhTesw2hHIreaot8UAiSkWrtA7f2e7bumAft6Pi AswQ== X-Gm-Message-State: AOJu0YyC+SSCxM440oRtQVCHUtV12mV5JNgxUWuIIqRKsaFdkoTliHSb h5+buBUq0SmsKZ++4VVY5Xno92P7mtUkrypRGddavVcyoghovODV2XjKpaAna099sGMBbe53UHh C X-Google-Smtp-Source: AGHT+IFkPIn1Dv10c/sdgT1s4Zy3CxP/93/DlvxiYc4NUJmFcAF7R4ScSAp8hM8C7UzSnp9lmTxVHg== X-Received: by 2002:a05:6a20:da89:b0:1b4:4ed4:91f5 with SMTP id adf61e73a8af0-1b8ab6ab543mr4962426637.6.1718267954815; Thu, 13 Jun 2024 01:39:14 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-705ccb980bdsm820856b3a.211.2024.06.13.01.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 01:39:14 -0700 (PDT) From: Qi Zheng To: david@redhat.com, hughd@google.com, willy@infradead.org, mgorman@suse.de, muchun.song@linux.dev, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [RFC PATCH 1/3] mm: pgtable: move pte_free_defer() out of CONFIG_TRANSPARENT_HUGEPAGE Date: Thu, 13 Jun 2024 16:38:08 +0800 Message-Id: <7864fd8186075ae12fd227f13f4191f3d1bc6764.1718267194.git.zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 4C2D3A000E X-Stat-Signature: p9net5r4oqzq7n3bjtx5hi6kbsiq6wpa X-HE-Tag: 1718267956-580627 X-HE-Meta: U2FsdGVkX18mOVP2drJ0EKI7gYfQ/zLCC7kV3UUjG1jPmPtRoe0TfS27JdlWxhDQV5C2PJu6FMeQhRMefINcFJ7OTlH/GvtZT/g2JFy5QjDPnq5AKA9PTnCuWWzm6a1fjZLcKskFiiH1040PYscNOcuW/Ptq7sa7aDZu7I5nCWhWUzjshD6/QEktRofu+Cco+jpAJpAhBhv3VSMiIFkXHqvN6RX1wfkPOCEftfvGCmC6VPMyu1f1UWNHl/+rs1GjjWxVvJsNcxEeqRBPazJJ5pJxs6maD6OfR3yABXCNsWAm4lzUufcRyR2uJRja15ZL29iiae//SZGU7VwKGih9H2wVdLW+ghHadZ9AdHv8vAmuUPB4uCTAMw0+LKUlD5NE0WfdJGkZ055vyS8JNkCf7rY12nBf7iM4zeoEBi+vGskI1pzQE220518Fm2DFCHP0sdDEShLHYNG+eqByCsOxNlT5XCrhgH7x7ed4Ec5imkdBtCrTPAwJc7n0roX3nkxHB4tT+of41LJiOIpaDs5CWRg4bbUDndV7O9JR+ybN6WiGHWwWDBLzn0NS3pCg8udx13f2LZFAbdhNCUYxcU13oMZEwJPSi0wN9YCS19pjo479CFPO0nXy2C/BKxB8xwdzrI79JewMC691LTq+MKl18rwQNAWEwAryvI2qzII4pk0U2YMw4zOTTf8SMG3zP2jQDaj3mZjMtdDqtRFX/Yn/8UZ7bQxxjgYUPUxznhmLKrhk5iM1KVLt14wxt5gCjC9x/4lgYLVlGCxydZXdjN6K+zAJpalARUkcMO7uiRtp9gKWjOXIlpf96Jlxt/03XeWph2+mzzEle+Qn2CU5dBZJWB3Ppl+IPWxwvN14MIoDr6mjUTZlbfObaBXNffYN6Qd2PpS/Job2mkKAKL20hEd/m57ltSntFt83lqMqXz9dArMail973N8hfYkoDUvGx52PGhthMjXkPn8shc2UFBX 5rCHDipU tMSeZmgOSyaClS7ZbIQskPe1ea3/moARfdPI6STtF2vxt0r+LXM/+RH0LpJeAag6wONr/Ruu76pLeksaqHnXU1qzgOfG/VJJichmuvrPeMc9aAp/W4sJ+WGi4MZVBvq+Uhl0KdxDeFnXgfNgyJhy06yg74rUI9B6Pb62+eRV35mFaW0jhq4kr68Jz9RhAchBJUwS8oBh6P0wUyy3Pw0qhbobKr+I0gJMzR5IfgYTPtY2ewjSf8WuCeYx3ZpNYFwBiZaq+VpF2PyTnAWxZAOfQVi8m86Zzomi4GDM0FrW4gwUFB+ULvgeSREXiWZg75P6TZmoZjYq8lj5ZusbDKPP2n/fwfWKUKP+YkuyXMehAQmzPXMnQhbe1BFpDYA== 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: In order to reuse the pte_free_defer() in the subsequent work of freeing empty user PTE pages, move it out of the CONFIG_TRANSPARENT_HUGEPAGE range. No functional change intended. Signed-off-by: Qi Zheng --- arch/powerpc/mm/pgtable-frag.c | 2 -- arch/s390/mm/pgalloc.c | 2 -- arch/sparc/mm/init_64.c | 2 +- mm/pgtable-generic.c | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/mm/pgtable-frag.c b/arch/powerpc/mm/pgtable-frag.c index 8c31802f97e8..46d8f4bec85e 100644 --- a/arch/powerpc/mm/pgtable-frag.c +++ b/arch/powerpc/mm/pgtable-frag.c @@ -133,7 +133,6 @@ void pte_fragment_free(unsigned long *table, int kernel) } } -#ifdef CONFIG_TRANSPARENT_HUGEPAGE void pte_free_defer(struct mm_struct *mm, pgtable_t pgtable) { struct page *page; @@ -142,4 +141,3 @@ void pte_free_defer(struct mm_struct *mm, pgtable_t pgtable) SetPageActive(page); pte_fragment_free((unsigned long *)pgtable, 0); } -#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c index abb629d7e131..6415379bd3fd 100644 --- a/arch/s390/mm/pgalloc.c +++ b/arch/s390/mm/pgalloc.c @@ -204,7 +204,6 @@ void __tlb_remove_table(void *table) pagetable_pte_dtor_free(ptdesc); } -#ifdef CONFIG_TRANSPARENT_HUGEPAGE static void pte_free_now(struct rcu_head *head) { struct ptdesc *ptdesc = container_of(head, struct ptdesc, pt_rcu_head); @@ -223,7 +222,6 @@ void pte_free_defer(struct mm_struct *mm, pgtable_t pgtable) */ WARN_ON_ONCE(mm_has_pgste(mm)); } -#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /* * Base infrastructure required to generate basic asces, region, segment, diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 53d7cb5bbffe..20aaf123c9fc 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -2939,7 +2939,6 @@ void pgtable_free(void *table, bool is_page) kmem_cache_free(pgtable_cache, table); } -#ifdef CONFIG_TRANSPARENT_HUGEPAGE static void pte_free_now(struct rcu_head *head) { struct page *page; @@ -2956,6 +2955,7 @@ void pte_free_defer(struct mm_struct *mm, pgtable_t pgtable) call_rcu(&page->rcu_head, pte_free_now); } +#ifdef CONFIG_TRANSPARENT_HUGEPAGE void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmd) { diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c index a78a4adf711a..197937495a0a 100644 --- a/mm/pgtable-generic.c +++ b/mm/pgtable-generic.c @@ -233,6 +233,7 @@ pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, unsigned long address, return pmd; } #endif +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /* arch define pte_free_defer in asm/pgalloc.h for its own implementation */ #ifndef pte_free_defer @@ -252,7 +253,6 @@ void pte_free_defer(struct mm_struct *mm, pgtable_t pgtable) call_rcu(&page->rcu_head, pte_free_now); } #endif /* pte_free_defer */ -#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #if defined(CONFIG_GUP_GET_PXX_LOW_HIGH) && \ (defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RCU))