From patchwork Thu Jul 4 04:31:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13723199 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 5814CC3065C for ; Thu, 4 Jul 2024 04:32:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B68056B00AC; Thu, 4 Jul 2024 00:32:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AEFFB6B00AD; Thu, 4 Jul 2024 00:32:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 968F16B00AE; Thu, 4 Jul 2024 00:32:20 -0400 (EDT) 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 7011C6B00AC for ; Thu, 4 Jul 2024 00:32:20 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0B024120C93 for ; Thu, 4 Jul 2024 04:32:20 +0000 (UTC) X-FDA: 82300798440.05.E12A6A3 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf05.hostedemail.com (Postfix) with ESMTP id DA645100018 for ; Thu, 4 Jul 2024 04:32:17 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; spf=pass (imf05.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720067519; 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=fCuliDJCz3L6Q0kfsxcXAf+XqJA59bLxL2NmRDKv3LA=; b=lzoZy+QIC/exmStIDrlX9HSCPZig9xAFD9XNfpaAvyzT8Qr5/6KolKSCLYPfPZESKY9lbl y1fJ2hXoX3nTx4GttO6BzQ0G28Ba5Ur2BN/86/Ri82o6o8mRRUTr6TWEFFhruApym6pt4T Y3pw77iZi08rTjPQCwGGxt6YDjtSpok= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; spf=pass (imf05.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720067519; a=rsa-sha256; cv=none; b=K/mHDZPxopnasayEieBMKcVzAELiUzq5PHW5i7i08nDhFi4OWcvC/qsQwdhpoZsuVQkOn2 Cvix1sDGDzhMnPmeducNoIvye7B53YYfDtLeZY3v+SzTbITnfhNHgqbDxdJpsjRijy16GS ogP2/7k6H+HKRFNdCUnIhH0m1EsLVVk= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A8ED61FCF7; Thu, 4 Jul 2024 04:32:16 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6D23B13889; Thu, 4 Jul 2024 04:32:15 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 2KYBFs8lhmbnDAAAD6G6ig (envelope-from ); Thu, 04 Jul 2024 04:32:15 +0000 From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Peter Xu , Muchun Song , David Hildenbrand , SeongJae Park , Miaohe Lin , Michal Hocko , Matthew Wilcox , Christophe Leroy , Oscar Salvador Subject: [PATCH 21/45] fs/proc: Create gather_pud_stats to handle PUD-mapped hugetlb pages Date: Thu, 4 Jul 2024 06:31:08 +0200 Message-ID: <20240704043132.28501-22-osalvador@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240704043132.28501-1-osalvador@suse.de> References: <20240704043132.28501-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Stat-Signature: ci9n6ggn85bgc87dtg1akhibw5ejgzka X-Rspam-User: X-Rspamd-Queue-Id: DA645100018 X-Rspamd-Server: rspam02 X-HE-Tag: 1720067537-498064 X-HE-Meta: U2FsdGVkX19/97kAf3cNHFbd3KbAoTo9nMmMPTeZrkHsi9m1giekCWlMkRLXwugHsHLO5OBvWtOfSKFtN3BmgbJx/C8sdqADnyRSQ1cd9I3bBP22FEmx6P0Hlq8kIEk7C0GpZULv7kuuSza6gUPj7kBmYK6RSW+LFgI0qpp6EEbPP+sfNHjYXPA2Tk0nmAvyuf7BQ1WzM7xixuXCCuvEEZgDa99zU6jnswy6XkqoEpG5s6G8qnF8g4taaEb7UYY38Wk2cyxX9UxDEIZr24K0kcO2KHjXGkcU1n8e/70Hpyq7jbcZ/QtiavibJF+Q2YmGq7xuMALlRijcGdrxTd6uAcdFQ92IWPpbFkuEItwkF9LIdbd0R/oZIS+XmH316tEAWwXqImLYvmAYlwYNgVieUFITAp4PweavtWxDOLxWQQY/80PKsHCNSSqSMLHKk7bTweSLmitV1uWc/21PySamAidw2BrWUqc6dP4eaVLFkwCFP+F7n9U7rCLTkw51hx3/L9x+vjdzYBkbESMjeCky/+8hs6J6QtqXxJQbr4vF2/F6sJAvAxDvIO/TJEnNa+HVP0t5E8GmrNiwkgkCxcrjxT0AwWxz9NIKgWLQWlQlBn6qqDf2dC2JsGMIKctzaBNxNEmr1O4tD6uz8JtEbNBRdV7wuRd5QooIPTUuZufJ5s+Ocd8fIuAcZyJqKZFAQHXeM0mAxeT7kUJFMLoL07B3eJHQx5XpL2QzSPJut58amu+t3F7uAVrbwGzeG0NcYw3qjma5rPngPHZnXVltpharq5PvUgdm6D46wn0YaWi3bqXRCp2pGkTIqP+q7vu3+pMSde9o06be6HKkP6VAexLnJkxTx+YIyD3YJ8xj09bAKCSBv0jXZzXo1YItcftZOkBmDMBbduUohuhNvwDN+NQKVLeHBIfyKCQIy+O+9LhKprAGuIzTmYDC2VNcfoS+5REqe1MxHn05gdzVLuPJNfc 4Qvn4IIY +6AfVBPQWPow22NuERBPi1Xjidx3Z9CpbyPO2nT/A+8pcJu6lpUvBoRo7Xf4X1ZKITGu+9XNr+HYp8aV3yKLAA5ef357eb7aMW1fuTj9r5+RHlqFobTnZLLKT8Ggod/jgT17AsNaRltzGPUOhmK3WN0RJzrDSMC8Gp9wQAt3PgRHVHpA= 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: Normal THP cannot be PUD-mapped (besides devmap), but hugetlb can, so create gather_pud_stats in order to handle PUD-mapped hugetlb vmas. Also implement can_gather_numa_stats_pud which is the pud version of can_gather_numa_stats_pmd. Signed-off-by: Oscar Salvador --- arch/arm64/include/asm/pgtable.h | 1 + fs/proc/task_mmu.c | 56 ++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 5e26e63b1012..1a6b8be2f0d0 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -590,6 +590,7 @@ static inline pmd_t pmd_mkdevmap(pmd_t pmd) #define pfn_pmd(pfn,prot) __pmd(__phys_to_pmd_val((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)) #define mk_pmd(page,prot) pfn_pmd(page_to_pfn(page),prot) +#define pud_dirty(pud) pte_dirty(pud_pte(pud)) #define pud_young(pud) pte_young(pud_pte(pud)) #define pud_mkyoung(pud) pte_pud(pte_mkyoung(pud_pte(pud))) #define pud_write(pud) pte_write(pud_pte(pud)) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 98dd03c26e68..5df17b7cfe6c 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -3141,6 +3141,61 @@ static struct page *can_gather_numa_stats(pte_t pte, struct vm_area_struct *vma, return page; } +#ifdef CONFIG_HUGETLB_PAGE +static struct page *can_gather_numa_stats_pud(pud_t pud, + struct vm_area_struct *vma, + unsigned long addr) +{ + struct page *page; + int nid; + + if (!pud_present(pud)) + return NULL; + + page = pud_page(pud); + if (!page) + return NULL; + + if (PageReserved(page)) + return NULL; + + nid = page_to_nid(page); + if (!node_isset(nid, node_states[N_MEMORY])) + return NULL; + + return page; +} + +static int gather_pud_stats(pud_t *pud, unsigned long addr, + unsigned long end, struct mm_walk *walk) +{ + spinlock_t *ptl; + struct page *page; + unsigned long nr_pages; + struct numa_maps *md = walk->private; + struct vm_area_struct *vma = walk->vma; + + ptl = pud_huge_lock(pud, vma); + if (!ptl) + return 0; + + if (is_vm_hugetlb_page(vma)) + nr_pages = 1; + else + nr_pages = HPAGE_PUD_SIZE / PAGE_SIZE; + + page = can_gather_numa_stats_pud(*pud, vma, addr); + if (page) + gather_stats(page, md, pud_dirty(*pud), + nr_pages); + + spin_unlock(ptl); + return 0; +} +#else +#define gather_pud_stats NULL +#endif + #ifdef CONFIG_PGTABLE_HAS_HUGE_LEAVES static struct page *can_gather_numa_stats_pmd(pmd_t pmd, struct vm_area_struct *vma, @@ -3245,6 +3300,7 @@ static int gather_hugetlb_stats(pte_t *pte, unsigned long hmask, static const struct mm_walk_ops show_numa_ops = { .hugetlb_entry = gather_hugetlb_stats, + .pud_entry = gather_pud_stats, .pmd_entry = gather_pte_stats, .walk_lock = PGWALK_RDLOCK, };