From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932455AbdJXKvD (ORCPT ); Tue, 24 Oct 2017 06:51:03 -0400 Received: from mga11.intel.com ([192.55.52.93]:20836 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932230AbdJXKu5 (ORCPT ); Tue, 24 Oct 2017 06:50:57 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,427,1503385200"; d="scan'208";a="141619412" From: Fan Du To: akpm@linux-foundation.org, hch@lst.de, dan.j.williams@intel.com, dave.hansen@intel.com Cc: linux-kernel@vger.kernel.org, Fan Du Subject: [PATCHv2 2/2] Add /proc/PID/{smaps, numa_maps} support for DAX Date: Tue, 24 Oct 2017 18:49:34 +0800 Message-Id: <1508842174-17005-2-git-send-email-fan.du@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1508842174-17005-1-git-send-email-fan.du@intel.com> References: <1508842174-17005-1-git-send-email-fan.du@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org So user could check those interface for more detailed information about how much DAX mappings are currently created. Here we use vma_is_dax method to find specific page struture with DAX {huge, normal}page mappings, vm_normal_page routine works as before without any impact on the existing logical where _vm_normal_page are called. Signed-off-by: Fan Du --- v2: * Using pte_devmap to check valid pfn page structure, Pointed out by Dan. thx! --- fs/proc/task_mmu.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 30dbf37..5c4535c 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -531,7 +531,10 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, struct page *page = NULL; if (pte_present(*pte)) { - page = vm_normal_page(vma, addr, *pte); + if (!vma_is_dax(vma)) + page = vm_normal_page(vma, addr, *pte); + else if (pte_devmap(*pte)) + page = pte_page(*pte); mss->rss_pte += PAGE_SIZE; } else if (is_swap_pte(*pte)) { swp_entry_t swpent = pte_to_swp_entry(*pte); @@ -583,7 +586,11 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr, struct page *page; /* FOLL_DUMP will return -EFAULT on huge zero page */ - page = follow_trans_huge_pmd(vma, addr, pmd, FOLL_DUMP); + if (!vma_is_dax(vma)) + page = follow_trans_huge_pmd(vma, addr, pmd, FOLL_DUMP); + else if (pmd_devmap(*pmd)) + page = pmd_page(*pmd); + if (IS_ERR_OR_NULL(page)) return; if (PageAnon(page)) @@ -1770,13 +1777,15 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, spinlock_t *ptl; pte_t *orig_pte; pte_t *pte; + struct page *page; #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 (!vma_is_dax(vma)) + page = can_gather_numa_stats_pmd(*pmd, vma, addr); + else if (pmd_devmap(*pmd)) + page = pmd_page(*pmd); if (page) gather_stats(page, md, pmd_dirty(*pmd), HPAGE_PMD_SIZE/PAGE_SIZE); @@ -1789,7 +1798,10 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, #endif orig_pte = pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl); do { - struct page *page = can_gather_numa_stats(*pte, vma, addr); + if (!vma_is_dax(vma)) + page = can_gather_numa_stats(*pte, vma, addr); + else if (pte_devmap(*pte)) + page = pte_page(*pte); if (!page) continue; gather_stats(page, md, pte_dirty(*pte), 1); -- 1.8.3.1