MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-17 22:59:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

riscv: Use WRITE_ONCE() when setting page table entries

Browse Source 
commit c30fa83b49 upstream.

To avoid any compiler "weirdness" when accessing page table entries which
are concurrently modified by the HW, let's use WRITE_ONCE() macro
(commit 20a004e7b0 ("arm64: mm: Use READ_ONCE/WRITE_ONCE when accessing
page tables") gives a great explanation with more details).

Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20231213203001.179237-2-alexghiti@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: WangYuli <wangyuli@uniontech.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexandre Ghiti 2023-12-13 21:29:58 +01:00 committed by Greg Kroah-Hartman
parent 6c4a878e1c
commit 193b1fc1cb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/riscv/include/asm/pgtable-64.h
View File

@ -198,7 +198,7 @@ static inline int pud_user(pud_t pud)
static inline void set_pud(pud_t *pudp, pud_t pud) static inline void set_pud(pud_t *pudp, pud_t pud)
{ {
*pudp = pud; WRITE_ONCE(*pudp, pud);
} }
static inline void pud_clear(pud_t *pudp) static inline void pud_clear(pud_t *pudp)
@ -274,7 +274,7 @@ static inline unsigned long _pmd_pfn(pmd_t pmd)
static inline void set_p4d(p4d_t *p4dp, p4d_t p4d) static inline void set_p4d(p4d_t *p4dp, p4d_t p4d)
{ {
if (pgtable_l4_enabled) if (pgtable_l4_enabled)
*p4dp = p4d; WRITE_ONCE(*p4dp, p4d);
else else
set_pud((pud_t *)p4dp, (pud_t){ p4d_val(p4d) }); set_pud((pud_t *)p4dp, (pud_t){ p4d_val(p4d) });
} }
@ -347,7 +347,7 @@ static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address)
static inline void set_pgd(pgd_t *pgdp, pgd_t pgd) static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
{ {
if (pgtable_l5_enabled) if (pgtable_l5_enabled)
*pgdp = pgd; WRITE_ONCE(*pgdp, pgd);
else else
set_p4d((p4d_t *)pgdp, (p4d_t){ pgd_val(pgd) }); set_p4d((p4d_t *)pgdp, (p4d_t){ pgd_val(pgd) });
} }

4
arch/riscv/include/asm/pgtable.h
View File

@ -248,7 +248,7 @@ static inline int pmd_leaf(pmd_t pmd)
static inline void set_pmd(pmd_t *pmdp, pmd_t pmd) static inline void set_pmd(pmd_t *pmdp, pmd_t pmd)
{ {
*pmdp = pmd; WRITE_ONCE(*pmdp, pmd);
} }
static inline void pmd_clear(pmd_t *pmdp) static inline void pmd_clear(pmd_t *pmdp)
@ -515,7 +515,7 @@ static inline int pte_same(pte_t pte_a, pte_t pte_b)
*/ */
static inline void set_pte(pte_t *ptep, pte_t pteval) static inline void set_pte(pte_t *ptep, pte_t pteval)
{ {
*ptep = pteval; WRITE_ONCE(*ptep, pteval);
} }
void flush_icache_pte(pte_t pte); void flush_icache_pte(pte_t pte);