Date: Tue, 29 Nov 2016 15:07:12 +0000
From: Catalin Marinas <catalin.marinas@arm.com>
To: Dave Hansen <dave@sr71.net>
Cc: Vlastimil Babka <vbabka@suse.cz>, linux-kernel@vger.kernel.org,
        hch@lst.de, akpm@linux-foundation.org, dan.j.williams@intel.com,
        khandual@linux.vnet.ibm.com, linux-mm@kvack.org,
        Will Deacon <will.deacon@arm.com>
Subject: Re: [PATCH] proc: mm: export PTE sizes directly in smaps (v2)
Message-ID: <20161129150711.GD13725@e104818-lin.cambridge.arm.com>
References: <20161117002851.C7BACB98@viggo.jf.intel.com>
 <8769d52a-de0b-8c98-1e0b-e5305c5c02f3@suse.cz>
 <cf887736-2a62-bce5-0d72-0455a642cd99@sr71.net>
 <763d778a-2637-39e0-bcde-265055cf1c18@suse.cz>
 <6262d9fa-8098-4e18-4129-932e5e4857cb@sr71.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <6262d9fa-8098-4e18-4129-932e5e4857cb@sr71.net>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2619
Lines: 62

On Mon, Nov 28, 2016 at 01:39:49PM -0800, Dave Hansen wrote:
> On 11/28/2016 01:07 PM, Vlastimil Babka wrote:
> > On 11/28/2016 05:52 PM, Dave Hansen wrote:
> >> On 11/24/2016 06:22 AM, Vlastimil Babka wrote:
> >>> On 11/17/2016 01:28 AM, Dave Hansen wrote:
> >>>> @@ -702,11 +707,13 @@ static int smaps_hugetlb_range(pte_t *pt
> >>>>      }
> >>>>      if (page) {
> >>>>          int mapcount = page_mapcount(page);
> >>>> +        unsigned long hpage_size = huge_page_size(hstate_vma(vma));
> >>>>
> >>>> +        mss->rss_pud += hpage_size;
> >>>
> >>> This hardcoded pud doesn't look right, doesn't the pmd/pud depend on
> >>> hpage_size?
> >>
> >> Urg, nope.  Thanks for noticing that!  I think we'll need something
> >> along the lines of:
> >>
> >>                 if (hpage_size == PUD_SIZE)
> >>                         mss->rss_pud += PUD_SIZE;
> >>                 else if (hpage_size == PMD_SIZE)
> >>                         mss->rss_pmd += PMD_SIZE;
> > 
> > Sounds better, although I wonder whether there are some weird arches
> > supporting hugepage sizes that don't match page table levels. I recall
> > that e.g. MIPS could do arbitrary size, but dunno if the kernel supports
> > that...
> 
> arm64 seems to have pretty arbitrary sizes, and seems to be able to
> build them out of multiple hardware PTE sizes.  I think I can fix my
> code to handle those:
> 
>                 if (hpage_size >= PGD_SIZE)
>                         mss->rss_pgd += PGD_SIZE;
>                 else if (hpage_size >= PUD_SIZE)
>                         mss->rss_pud += PUD_SIZE;
>                 else if (hpage_size >= PMD_SIZE)
>                         mss->rss_pmd += PMD_SIZE;
>                 else
>                         mss->rss_pte += PAGE_SIZE;
> 
> But, I *think* that means that smaps_hugetlb_range() is *currently*
> broken for these intermediate arm64 sizes.  The code does:
> 
>                 if (mapcount >= 2)
>                         mss->shared_hugetlb += hpage_size;
>                 else
>                         mss->private_hugetlb += hpage_size;
> 
> So I *think* if we may count a hugetlbfs arm64 CONT_PTES page multiple
> times, and account hpage_size for *each* of the CONT_PTES.  That would
> artificially inflate the smaps output for those pages.

I don't think it would count them multiple times. As Vlastimil
mentioned, huge_page_size() would return (CONT_PTES * PAGE_SIZE) in such
case, so walk_hugetlb_range() skips the intermediate ptes. In general,
we try to keep the contiguous pte/pmd support visible only to the arm64
hugetlb code and hidden to the core code.

-- 
Catalin