| From 6de02b9235be0c81d06a8410761fd7cdd2cf175e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 31 Mar 2021 11:38:42 +1100 |
| Subject: powerpc/64s: Use htab_convert_pte_flags() in hash__mark_rodata_ro() |
| |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| |
| [ Upstream commit 2c02e656a29d5f64193eb93da92781bcf0517146 ] |
| |
| In hash__mark_rodata_ro() we pass the raw PP_RXXX value to |
| hash__change_memory_range(). That has the effect of setting the key to |
| zero, because PP_RXXX contains no key value. |
| |
| Fix it by using htab_convert_pte_flags(), which knows how to convert a |
| pgprot into a pp value, including the key. |
| |
| Fixes: d94b827e89dc ("powerpc/book3s64/kuap: Use Key 3 for kernel mapping with hash translation") |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Reviewed-by: Daniel Axtens <dja@axtens.net> |
| Link: https://lore.kernel.org/r/20210331003845.216246-3-mpe@ellerman.id.au |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/mm/book3s64/hash_pgtable.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/powerpc/mm/book3s64/hash_pgtable.c b/arch/powerpc/mm/book3s64/hash_pgtable.c |
| index 567e0c6b3978..03819c259f0a 100644 |
| --- a/arch/powerpc/mm/book3s64/hash_pgtable.c |
| +++ b/arch/powerpc/mm/book3s64/hash_pgtable.c |
| @@ -428,12 +428,14 @@ static bool hash__change_memory_range(unsigned long start, unsigned long end, |
| |
| void hash__mark_rodata_ro(void) |
| { |
| - unsigned long start, end; |
| + unsigned long start, end, pp; |
| |
| start = (unsigned long)_stext; |
| end = (unsigned long)__init_begin; |
| |
| - WARN_ON(!hash__change_memory_range(start, end, PP_RXXX)); |
| + pp = htab_convert_pte_flags(pgprot_val(PAGE_KERNEL_ROX), HPTE_USE_KERNEL_KEY); |
| + |
| + WARN_ON(!hash__change_memory_range(start, end, pp)); |
| } |
| |
| void hash__mark_initmem_nx(void) |
| -- |
| 2.30.2 |
| |