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 X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0018C433E2 for ; Fri, 4 Sep 2020 05:22:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5B105206C9 for ; Fri, 4 Sep 2020 05:22:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B105206C9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C86966B005A; Fri, 4 Sep 2020 01:22:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C10FA6B005C; Fri, 4 Sep 2020 01:22:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD8B46B0070; Fri, 4 Sep 2020 01:22:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0075.hostedemail.com [216.40.44.75]) by kanga.kvack.org (Postfix) with ESMTP id 92C886B005A for ; Fri, 4 Sep 2020 01:22:13 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 4BB90180AD80F for ; Fri, 4 Sep 2020 05:22:13 +0000 (UTC) X-FDA: 77224232946.25.chalk07_33171f8270af Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 1A5741804E3A1 for ; Fri, 4 Sep 2020 05:22:13 +0000 (UTC) X-HE-Tag: chalk07_33171f8270af X-Filterd-Recvd-Size: 4708 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Fri, 4 Sep 2020 05:22:12 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7F0F4101E; Thu, 3 Sep 2020 22:22:11 -0700 (PDT) Received: from [10.163.70.23] (unknown [10.163.70.23]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 928713F71F; Thu, 3 Sep 2020 22:22:09 -0700 (PDT) Subject: Re: [PATCH v4 06/13] mm/debug_vm_pgtable/THP: Mark the pte entry huge before using set_pmd/pud_at To: "Aneesh Kumar K.V" , linux-mm@kvack.org, akpm@linux-foundation.org Cc: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org References: <20200902114222.181353-1-aneesh.kumar@linux.ibm.com> <20200902114222.181353-7-aneesh.kumar@linux.ibm.com> From: Anshuman Khandual Message-ID: <62a7c8e8-f063-879a-2676-0d6ce59f8c6e@arm.com> Date: Fri, 4 Sep 2020 10:51:37 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200902114222.181353-7-aneesh.kumar@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 1A5741804E3A1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: On 09/02/2020 05:12 PM, Aneesh Kumar K.V wrote: > kernel expects entries to be marked huge before we use > set_pmd_at()/set_pud_at(). > > Signed-off-by: Aneesh Kumar K.V > --- > mm/debug_vm_pgtable.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > > diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c > index 8704901f6bd8..9cafed39c236 100644 > --- a/mm/debug_vm_pgtable.c > +++ b/mm/debug_vm_pgtable.c > @@ -155,7 +155,7 @@ static void __init pmd_advanced_tests(struct mm_struct *mm, > unsigned long pfn, unsigned long vaddr, > pgprot_t prot) > { > - pmd_t pmd = pfn_pmd(pfn, prot); > + pmd_t pmd; > > if (!has_transparent_hugepage()) > return; > @@ -164,19 +164,19 @@ static void __init pmd_advanced_tests(struct mm_struct *mm, > /* Align the address wrt HPAGE_PMD_SIZE */ > vaddr = (vaddr & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE; > > - pmd = pfn_pmd(pfn, prot); > + pmd = pmd_mkhuge(pfn_pmd(pfn, prot)); > set_pmd_at(mm, vaddr, pmdp, pmd); > pmdp_set_wrprotect(mm, vaddr, pmdp); > pmd = READ_ONCE(*pmdp); > WARN_ON(pmd_write(pmd)); > > - pmd = pfn_pmd(pfn, prot); > + pmd = pmd_mkhuge(pfn_pmd(pfn, prot)); > set_pmd_at(mm, vaddr, pmdp, pmd); > pmdp_huge_get_and_clear(mm, vaddr, pmdp); > pmd = READ_ONCE(*pmdp); > WARN_ON(!pmd_none(pmd)); > > - pmd = pfn_pmd(pfn, prot); > + pmd = pmd_mkhuge(pfn_pmd(pfn, prot)); > pmd = pmd_wrprotect(pmd); > pmd = pmd_mkclean(pmd); > set_pmd_at(mm, vaddr, pmdp, pmd); > @@ -236,7 +236,7 @@ static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, pgprot_t prot) > > static void __init pmd_savedwrite_tests(unsigned long pfn, pgprot_t prot) > { > - pmd_t pmd = pfn_pmd(pfn, prot); > + pmd_t pmd = pmd_mkhuge(pfn_pmd(pfn, prot)); > > if (!IS_ENABLED(CONFIG_NUMA_BALANCING)) > return; > @@ -276,7 +276,7 @@ static void __init pud_advanced_tests(struct mm_struct *mm, > unsigned long pfn, unsigned long vaddr, > pgprot_t prot) > { > - pud_t pud = pfn_pud(pfn, prot); > + pud_t pud; > > if (!has_transparent_hugepage()) > return; > @@ -285,25 +285,27 @@ static void __init pud_advanced_tests(struct mm_struct *mm, > /* Align the address wrt HPAGE_PUD_SIZE */ > vaddr = (vaddr & HPAGE_PUD_MASK) + HPAGE_PUD_SIZE; > > + pud = pud_mkhuge(pfn_pud(pfn, prot)); > set_pud_at(mm, vaddr, pudp, pud); > pudp_set_wrprotect(mm, vaddr, pudp); > pud = READ_ONCE(*pudp); > WARN_ON(pud_write(pud)); > > #ifndef __PAGETABLE_PMD_FOLDED > - pud = pfn_pud(pfn, prot); > + pud = pud_mkhuge(pfn_pud(pfn, prot)); > set_pud_at(mm, vaddr, pudp, pud); > pudp_huge_get_and_clear(mm, vaddr, pudp); > pud = READ_ONCE(*pudp); > WARN_ON(!pud_none(pud)); > > - pud = pfn_pud(pfn, prot); > + pud = pud_mkhuge(pfn_pud(pfn, prot)); > set_pud_at(mm, vaddr, pudp, pud); > pudp_huge_get_and_clear_full(mm, vaddr, pudp, 1); > pud = READ_ONCE(*pudp); > WARN_ON(!pud_none(pud)); > #endif /* __PAGETABLE_PMD_FOLDED */ > - pud = pfn_pud(pfn, prot); > + > + pud = pud_mkhuge(pfn_pud(pfn, prot)); > pud = pud_wrprotect(pud); > pud = pud_mkclean(pud); > set_pud_at(mm, vaddr, pudp, pud); > Reviewed-by: Anshuman Khandual