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 AD6D3E77188 for ; Mon, 30 Dec 2024 09:09:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D5996B0099; Mon, 30 Dec 2024 04:09:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 35D0A6B009A; Mon, 30 Dec 2024 04:09:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1AED16B009B; Mon, 30 Dec 2024 04:09:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id F186B6B0099 for ; Mon, 30 Dec 2024 04:09:58 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 7A230A044E for ; Mon, 30 Dec 2024 09:09:58 +0000 (UTC) X-FDA: 82951051806.30.9D61FE5 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf22.hostedemail.com (Postfix) with ESMTP id 74203C0008 for ; Mon, 30 Dec 2024 09:09:08 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=k3gbn61E; spf=pass (imf22.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.171 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=1735549761; 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=xY41yoAggnrpKZDOvMIy0+FhpPRF9QFn+bDK7HKPzWw=; b=zjzAd/pmZMopQJURPYvBbSyuYnZ/4yzH6a2gz25O3MrGUfcECscjn/biqSLOhd5dNBHcGh 50PDQmCvruh7+Ed4A2Yzlq6qPh5pWCB/O+P+jbjXT/AcZUkCmoMEcczlkk9BW162MDsMZ8 7Ftg5XZC23UYeLoNCLx3crB3XPn21J4= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=k3gbn61E; spf=pass (imf22.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.171 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=1735549761; a=rsa-sha256; cv=none; b=2e74YA7vebIREKfeyUnETtn/VbNbQTQlr7jhmyuMO1d/O0Vq+07gyv6/E+pNtq/qJtMopc E+CgVCcuKkuWxDEEU+pWTmtD/Vegj93wTJWJUm2eKqZrlN5/Js1PGLNTr8a3CEJJVsTxy4 k9yW0A19JUOc7C65pXZOmOwnKK3LPdA= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-216728b1836so101117295ad.0 for ; Mon, 30 Dec 2024 01:09:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1735549795; x=1736154595; 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=xY41yoAggnrpKZDOvMIy0+FhpPRF9QFn+bDK7HKPzWw=; b=k3gbn61EmVwCHYy/+rkIYLA3AD3fSKh2vsJgHTRYxG6dm9jfy2+IyflTfAKzJUbqaJ y6HLxwnZzzb1Q4NyC/+5NOLxLd0+SwsUjpKJ7l8igVAZOKMR2r+xWxQAlL/GZI+oSyAF XsrXDAvyqf4pwxTIcBjBVddT24TvJcSr4FiV6tBNPpZI+ukHaPouZWh/+66GFXYCN9T8 KTQGOA9nL9TPrls7pBYbsdVng2BiAa5lBUR0/k4duLpmCQ0sVuVmnaRNaJbdWkVu9fIx 6xolhg7YKEhxExldm4C/pyYQ9sivbiBtiZqIabtUGQX+sBe7Td2/4P/1ShObsDh/9W49 xJyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735549795; x=1736154595; 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=xY41yoAggnrpKZDOvMIy0+FhpPRF9QFn+bDK7HKPzWw=; b=Ydu6SFr6KU3aRmfW+BLwQ0BYL/S7Vc4LG1riosWJAczf4BH2pQCHmJ764EkKeNWEu8 ND2tSP+q/hQ8wJChpvbVc7Iuayn6E1/Q8vQBRSQ/P1aVOFk6JHPhpJqbTTaoyqn2h820 foenKvlp9jUKQk9hbEvb9ssTcD27RwR9dD4FtJinZampdE11GxtfJ+Jy4UxoY1cskcMT 2MgprHaDEQDWfKjEGTmgysSjm2lwkj1pQFZ1/Ill21jBxEEYYwwZWGmj2XeFYzw6SVd9 fmLlQfWBrsNvl3+Hvi9tXDStqbp8xTjxgJX3pF1Ik6ATtQLIiqC5GZny+Zr1KaLzwTr6 +6cA== X-Gm-Message-State: AOJu0YwPyfL9piHyV08vxvUVmwLXH7dBDfzIfLL2rUdAApLpbP5RJ0Nx e1m61ZBYQW9YZQJhEzdI6YS8tLWYLHOMERWTIa6z5PKDeJpruOIJiLxKmqroC6A= X-Gm-Gg: ASbGncvnzgzPTwdyFZ/E2HJRh90EBTp3TDr5O1Sh0AxqBD1ruQ2T4t7JViB0Sg5TG3Z XpjZ97aic+Cj8x4wEvH+oCyWKMWkMuyFViWhU6+ho/gP+myPFE+UNKLKX7NoEf9CjtsX3OirZHw /9/RuXNXcTSmgRgAnZLdA1epXpKIJY7/PoUJh/IiLWApmX5JS6llef6FswrNjRnx9aYxhy88qOu STHg3yZuZhMJNtQL4cRKAEFrZhS1m2bPGzJIZip/inRMx3LudYDRdcL0NcXQz7ynFvC4qoN5mvk CQGsRqpJbTjkzHzpEfUp1Q== X-Google-Smtp-Source: AGHT+IGnRshrEAoIvJb/W9ouyd0xHkDgdKkbYKOXyUcaItniQPw/Z8/M3j6tdqefIia4rt8bUMG2kg== X-Received: by 2002:a05:6a21:328d:b0:1db:f68a:d943 with SMTP id adf61e73a8af0-1e5e0461b11mr51051580637.17.1735549795427; Mon, 30 Dec 2024 01:09:55 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.150]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-842aba72f7csm17057841a12.4.2024.12.30.01.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 01:09:54 -0800 (PST) From: Qi Zheng To: peterz@infradead.org, agordeev@linux.ibm.com, kevin.brodsky@arm.com, palmer@dabbelt.com, tglx@linutronix.de, david@redhat.com, jannh@google.com, hughd@google.com, yuzhao@google.com, willy@infradead.org, muchun.song@linux.dev, vbabka@kernel.org, lorenzo.stoakes@oracle.com, akpm@linux-foundation.org, rientjes@google.com, vishal.moola@gmail.com, arnd@arndb.de, will@kernel.org, aneesh.kumar@kernel.org, npiggin@gmail.com, dave.hansen@linux.intel.com, rppt@kernel.org, ryan.roberts@arm.com Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-sh@vger.kernel.org, linux-um@lists.infradead.org, Qi Zheng Subject: [PATCH v4 06/15] s390: pgtable: add statistics for PUD and P4D level page table Date: Mon, 30 Dec 2024 17:07:41 +0800 Message-Id: <35be22a2b1666df729a9fc108c2da5cce266e4be.1735549103.git.zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 74203C0008 X-Rspamd-Server: rspam12 X-Stat-Signature: 1x78xzikgauy66fo9p41wcmws7n7umt3 X-Rspam-User: X-HE-Tag: 1735549748-702874 X-HE-Meta: U2FsdGVkX188KTbAwWUNzsGWwykJc83M9RfTKfMPHOxnvWrmRTYZrWArMrMjxNunEp3QOqueM8zEkwR2tNh7yWovb+dNfcLMPcTWXPjPiwb8A0GSINHDv8ek3G/CPCj7hZa3YoH6G6DqYXWDPisTkU+vNyKjmRBIVPGbMpt6TZreC+MTyeFjhIedKQkCqtXqcCffcSFIJL51D7UjVKJlPfQvRy1CdVIDPC0tS38fDa05n0GYNuPWKSERtf8LNRCnI09X0cEnivAeGevLw5t3voN7zbqGSZu5S/YAmT/jzHeEGTOm1VOrcg92kvQhYW6ZReO508SQ/dicf/8XEnMRIhDyldS4KsUwfWAmEMtcmp9ZOetl1YpJG7nhVpAfSm2wO4hyQTKTd5QE3enCMtHTMzOwIsbPGu5JuPir/OrJpKbhWLo8whUxs2+U8isdOrkmeKaq1VxAuxnxnBM2GzMuPJE3CIwsB+lVKXu5mRtQpUvcDb9O/DMXmZHG7CWx8Rw12BI5yXNA0vWk4G5tGFBhDXvoPKb8XomtnjC5efuC8kF0pNP2mx9LqQkdkvbhvMURasrf5dxpP8/BQixA2S71VO9AbXZ1B2khXOvkC+gWwSj/zMsLsZW2niHB2ZSjqD4jlPmW/R4y/WDpJdBk7sjaTnYXfZjoD3GzHXSUG7A89VisCjQg3x1Y7U8HoGVNfDjsgMbN/FI3wx73/ZmfolKxFj7siSA3kxF0P4V0I6zlEoFuKP/9dE5shPX1mdAecnmHBcm4goOCc2z68Ew0tapbG1lREJ4WaDOMVr4zLdINuKpYx4ZV3P123gxxaPJxaiJjZfiQB9IRmyPIvOIfGbBV6EM+/r1DBxvqsQXJx78XGkdqVsJ3UWqpvmth00zvryi1NYJUZkZ8OG6AYPrX0+9woQopJF5wgbp/gGCntV7fQ+nictZIKHu4sdiA3TE5dhvbuAAPwDt7SpSj/aQVRzF iJwjGUW1 4KSHMFq9NIGej5EVy39x+DlcD9Gk9/qp00lMlUbJmwPm63KOXPMdlRHv9hVXVZ3PN93r6oibFA2X6W0yOTQAa6XfduZjsDx1bKA1Y0o/Lroq9E2BSIbVYnvysU0+a7hudXWXMOjSzsZmVrR1iL7hNtkbh8bOGTxRRlZPHyNtnZZefYAYPWY/cp2s6kQObogMIpY1dCz99NHADCKA4uEngfwnGkeRVVTz43fCIjKG5uPK1qsex+Qipu5zjJ3RDYoZEmt4ia9Vk7Rh+VgYlqxxxM27XOAdlCiQiwHuggvMft1b2Jp5Su0vviH9wplA+HSdkB72Trm2sXll1yqQNUyulTMETbhpi3Etn6S3Zbv+NEBHgEepmv/VS9Qz2hvaFxwf9N8tR04AGxrOyAljhX2WwV+oct9H6ULQwvMfb/RJeGIVJglXyLklMQkXX+Muz4kddgnvjSDAwFtcOInd41Q62NDBMlNK2gkY3L5BUodUpSf7IGqOHpqJ9w2Ypv7WvAi56gPYwlgBvafieDpp5CHaa4u2Vm3gwtgSz8Xbp 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: Like PMD and PTE level page table, also add statistics for PUD and P4D page table. Signed-off-by: Qi Zheng Suggested-by: Peter Zijlstra (Intel) Cc: linux-s390@vger.kernel.org --- arch/s390/include/asm/pgalloc.h | 29 +++++++++++++++++++------- arch/s390/include/asm/tlb.h | 37 +++++++++++++++++---------------- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h index 7b84ef6dc4b6d..a0c1ca5d8423c 100644 --- a/arch/s390/include/asm/pgalloc.h +++ b/arch/s390/include/asm/pgalloc.h @@ -53,29 +53,42 @@ static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long address) { unsigned long *table = crst_table_alloc(mm); - if (table) - crst_table_init(table, _REGION2_ENTRY_EMPTY); + if (!table) + return NULL; + crst_table_init(table, _REGION2_ENTRY_EMPTY); + pagetable_p4d_ctor(virt_to_ptdesc(table)); + return (p4d_t *) table; } static inline void p4d_free(struct mm_struct *mm, p4d_t *p4d) { - if (!mm_p4d_folded(mm)) - crst_table_free(mm, (unsigned long *) p4d); + if (mm_p4d_folded(mm)) + return; + + pagetable_p4d_dtor(virt_to_ptdesc(p4d)); + crst_table_free(mm, (unsigned long *) p4d); } static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address) { unsigned long *table = crst_table_alloc(mm); - if (table) - crst_table_init(table, _REGION3_ENTRY_EMPTY); + + if (!table) + return NULL; + crst_table_init(table, _REGION3_ENTRY_EMPTY); + pagetable_pud_ctor(virt_to_ptdesc(table)); + return (pud_t *) table; } static inline void pud_free(struct mm_struct *mm, pud_t *pud) { - if (!mm_pud_folded(mm)) - crst_table_free(mm, (unsigned long *) pud); + if (mm_pud_folded(mm)) + return; + + pagetable_pud_dtor(virt_to_ptdesc(pud)); + crst_table_free(mm, (unsigned long *) pud); } static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr) diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h index e95b2c8081eb8..b946964afce8e 100644 --- a/arch/s390/include/asm/tlb.h +++ b/arch/s390/include/asm/tlb.h @@ -110,24 +110,6 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, tlb_remove_ptdesc(tlb, pmd); } -/* - * p4d_free_tlb frees a pud table and clears the CRSTE for the - * region second table entry from the tlb. - * If the mm uses a four level page table the single p4d is freed - * as the pgd. p4d_free_tlb checks the asce_limit against 8PB - * to avoid the double free of the p4d in this case. - */ -static inline void p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d, - unsigned long address) -{ - if (mm_p4d_folded(tlb->mm)) - return; - __tlb_adjust_range(tlb, address, PAGE_SIZE); - tlb->mm->context.flush_mm = 1; - tlb->freed_tables = 1; - tlb_remove_ptdesc(tlb, p4d); -} - /* * pud_free_tlb frees a pud table and clears the CRSTE for the * region third table entry from the tlb. @@ -140,11 +122,30 @@ static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, { if (mm_pud_folded(tlb->mm)) return; + pagetable_pud_dtor(virt_to_ptdesc(pud)); tlb->mm->context.flush_mm = 1; tlb->freed_tables = 1; tlb->cleared_p4ds = 1; tlb_remove_ptdesc(tlb, pud); } +/* + * p4d_free_tlb frees a p4d table and clears the CRSTE for the + * region second table entry from the tlb. + * If the mm uses a four level page table the single p4d is freed + * as the pgd. p4d_free_tlb checks the asce_limit against 8PB + * to avoid the double free of the p4d in this case. + */ +static inline void p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d, + unsigned long address) +{ + if (mm_p4d_folded(tlb->mm)) + return; + pagetable_p4d_dtor(virt_to_ptdesc(p4d)); + __tlb_adjust_range(tlb, address, PAGE_SIZE); + tlb->mm->context.flush_mm = 1; + tlb->freed_tables = 1; + tlb_remove_ptdesc(tlb, p4d); +} #endif /* _S390_TLB_H */ -- 2.20.1