From: Anshuman Khandual <anshuman.khandual@arm.com>
To: Gavin Shan <gshan@redhat.com>, linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org, gerald.schaefer@linux.ibm.com,
aneesh.kumar@linux.ibm.com, christophe.leroy@csgroup.eu,
cai@lca.pw, catalin.marinas@arm.com, will@kernel.org,
akpm@linux-foundation.org, chuhu@redhat.com,
shan.gavin@gmail.com
Subject: Re: [PATCH v4 04/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in protnone and devmap tests
Date: Thu, 29 Jul 2021 10:32:29 +0530 [thread overview]
Message-ID: <34f40e4f-c962-d141-b991-5252045be6b1@arm.com> (raw)
In-Reply-To: <20210727061401.592616-5-gshan@redhat.com>
On 7/27/21 11:43 AM, Gavin Shan wrote:
> This uses struct pgtable_debug_args in protnone and devmap test
> functions. After that, the unused variable @protnone in debug_vm_pgtable()
> is dropped.
>
> Signed-off-by: Gavin Shan <gshan@redhat.com>
> ---
> mm/debug_vm_pgtable.c | 58 +++++++++++++++++++------------------------
> 1 file changed, 26 insertions(+), 32 deletions(-)
>
> diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c
> index 0fa98083f7d5..650e35656660 100644
> --- a/mm/debug_vm_pgtable.c
> +++ b/mm/debug_vm_pgtable.c
> @@ -662,9 +662,9 @@ static void __init pmd_populate_tests(struct mm_struct *mm, pmd_t *pmdp,
> WARN_ON(pmd_bad(pmd));
> }
>
> -static void __init pte_special_tests(unsigned long pfn, pgprot_t prot)
> +static void __init pte_special_tests(struct pgtable_debug_args *args)
> {
> - pte_t pte = pfn_pte(pfn, prot);
> + pte_t pte = pfn_pte(args->fixed_pte_pfn, args->page_prot);
>
> if (!IS_ENABLED(CONFIG_ARCH_HAS_PTE_SPECIAL))
> return;
> @@ -673,9 +673,9 @@ static void __init pte_special_tests(unsigned long pfn, pgprot_t prot)
> WARN_ON(!pte_special(pte_mkspecial(pte)));
> }
>
> -static void __init pte_protnone_tests(unsigned long pfn, pgprot_t prot)
> +static void __init pte_protnone_tests(struct pgtable_debug_args *args)
> {
> - pte_t pte = pfn_pte(pfn, prot);
> + pte_t pte = pfn_pte(args->fixed_pte_pfn, args->page_prot_none);
>
> if (!IS_ENABLED(CONFIG_NUMA_BALANCING))
> return;
> @@ -686,7 +686,7 @@ static void __init pte_protnone_tests(unsigned long pfn, pgprot_t prot)
> }
>
> #ifdef CONFIG_TRANSPARENT_HUGEPAGE
> -static void __init pmd_protnone_tests(unsigned long pfn, pgprot_t prot)
> +static void __init pmd_protnone_tests(struct pgtable_debug_args *args)
> {
> pmd_t pmd;
>
> @@ -697,25 +697,25 @@ static void __init pmd_protnone_tests(unsigned long pfn, pgprot_t prot)
> return;
>
> pr_debug("Validating PMD protnone\n");
> - pmd = pmd_mkhuge(pfn_pmd(pfn, prot));
> + pmd = pmd_mkhuge(pfn_pmd(args->fixed_pmd_pfn, args->page_prot_none));
> WARN_ON(!pmd_protnone(pmd));
> WARN_ON(!pmd_present(pmd));
> }
> #else /* !CONFIG_TRANSPARENT_HUGEPAGE */
> -static void __init pmd_protnone_tests(unsigned long pfn, pgprot_t prot) { }
> +static void __init pmd_protnone_tests(struct pgtable_debug_args *args) { }
> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>
> #ifdef CONFIG_ARCH_HAS_PTE_DEVMAP
> -static void __init pte_devmap_tests(unsigned long pfn, pgprot_t prot)
> +static void __init pte_devmap_tests(struct pgtable_debug_args *args)
> {
> - pte_t pte = pfn_pte(pfn, prot);
> + pte_t pte = pfn_pte(args->fixed_pte_pfn, args->page_prot);
>
> pr_debug("Validating PTE devmap\n");
> WARN_ON(!pte_devmap(pte_mkdevmap(pte)));
> }
>
> #ifdef CONFIG_TRANSPARENT_HUGEPAGE
> -static void __init pmd_devmap_tests(unsigned long pfn, pgprot_t prot)
> +static void __init pmd_devmap_tests(struct pgtable_debug_args *args)
> {
> pmd_t pmd;
>
> @@ -723,12 +723,12 @@ static void __init pmd_devmap_tests(unsigned long pfn, pgprot_t prot)
> return;
>
> pr_debug("Validating PMD devmap\n");
> - pmd = pfn_pmd(pfn, prot);
> + pmd = pfn_pmd(args->fixed_pmd_pfn, args->page_prot);
> WARN_ON(!pmd_devmap(pmd_mkdevmap(pmd)));
> }
>
> #ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD
> -static void __init pud_devmap_tests(unsigned long pfn, pgprot_t prot)
> +static void __init pud_devmap_tests(struct pgtable_debug_args *args)
> {
> pud_t pud;
>
> @@ -736,20 +736,20 @@ static void __init pud_devmap_tests(unsigned long pfn, pgprot_t prot)
> return;
>
> pr_debug("Validating PUD devmap\n");
> - pud = pfn_pud(pfn, prot);
> + pud = pfn_pud(args->fixed_pud_pfn, args->page_prot);
> WARN_ON(!pud_devmap(pud_mkdevmap(pud)));
> }
> #else /* !CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */
> -static void __init pud_devmap_tests(unsigned long pfn, pgprot_t prot) { }
> +static void __init pud_devmap_tests(struct pgtable_debug_args *args) { }
> #endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */
> #else /* CONFIG_TRANSPARENT_HUGEPAGE */
> -static void __init pmd_devmap_tests(unsigned long pfn, pgprot_t prot) { }
> -static void __init pud_devmap_tests(unsigned long pfn, pgprot_t prot) { }
> +static void __init pmd_devmap_tests(struct pgtable_debug_args *args) { }
> +static void __init pud_devmap_tests(struct pgtable_debug_args *args) { }
> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
> #else
> -static void __init pte_devmap_tests(unsigned long pfn, pgprot_t prot) { }
> -static void __init pmd_devmap_tests(unsigned long pfn, pgprot_t prot) { }
> -static void __init pud_devmap_tests(unsigned long pfn, pgprot_t prot) { }
> +static void __init pte_devmap_tests(struct pgtable_debug_args *args) { }
> +static void __init pmd_devmap_tests(struct pgtable_debug_args *args) { }
> +static void __init pud_devmap_tests(struct pgtable_debug_args *args) { }
> #endif /* CONFIG_ARCH_HAS_PTE_DEVMAP */
>
> static void __init pte_soft_dirty_tests(unsigned long pfn, pgprot_t prot)
> @@ -1237,7 +1237,7 @@ static int __init debug_vm_pgtable(void)
> pmd_t *pmdp, *saved_pmdp, pmd;
> pte_t *ptep;
> pgtable_t saved_ptep;
> - pgprot_t prot, protnone;
> + pgprot_t prot;
> phys_addr_t paddr;
> unsigned long vaddr, pte_aligned, pmd_aligned;
> unsigned long pud_aligned;
> @@ -1257,12 +1257,6 @@ static int __init debug_vm_pgtable(void)
> return 1;
> }
>
> - /*
> - * __P000 (or even __S000) will help create page table entries with
> - * PROT_NONE permission as required for pxx_protnone_tests().
> - */
> - protnone = __P000;
> -
> vma = vm_area_alloc(mm);
> if (!vma) {
> pr_err("vma allocation failed\n");
> @@ -1337,13 +1331,13 @@ static int __init debug_vm_pgtable(void)
> pte_savedwrite_tests(&args);
> pmd_savedwrite_tests(&args);
>
> - pte_special_tests(pte_aligned, prot);
> - pte_protnone_tests(pte_aligned, protnone);
> - pmd_protnone_tests(pmd_aligned, protnone);
> + pte_special_tests(&args);
> + pte_protnone_tests(&args);
> + pmd_protnone_tests(&args);
>
> - pte_devmap_tests(pte_aligned, prot);
> - pmd_devmap_tests(pmd_aligned, prot);
> - pud_devmap_tests(pud_aligned, prot);
> + pte_devmap_tests(&args);
> + pmd_devmap_tests(&args);
> + pud_devmap_tests(&args);
>
> pte_soft_dirty_tests(pte_aligned, prot);
> pmd_soft_dirty_tests(pmd_aligned, prot);
>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
next prev parent reply other threads:[~2021-07-29 5:02 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 6:13 [PATCH v4 00/12] mm/debug_vm_pgtable: Enhancements Gavin Shan
2021-07-27 6:13 ` [PATCH v4 01/12] mm/debug_vm_pgtable: Introduce struct pgtable_debug_args Gavin Shan
2021-07-28 7:32 ` Anshuman Khandual
2021-07-28 7:38 ` Gavin Shan
2021-07-29 4:45 ` Anshuman Khandual
2021-07-29 9:40 ` Gavin Shan
2021-07-27 6:13 ` [PATCH v4 02/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in basic tests Gavin Shan
2021-07-29 4:53 ` Anshuman Khandual
2021-07-27 6:13 ` [PATCH v4 03/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in leaf and savewrite tests Gavin Shan
2021-07-29 5:00 ` Anshuman Khandual
2021-07-27 6:13 ` [PATCH v4 04/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in protnone and devmap tests Gavin Shan
2021-07-29 5:02 ` Anshuman Khandual [this message]
2021-07-27 6:13 ` [PATCH v4 05/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in soft_dirty and swap tests Gavin Shan
2021-07-29 5:07 ` Anshuman Khandual
2021-07-27 6:13 ` [PATCH v4 06/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in migration and thp tests Gavin Shan
2021-07-28 11:08 ` Anshuman Khandual
2021-07-28 23:54 ` Gavin Shan
2021-07-27 6:13 ` [PATCH v4 07/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in PTE modifying tests Gavin Shan
2021-07-29 5:16 ` Anshuman Khandual
2021-07-27 6:13 ` [PATCH v4 08/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in PMD " Gavin Shan
2021-07-29 5:30 ` Anshuman Khandual
2021-07-27 6:13 ` [PATCH v4 09/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in PUD " Gavin Shan
2021-07-29 5:44 ` Anshuman Khandual
2021-07-27 6:13 ` [PATCH v4 10/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in PGD and P4D " Gavin Shan
2021-07-29 5:51 ` Anshuman Khandual
2021-07-27 6:14 ` [PATCH v4 11/12] mm/debug_vm_pgtable: Remove unused code Gavin Shan
2021-07-29 5:59 ` Anshuman Khandual
2021-07-27 6:14 ` [PATCH v4 12/12] mm/debug_vm_pgtable: Fix corrupted page flag Gavin Shan
2021-07-28 7:53 ` Christophe Leroy
2021-07-28 10:05 ` Anshuman Khandual
2021-07-29 0:00 ` Gavin Shan
2021-07-29 6:05 ` Anshuman Khandual
2021-07-29 7:14 ` [PATCH v4 00/12] mm/debug_vm_pgtable: Enhancements Anshuman Khandual
2021-08-02 0:09 ` Gavin Shan
2021-08-02 4:53 ` Anshuman Khandual
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=34f40e4f-c962-d141-b991-5252045be6b1@arm.com \
--to=anshuman.khandual@arm.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=cai@lca.pw \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@csgroup.eu \
--cc=chuhu@redhat.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=gshan@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=shan.gavin@gmail.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox