From: Anshuman Khandual <anshuman.khandual@arm.com>
To: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
linux-mm@kvack.org, akpm@linux-foundation.org
Cc: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org,
linux-snps-arc@lists.infradead.org, x86@kernel.org,
linux-arch@vger.kernel.org,
Gerald Schaefer <gerald.schaefer@de.ibm.com>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Vineet Gupta <vgupta@synopsys.com>,
Mike Rapoport <rppt@linux.ibm.com>, Qian Cai <cai@lca.pw>
Subject: Re: [PATCH v3 02/13] powerpc/mm: Move setting pte specific flags to pfn_pte
Date: Tue, 1 Sep 2020 08:43:28 +0530 [thread overview]
Message-ID: <5b3f0db6-09f6-3f40-c9fc-911814d691bb@arm.com> (raw)
In-Reply-To: <20200827080438.315345-3-aneesh.kumar@linux.ibm.com>
On 08/27/2020 01:34 PM, Aneesh Kumar K.V wrote:
> powerpc used to set the pte specific flags in set_pte_at(). This is different
> from other architectures. To be consistent with other architecture update
> pfn_pte to set _PAGE_PTE on ppc64. Also, drop now unused pte_mkpte.
>
> We add a VM_WARN_ON() to catch the usage of calling set_pte_at() without setting
> _PAGE_PTE bit. We will remove that after a few releases.
>
> With respect to huge pmd entries, pmd_mkhuge() takes care of adding the
> _PAGE_PTE bit.
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> ---
> arch/powerpc/include/asm/book3s/64/pgtable.h | 15 +++++++++------
> arch/powerpc/include/asm/nohash/pgtable.h | 5 -----
> arch/powerpc/mm/pgtable.c | 5 -----
> 3 files changed, 9 insertions(+), 16 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
> index 079211968987..2382fd516f6b 100644
> --- a/arch/powerpc/include/asm/book3s/64/pgtable.h
> +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
> @@ -619,7 +619,7 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
> VM_BUG_ON(pfn >> (64 - PAGE_SHIFT));
> VM_BUG_ON((pfn << PAGE_SHIFT) & ~PTE_RPN_MASK);
>
> - return __pte(((pte_basic_t)pfn << PAGE_SHIFT) | pgprot_val(pgprot));
> + return __pte(((pte_basic_t)pfn << PAGE_SHIFT) | pgprot_val(pgprot) | _PAGE_PTE);
> }
>
> static inline unsigned long pte_pfn(pte_t pte)
> @@ -655,11 +655,6 @@ static inline pte_t pte_mkexec(pte_t pte)
> return __pte_raw(pte_raw(pte) | cpu_to_be64(_PAGE_EXEC));
> }
>
> -static inline pte_t pte_mkpte(pte_t pte)
> -{
> - return __pte_raw(pte_raw(pte) | cpu_to_be64(_PAGE_PTE));
> -}
> -
> static inline pte_t pte_mkwrite(pte_t pte)
> {
> /*
> @@ -823,6 +818,14 @@ static inline int pte_none(pte_t pte)
> static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,
> pte_t *ptep, pte_t pte, int percpu)
> {
> +
> + VM_WARN_ON(!(pte_raw(pte) & cpu_to_be64(_PAGE_PTE)));
> + /*
> + * Keep the _PAGE_PTE added till we are sure we handle _PAGE_PTE
> + * in all the callers.
> + */
> + pte = __pte_raw(pte_raw(pte) | cpu_to_be64(_PAGE_PTE));
> +
> if (radix_enabled())
> return radix__set_pte_at(mm, addr, ptep, pte, percpu);
> return hash__set_pte_at(mm, addr, ptep, pte, percpu);
> diff --git a/arch/powerpc/include/asm/nohash/pgtable.h b/arch/powerpc/include/asm/nohash/pgtable.h
> index 4b7c3472eab1..6277e7596ae5 100644
> --- a/arch/powerpc/include/asm/nohash/pgtable.h
> +++ b/arch/powerpc/include/asm/nohash/pgtable.h
> @@ -140,11 +140,6 @@ static inline pte_t pte_mkold(pte_t pte)
> return __pte(pte_val(pte) & ~_PAGE_ACCESSED);
> }
>
> -static inline pte_t pte_mkpte(pte_t pte)
> -{
> - return pte;
> -}
> -
> static inline pte_t pte_mkspecial(pte_t pte)
> {
> return __pte(pte_val(pte) | _PAGE_SPECIAL);
> diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
> index 9c0547d77af3..ab57b07ef39a 100644
> --- a/arch/powerpc/mm/pgtable.c
> +++ b/arch/powerpc/mm/pgtable.c
> @@ -184,9 +184,6 @@ void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep,
> */
> VM_WARN_ON(pte_hw_valid(*ptep) && !pte_protnone(*ptep));
>
> - /* Add the pte bit when trying to set a pte */
> - pte = pte_mkpte(pte);
> -
> /* Note: mm->context.id might not yet have been assigned as
> * this context might not have been activated yet when this
> * is called.
> @@ -275,8 +272,6 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_
> */
> VM_WARN_ON(pte_hw_valid(*ptep) && !pte_protnone(*ptep));
>
> - pte = pte_mkpte(pte);
> -
> pte = set_pte_filter(pte);
>
> val = pte_val(pte);
>
There is one checkpatch.pl warning for this patch.
WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#6:
powerpc used to set the pte specific flags in set_pte_at(). This is different
total: 0 errors, 1 warnings, 61 lines checked
next prev parent reply other threads:[~2020-09-01 3:14 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-27 8:04 [PATCH v3 00/13] mm/debug_vm_pgtable fixes Aneesh Kumar K.V
2020-08-27 8:04 ` [PATCH v3 01/13] powerpc/mm: Add DEBUG_VM WARN for pmd_clear Aneesh Kumar K.V
2020-09-01 3:12 ` Anshuman Khandual
2020-08-27 8:04 ` [PATCH v3 02/13] powerpc/mm: Move setting pte specific flags to pfn_pte Aneesh Kumar K.V
2020-09-01 3:13 ` Anshuman Khandual [this message]
2020-08-27 8:04 ` [PATCH v3 03/13] mm/debug_vm_pgtable/ppc64: Avoid setting top bits in radom value Aneesh Kumar K.V
2020-09-01 3:15 ` Anshuman Khandual
2020-09-01 6:21 ` Aneesh Kumar K.V
2020-09-01 7:32 ` Anshuman Khandual
2020-09-01 7:36 ` Aneesh Kumar K.V
2020-09-01 7:46 ` Anshuman Khandual
2020-09-01 7:55 ` Aneesh Kumar K.V
2020-09-02 3:45 ` Anshuman Khandual
2020-08-27 8:04 ` [PATCH v3 04/13] mm/debug_vm_pgtables/hugevmap: Use the arch helper to identify huge vmap support Aneesh Kumar K.V
2020-09-01 3:16 ` Anshuman Khandual
2020-08-27 8:04 ` [PATCH v3 05/13] mm/debug_vm_pgtable/savedwrite: Enable savedwrite test with CONFIG_NUMA_BALANCING Aneesh Kumar K.V
2020-09-01 3:18 ` Anshuman Khandual
2020-08-27 8:04 ` [PATCH v3 06/13] mm/debug_vm_pgtable/THP: Mark the pte entry huge before using set_pmd/pud_at Aneesh Kumar K.V
2020-09-01 3:21 ` Anshuman Khandual
2020-09-01 6:23 ` Aneesh Kumar K.V
2020-08-27 8:04 ` [PATCH v3 07/13] mm/debug_vm_pgtable/set_pte/pmd/pud: Don't use set_*_at to update an existing pte entry Aneesh Kumar K.V
2020-08-27 8:04 ` [PATCH v3 08/13] mm/debug_vm_pgtable/thp: Use page table depost/withdraw with THP Aneesh Kumar K.V
2020-09-01 3:22 ` Anshuman Khandual
2020-09-01 6:25 ` Aneesh Kumar K.V
2020-09-01 6:50 ` Christophe Leroy
2020-09-01 7:40 ` Aneesh Kumar K.V
2020-09-01 7:51 ` Christophe Leroy
2020-09-02 3:45 ` Anshuman Khandual
2020-08-27 8:04 ` [PATCH v3 09/13] mm/debug_vm_pgtable/locks: Move non page table modifying test together Aneesh Kumar K.V
2020-09-01 3:41 ` Anshuman Khandual
2020-09-01 6:38 ` Aneesh Kumar K.V
2020-09-01 9:33 ` Anshuman Khandual
2020-09-01 9:36 ` Aneesh Kumar K.V
2020-09-01 9:58 ` Anshuman Khandual
2020-08-27 8:04 ` [PATCH v3 10/13] mm/debug_vm_pgtable/locks: Take correct page table lock Aneesh Kumar K.V
2020-09-01 3:44 ` Anshuman Khandual
2020-08-27 8:04 ` [PATCH v3 11/13] mm/debug_vm_pgtable/pmd_clear: Don't use pmd/pud_clear on pte entries Aneesh Kumar K.V
2020-08-27 8:04 ` [PATCH v3 12/13] mm/debug_vm_pgtable/hugetlb: Disable hugetlb test on ppc64 Aneesh Kumar K.V
2020-09-01 4:03 ` Anshuman Khandual
2020-09-01 6:30 ` Aneesh Kumar K.V
2020-09-01 7:59 ` Christophe Leroy
2020-09-02 13:05 ` Anshuman Khandual
2020-09-02 13:20 ` Aneesh Kumar K.V
2020-08-27 8:04 ` [PATCH v3 13/13] mm/debug_vm_pgtable: populate a pte entry before fetching it Aneesh Kumar K.V
2020-08-27 12:17 ` kernel test robot
2020-09-01 3:25 ` Anshuman Khandual
2020-09-01 6:37 ` Aneesh Kumar K.V
2020-09-01 7:38 ` Anshuman Khandual
2020-09-01 9:58 ` Aneesh Kumar K.V
2020-09-02 3:49 ` Anshuman Khandual
2020-09-02 3:58 ` Aneesh Kumar K.V
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=5b3f0db6-09f6-3f40-c9fc-911814d691bb@arm.com \
--to=anshuman.khandual@arm.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=cai@lca.pw \
--cc=christophe.leroy@c-s.fr \
--cc=gerald.schaefer@de.ibm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=rppt@linux.ibm.com \
--cc=vgupta@synopsys.com \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).