From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51BEF36308A for ; Sun, 12 Apr 2026 17:43:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776015793; cv=none; b=V9ZiTLypxyJ3W5QgtEX3kjl2jXSxfSJv70TAnCdQUBjDAB1WXN0esvYc+RTvSIy4UoKKVeUNLzqzUZ3c8XYUono/MQNPhUObzOfuJ/RtsS5zkIwUhR9KuQYUp6+CGH2rbn+yzTVJjIkaalYEoX1a1bHEC2rKxGra6mYqnEvF1J8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776015793; c=relaxed/simple; bh=2Vlcas1wNcl6ytpRNwjp9UiKZiso+oUMTl+9F88P3Ak=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e1uZ6/1Y0vIP+8lcMf1WlqrmpcjIQkE550ccnpLIKVwTdJFPGQ8VpHxoUE2KPjaANizjz8+a9xRCjTaao00F8A8ma+6hXoyf6GFIrV+G27wTPd0+eNiYQkpWhRe/KJruIDu+OuFIkuqFzJjaTsATLtHIFeLMdGxfXORCq+i502g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=dgU1NRMv; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=6hljExyn; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=dgU1NRMv; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=6hljExyn; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="dgU1NRMv"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="6hljExyn"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="dgU1NRMv"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="6hljExyn" 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-out1.suse.de (Postfix) with ESMTPS id 689BC6A86F; Sun, 12 Apr 2026 17:43:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776015784; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0M6XziQ2IXEafjsL1pugEtyiZe4RP/OzEyf3hhTlfvw=; b=dgU1NRMvEc63f/Bc89kah5Wzjf0TVlp4Orq4tR2lDDIA5j6UKBuH2WJeu73Nx4WSwGq8sy QIRAiKDBuqn/+OH54GaIYH+YDbcvgzbaf9w9TBWeIURhiDgm4oKiFVfVRLkPAjaEFzsACu 8vVEYUFHLdWE9Jp2SUCoAmogNwIUcxM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776015784; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0M6XziQ2IXEafjsL1pugEtyiZe4RP/OzEyf3hhTlfvw=; b=6hljExynyYqJN6CMan72X4pFgo78XwzTtblhO8UTu2wLkwG/Y0xvlv/CjZ4HRK1SqJ6qiD 3e+rCuO8kDVQ0pAA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=dgU1NRMv; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=6hljExyn DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776015784; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0M6XziQ2IXEafjsL1pugEtyiZe4RP/OzEyf3hhTlfvw=; b=dgU1NRMvEc63f/Bc89kah5Wzjf0TVlp4Orq4tR2lDDIA5j6UKBuH2WJeu73Nx4WSwGq8sy QIRAiKDBuqn/+OH54GaIYH+YDbcvgzbaf9w9TBWeIURhiDgm4oKiFVfVRLkPAjaEFzsACu 8vVEYUFHLdWE9Jp2SUCoAmogNwIUcxM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776015784; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0M6XziQ2IXEafjsL1pugEtyiZe4RP/OzEyf3hhTlfvw=; b=6hljExynyYqJN6CMan72X4pFgo78XwzTtblhO8UTu2wLkwG/Y0xvlv/CjZ4HRK1SqJ6qiD 3e+rCuO8kDVQ0pAA== 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 E66624AA48; Sun, 12 Apr 2026 17:43:03 +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 0PW4NafZ22miRQAAD6G6ig (envelope-from ); Sun, 12 Apr 2026 17:43:03 +0000 From: Oscar Salvador To: Andrew Morton Cc: David Hildenbrand , Michal Hocko , Vlastimil Babka , Muchun Song , Lorenzo Stoakes , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Oscar Salvador Subject: [RFC PATCH 6/7] mm: Make /proc/pid/numa_maps use the new generic pagewalk API Date: Sun, 12 Apr 2026 19:42:43 +0200 Message-ID: <20260412174244.133715-7-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260412174244.133715-1-osalvador@suse.de> References: <20260412174244.133715-1-osalvador@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_SEVEN(0.00)[9]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLnwjaipjwg7testigjitbjsak)]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Queue-Id: 689BC6A86F X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: Have /proc/pid/numa_maps make use of the new generic API, and remove the code which was using the old one Signed-off-by: Oscar Salvador --- fs/proc/task_mmu.c | 136 +++++++++++---------------------------------- 1 file changed, 32 insertions(+), 104 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index afbcdb11ad80..776e7a6baf00 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -3048,108 +3048,6 @@ static struct page *can_gather_numa_stats(pte_t pte, struct vm_area_struct *vma, return page; } -#ifdef CONFIG_TRANSPARENT_HUGEPAGE -static struct page *can_gather_numa_stats_pmd(pmd_t pmd, - struct vm_area_struct *vma, - unsigned long addr) -{ - struct page *page; - int nid; - - if (!pmd_present(pmd)) - return NULL; - - page = vm_normal_page_pmd(vma, addr, pmd); - 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; -} -#endif - -static int gather_pte_stats(pmd_t *pmd, unsigned long addr, - unsigned long end, struct mm_walk *walk) -{ - struct numa_maps *md = walk->private; - struct vm_area_struct *vma = walk->vma; - spinlock_t *ptl; - pte_t *orig_pte; - pte_t *pte; - -#ifdef CONFIG_TRANSPARENT_HUGEPAGE - ptl = pmd_trans_huge_lock(pmd, vma); - if (ptl) { - struct page *page; - - page = can_gather_numa_stats_pmd(*pmd, vma, addr); - if (page) - gather_stats(page, md, pmd_dirty(*pmd), - HPAGE_PMD_SIZE/PAGE_SIZE); - spin_unlock(ptl); - return 0; - } -#endif - orig_pte = pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl); - if (!pte) { - walk->action = ACTION_AGAIN; - return 0; - } - do { - pte_t ptent = ptep_get(pte); - struct page *page = can_gather_numa_stats(ptent, vma, addr); - if (!page) - continue; - gather_stats(page, md, pte_dirty(ptent), 1); - - } while (pte++, addr += PAGE_SIZE, addr != end); - pte_unmap_unlock(orig_pte, ptl); - cond_resched(); - return 0; -} -#ifdef CONFIG_HUGETLB_PAGE -static int gather_hugetlb_stats(pte_t *pte, unsigned long hmask, - unsigned long addr, unsigned long end, struct mm_walk *walk) -{ - pte_t huge_pte; - struct numa_maps *md; - struct page *page; - spinlock_t *ptl; - - ptl = huge_pte_lock(hstate_vma(walk->vma), walk->mm, pte); - huge_pte = huge_ptep_get(walk->mm, addr, pte); - if (!pte_present(huge_pte)) - goto out; - - page = pte_page(huge_pte); - - md = walk->private; - gather_stats(page, md, pte_dirty(huge_pte), 1); -out: - spin_unlock(ptl); - return 0; -} - -#else -static int gather_hugetlb_stats(pte_t *pte, unsigned long hmask, - unsigned long addr, unsigned long end, struct mm_walk *walk) -{ - return 0; -} -#endif - -static const struct mm_walk_ops show_numa_ops = { - .hugetlb_entry = gather_hugetlb_stats, - .pmd_entry = gather_pte_stats, - .walk_lock = PGWALK_RDLOCK, -}; - /* * Display pages allocated per node and memory policy via /proc. */ @@ -3161,9 +3059,15 @@ static int show_numa_map(struct seq_file *m, void *v) struct numa_maps *md = &numa_priv->md; struct file *file = vma->vm_file; struct mm_struct *mm = vma->vm_mm; + struct pt_range_walk ptw = { + .mm = mm + }; + enum pt_range_walk_type type; + pt_type_flags_t flags; char buffer[64]; struct mempolicy *pol; pgoff_t ilx; + int nr_pages; int nid; if (!mm) @@ -3194,8 +3098,32 @@ static int show_numa_map(struct seq_file *m, void *v) if (is_vm_hugetlb_page(vma)) seq_puts(m, " huge"); - /* mmap_lock is held by m_start */ - walk_page_vma(vma, &show_numa_ops, md); + flags = PT_TYPE_FOLIO; + type = pt_range_walk_start(&ptw, vma, vma->vm_start, vma->vm_end, flags); + while (type != PTW_DONE) { + + if (!ptw.folio || !ptw.page || PageReserved(ptw.page)) + goto not_found; + + nid = page_to_nid(ptw.page); + if (!node_isset(nid, node_states[N_MEMORY])) + goto not_found; + + if (is_vm_hugetlb_page(vma)) + /* + * As opposed to THP, HugeTLB counts the entire huge + * page as one unit size. + */ + nr_pages = ptw.nr_entries; + else + nr_pages = ptw.size / PAGE_SIZE; + + gather_stats(ptw.page, md, ptw.dirty, nr_pages); +not_found: + type = pt_range_walk_next(&ptw, vma, vma->vm_start, vma->vm_end, flags); + + } + pt_range_walk_done(&ptw); if (!md->pages) goto out; -- 2.35.3