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 D325BE7718F for ; Mon, 30 Dec 2024 09:09:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4974A6B0093; Mon, 30 Dec 2024 04:09:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 41F566B0095; Mon, 30 Dec 2024 04:09:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 274386B0096; Mon, 30 Dec 2024 04:09:34 -0500 (EST) 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 05C106B0093 for ; Mon, 30 Dec 2024 04:09:33 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 894B8121A06 for ; Mon, 30 Dec 2024 09:09:33 +0000 (UTC) X-FDA: 82951049916.03.0536FE6 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf03.hostedemail.com (Postfix) with ESMTP id 9247620008 for ; Mon, 30 Dec 2024 09:09:10 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Mpx6zM9h; spf=pass (imf03.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.182 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=1735549717; 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=t6vBY23hDAeU19z0pXyQ9vuAeZavJyfGUN8npoqwlxU=; b=Kj+VrEMcUS0Le/QM8DZgswnuOq5x2JlioMNfgKLVmRU8vLPEmZyxxb2kM7Ha41b9Y/DqxF kzxVYsyFwCGBUSgsj73bwNLhCTPNnuEfBTOumIji2tHZ/lC/QVIYj2xOG7yGqejT0apo5e jqbRefWl1hOA687wwbTu19/Rxh2GW9Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735549717; a=rsa-sha256; cv=none; b=t0F8vJlTQJ1/q+zy3h0atkdmCf/d/W8laRWr1xM5gqVEQ9E8R5Ln6JEF5n9D1JhRuYAx1w oFXwkbMRJl4DQdB9JlZJOy+UqGzTpcE73wUgM7keBBlep4NoKKyDetsB+LBZWhhVvk/VjD ZO7Zx8srglMGhnPAhYkd8C/guVdFHlI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Mpx6zM9h; spf=pass (imf03.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-21636268e43so17179015ad.2 for ; Mon, 30 Dec 2024 01:09:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1735549770; x=1736154570; 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=t6vBY23hDAeU19z0pXyQ9vuAeZavJyfGUN8npoqwlxU=; b=Mpx6zM9hH0RDfC3gtgMb2wkkO0jkSQoOA0NiBmOfWx6UJpejgrmh93GWnVYZImLtFL qtt3AVaHJEqwEPC6/hn3sHnoH+BYkLpOgoFSq00WVcieuCyFk6rHbF0y02Z2TaUAfGAw ryMxeJ0nTIxmw7glZn0pWvrbRDRFOrG05OKJaIFB9CGf9I8d7hYa3usN59vDz9oQSvyp DVXvlmYkRy9mjmxoV+/8reJqPq9X0gJqXoApb+hh5IWd1ZcvlCmO4+8N1CnBjQ/tvf6c qWTju7GIUuOcVRvioDF1RL/VQ20dU9Ma2QneN9IiWSGaWBZ+7zjJ5gvDBmgjJaTblrMq lVrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735549770; x=1736154570; 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=t6vBY23hDAeU19z0pXyQ9vuAeZavJyfGUN8npoqwlxU=; b=f6jIZH1fza9cDfv+/jIv2PIDf2hRsA6Tp9kOGFMKyIq8NrbQrcbjbMSVeKVfFmZx9p X1STTYNpS09v6jD74PfxqVfXGUnPd4rrx8/PJTCvXE5KGDWdFf2L0UtMTtN1g+ROV59+ 3QXcd+gauegiBvA04g1Dw4aACZ1XKqwqTqkxO3okag/zZXxJ/o5+DRs7eiaDhyCFE75L AHuuIIe95l2NSiXbcI9sPWq6YgnrezL4yo54IxRwVU5MQc6S4UERvcV8VkBk82A5L6P8 KoJA0HHjEqpegDujXJ1H2GAhaQtBYzEK49IJCWTVGHVWLkcKEO7QNQMmF0w9oyxdh0YO x3IQ== X-Gm-Message-State: AOJu0Yx3Asi2/gCPbE7TtJre/WoTyXQm60J9X0TTULiJV601y3AsIplw Zi7HydgRVdkIqZLZyWkx4qgjVxsSzKWxXNeH8NAXMv0jNTPZPh2V42haRRcmyflNlOfZlfAhDPx 3 X-Gm-Gg: ASbGnctn3v2Nwqr3dLeozO/wNN21PoILJRZI34mUqgIg8wdwVQAz5EkoRfvpmDRab2K h8S53yLWs4amE0nzdbpeDqdiSFwIMq8lgr2m8LkPN9k36VPBCdYCN0HWbww/eIDjXVslfJvTRXp 3j24uex6B6DtMuHzIqAlwdJLrzpSwbtDyy41r2zx8yR+GcY8cr0EnLVTchDJCmMb9bmNnfbRHI5 ldkuAvmJuW1oSYOXCwlcWSkdJv1Gw81vxzyMvYv315byMv391BMyEZPurjzUDrkUOopfrMvS29t 6HdgE/impmkFq7zXrPI89g== X-Google-Smtp-Source: AGHT+IFhgZxpyzdRj713xWVIn5lnq5dMIdipHJPkhLMIEEbSziCo236oEOGt7kn6Wpg3lXZNnJqwCQ== X-Received: by 2002:a05:6a21:1517:b0:1e1:adb9:d1a6 with SMTP id adf61e73a8af0-1e5e08439e8mr55857078637.41.1735549770532; Mon, 30 Dec 2024 01:09:30 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 01:09:30 -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 04/15] mm: pgtable: add statistics for P4D level page table Date: Mon, 30 Dec 2024 17:07:39 +0800 Message-Id: <2fa644e37ab917292f5c342e40fa805aa91afbbd.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: 9247620008 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: fk14ahoxwu4w1whc45ymmsrwdfbfhr6b X-HE-Tag: 1735549750-568224 X-HE-Meta: U2FsdGVkX18G7fu3a3L12gBJNbDS5zD7PH6huIelmVCO+e036lmZk2BNVdPZO/WuDyYn01XttZxjrDifCHLrwfkJDIgWi0iHgwrMnuMYWI5gMUHEHgS6YPEPZWrTyp87cw0irF2vHUOmwkJVC6vmduClkjykXpzl8uiRNQkxIEp1znKqFbVILjbPKFIccKXUk44F2t4SwdGN0Pzn0HtKf+kXb6JP801wuDj+vPhHMg4t4Qrc2xbxkZk2wU6wWAZQY0B/WoAZyV/inj2x+0TYCGwxOFC+TSElXan1K1CMH+9u8WL7EORDOe29TNvlXOhMLZplWlPM/qt4OyZ+sXAOt0/DJ71wcsOh1x3kbgyjdK4If0jKLyIUK6y+NVpQjoJN8ZReyYWiX67SZzy3McD7+inWi4pOuQvIkHhimgXCLGQ9pmNGjCJbB7bop/7pcS7AuBKK48v0EZkb1Dj4eZxUAKi1unDcTux1F0bYulat2I69yzAX95ws2BOXrSt0d0IQ7olnlcVCcynrmzK8EaZWXqMmrbFvzqmAvU3udcolpTuwHWcOrPsSH9tIHPaTlLymMCuJgxX0zAs8zYnZw8KxNZOXS5WTf20QvalEsqyyNHRcvvSf98f7XTtQFMIq1BWo4gFKKGlhv5PaLXu2wnC9nCPCvcivKBz0oT4irlM6UFN86GLLRthKgAuOwzQqh95vZOJQhrG7oUU0tu+jKlLbUPy+rhsXiH4yZsw920IoyTbMX4rZCcKX7hZCddURZa29e/Mm4Yg/G6o6mwE7EAoUX4AwwlZQQDW6Nx1t/rp1z0E/aSv6m4B/cFF1ZU5Kh3ax5KjPZ1jjiK88mjZ5UNfDcNF0WbcKdXcCAJoLiKLUtAOT5ZmwQO4DlSLrNL+IFNShAgXZSvHleS29+HqJVYzy+GM9+jhmhZQasoM0GTSjnyEUeog9zq82Mbqpe7ujXJnTIYguEZoiyaHztaYWSND fJfXPce3 QIi7QiWJ4Zc28QbItFELNr9Q6OxQd4Za8U52oLqsWSA4Pq8iJv2feZSkwwXLSsLOqK2bJhb1gqrpRkXTqo71mUHn5TOzqUVxfpjVprGyNkKdm8XBWR846YOWYEQ+1FxlbB9dazVjfDmKTYqTfeLJAyH5n1qz2xFnXpc6m1DnVS2A40Aje/XdXigh51mm+/uFE/S45cU2YOafmtO1pKNooP++Gnb0y+rVq9u0W8ZyBWB4TUJZV1ui6uh9/9oYDzTgzIeGvc1U0NJCEbOvJFGQEX1CIFYS3vV58j6HXvUh4G+Ai4aQX8tEMuAvTcP7BQKrGj7rj7X0+4CkZIuW/XQevGPYR3X4LSUDoDq/ZniMmgXxim6nPWMlKCngfGOyhI7h8dpxa6jWR80oMBanIAFwulhKBwiK2cPzsuUuLlWAX0xI+BIo22QQLkaufsra882d85VVM 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 other levels of page tables, add statistics for P4D level page table. Signed-off-by: Qi Zheng Originally-by: Peter Zijlstra (Intel) --- arch/riscv/include/asm/pgalloc.h | 6 +++++- arch/x86/mm/pgtable.c | 3 +++ include/asm-generic/pgalloc.h | 2 ++ include/linux/mm.h | 16 ++++++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/pgalloc.h b/arch/riscv/include/asm/pgalloc.h index 551d614d3369c..3466fbe2e508d 100644 --- a/arch/riscv/include/asm/pgalloc.h +++ b/arch/riscv/include/asm/pgalloc.h @@ -108,8 +108,12 @@ static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, static inline void __p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d, unsigned long addr) { - if (pgtable_l5_enabled) + if (pgtable_l5_enabled) { + struct ptdesc *ptdesc = virt_to_ptdesc(p4d); + + pagetable_p4d_dtor(ptdesc); riscv_tlb_remove_ptdesc(tlb, virt_to_ptdesc(p4d)); + } } #endif /* __PAGETABLE_PMD_FOLDED */ diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 69a357b15974a..3d6e84da45b24 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -94,6 +94,9 @@ void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) #if CONFIG_PGTABLE_LEVELS > 4 void ___p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d) { + struct ptdesc *ptdesc = virt_to_ptdesc(p4d); + + pagetable_p4d_dtor(ptdesc); paravirt_release_p4d(__pa(p4d) >> PAGE_SHIFT); paravirt_tlb_remove_table(tlb, virt_to_page(p4d)); } diff --git a/include/asm-generic/pgalloc.h b/include/asm-generic/pgalloc.h index 59131629ac9cc..bb482eeca0c3e 100644 --- a/include/asm-generic/pgalloc.h +++ b/include/asm-generic/pgalloc.h @@ -230,6 +230,7 @@ static inline p4d_t *__p4d_alloc_one_noprof(struct mm_struct *mm, unsigned long if (!ptdesc) return NULL; + pagetable_p4d_ctor(ptdesc); return ptdesc_address(ptdesc); } #define __p4d_alloc_one(...) alloc_hooks(__p4d_alloc_one_noprof(__VA_ARGS__)) @@ -247,6 +248,7 @@ static inline void __p4d_free(struct mm_struct *mm, p4d_t *p4d) struct ptdesc *ptdesc = virt_to_ptdesc(p4d); BUG_ON((unsigned long)p4d & (PAGE_SIZE-1)); + pagetable_p4d_dtor(ptdesc); pagetable_free(ptdesc); } diff --git a/include/linux/mm.h b/include/linux/mm.h index c49bc7b764535..5d82f42ddd5cc 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3175,6 +3175,22 @@ static inline void pagetable_pud_dtor(struct ptdesc *ptdesc) lruvec_stat_sub_folio(folio, NR_PAGETABLE); } +static inline void pagetable_p4d_ctor(struct ptdesc *ptdesc) +{ + struct folio *folio = ptdesc_folio(ptdesc); + + __folio_set_pgtable(folio); + lruvec_stat_add_folio(folio, NR_PAGETABLE); +} + +static inline void pagetable_p4d_dtor(struct ptdesc *ptdesc) +{ + struct folio *folio = ptdesc_folio(ptdesc); + + __folio_clear_pgtable(folio); + lruvec_stat_sub_folio(folio, NR_PAGETABLE); +} + extern void __init pagecache_init(void); extern void free_initmem(void); -- 2.20.1