From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Michael Ellerman <mpe@ellerman.id.au>,
Nicholas Piggin <npiggin@gmail.com>
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 01/19] powerpc/8xx: Fix pte_access_permitted() for PAGE_NONE
Date: Mon, 11 Sep 2023 21:03:07 +0200 [thread overview]
Message-ID: <3ad092161ca1a03609619ce0d1fe2540978af71a.1694443576.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1694443576.git.christophe.leroy@csgroup.eu>
On 8xx, PAGE_NONE is handled by setting _PAGE_NA instead of clearing
_PAGE_USER.
But then pte_user() returns 1 also for PAGE_NONE.
As _PAGE_NA prevent reads, add a specific version of pte_read()
that returns 0 when _PAGE_NA is set instead of always returning 1.
Fixes: 351750331fc1 ("powerpc/mm: Introduce _PAGE_NA")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/nohash/32/pte-8xx.h | 7 +++++++
arch/powerpc/include/asm/nohash/pgtable.h | 2 ++
2 files changed, 9 insertions(+)
diff --git a/arch/powerpc/include/asm/nohash/32/pte-8xx.h b/arch/powerpc/include/asm/nohash/32/pte-8xx.h
index 21f681ee535a..e6fe1d5731f2 100644
--- a/arch/powerpc/include/asm/nohash/32/pte-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/pte-8xx.h
@@ -94,6 +94,13 @@ static inline pte_t pte_wrprotect(pte_t pte)
#define pte_wrprotect pte_wrprotect
+static inline int pte_read(pte_t pte)
+{
+ return (pte_val(pte) & _PAGE_RO) != _PAGE_NA;
+}
+
+#define pte_read pte_read
+
static inline int pte_write(pte_t pte)
{
return !(pte_val(pte) & _PAGE_RO);
diff --git a/arch/powerpc/include/asm/nohash/pgtable.h b/arch/powerpc/include/asm/nohash/pgtable.h
index 56ea48276356..c721478c5934 100644
--- a/arch/powerpc/include/asm/nohash/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/pgtable.h
@@ -25,7 +25,9 @@ static inline int pte_write(pte_t pte)
return pte_val(pte) & _PAGE_RW;
}
#endif
+#ifndef pte_read
static inline int pte_read(pte_t pte) { return 1; }
+#endif
static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; }
static inline int pte_special(pte_t pte) { return pte_val(pte) & _PAGE_SPECIAL; }
static inline int pte_none(pte_t pte) { return (pte_val(pte) & ~_PTE_NONE_MASK) == 0; }
--
2.41.0
next prev parent reply other threads:[~2023-09-11 19:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-11 19:03 [PATCH v1 00/19] cleanup/refactor pgtable.h Christophe Leroy
2023-09-11 19:03 ` Christophe Leroy [this message]
2023-09-11 19:03 ` [PATCH v1 02/19] powerpc/64e: Fix wrong test in __ptep_test_and_clear_young() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 03/19] powerpc/40x: Remove stale PTE_ATOMIC_UPDATES macro Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 04/19] powerpc: Remove pte_ERROR() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 05/19] powerpc: Deduplicate prototypes of ptep_set_access_flags() and phys_mem_access_prot() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 06/19] powerpc: Refactor update_mmu_cache_range() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 07/19] powerpc: Untangle fixmap.h and pgtable.h and mmu.h Christophe Leroy
2023-09-13 11:14 ` kernel test robot
2023-09-11 19:03 ` [PATCH v1 08/19] powerpc/nohash: Remove {pte/pmd}_protnone() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 09/19] powerpc/nohash: Refactor declaration of {map/unmap}_kernel_page() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 10/19] powerpc/nohash: Move 8xx version of pte_update() into pte-8xx.h Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 11/19] powerpc/nohash: Replace #ifdef CONFIG_44x by IS_ENABLED(CONFIG_44x) in pgtable.h Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 12/19] powerpc/nohash: Refactor pte_update() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 13/19] powerpc/nohash: Refactor checking of no-change in pte_update() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 14/19] powerpc/nohash: Deduplicate _PAGE_CHG_MASK Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 15/19] powerpc/nohash: Deduplicate pte helpers Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 16/19] powerpc/nohash: Refactor ptep_test_and_clear_young() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 17/19] powerpc/nohash: Deduplicate ptep_set_wrprotect() and ptep_get_and_clear() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 18/19] powerpc/nohash: Refactor pte_clear() Christophe Leroy
2023-09-11 19:03 ` [PATCH v1 19/19] powerpc/nohash: Refactor __ptep_set_access_flags() Christophe Leroy
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=3ad092161ca1a03609619ce0d1fe2540978af71a.1694443576.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
/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).