| Message ID | 20210331003845.216246-1-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/6] powerpc/mm/64s: Add _PAGE_KERNEL_ROX | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (87d76f542a24ecfa797e9bd3bb56c0f19aabff57) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On Wed, 31 Mar 2021 11:38:40 +1100, Michael Ellerman wrote: > In the past we had a fallback definition for _PAGE_KERNEL_ROX, but we > removed that in commit d82fd29c5a8c ("powerpc/mm: Distribute platform > specific PAGE and PMD flags and definitions") and added definitions > for each MMU family. > > However we missed adding a definition for 64s, which was not really a > bug because it's currently not used. > > [...] Applied to powerpc/next. [1/6] powerpc/mm/64s: Add _PAGE_KERNEL_ROX https://git.kernel.org/powerpc/c/56bec2f9d4d05675cada96772a8a93010f4d82bf [2/6] powerpc/pseries: Add key to flags in pSeries_lpar_hpte_updateboltedpp() https://git.kernel.org/powerpc/c/b56d55a5aa4aa9fc166595a7feb57f153ef7b555 [3/6] powerpc/64s: Use htab_convert_pte_flags() in hash__mark_rodata_ro() https://git.kernel.org/powerpc/c/2c02e656a29d5f64193eb93da92781bcf0517146 [4/6] powerpc/mm/64s/hash: Factor out change_memory_range() https://git.kernel.org/powerpc/c/6f223ebe9c3f3ed315a06cec156086f1f7f7ded1 [5/6] powerpc/mm/64s/hash: Add real-mode change_memory_range() for hash LPAR https://git.kernel.org/powerpc/c/87e65ad7bd3a84a992723753fcc23d31c2d063c2 [6/6] powerpc/mm/64s: Allow STRICT_KERNEL_RWX again https://git.kernel.org/powerpc/c/bd573a81312fd9d6520b1cc81a88fd29e670e1ff cheers
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index 058601efbc8a..0c89977ec10b 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -116,6 +116,7 @@ */ #define _PAGE_KERNEL_RW (_PAGE_PRIVILEGED | _PAGE_RW | _PAGE_DIRTY) #define _PAGE_KERNEL_RO (_PAGE_PRIVILEGED | _PAGE_READ) +#define _PAGE_KERNEL_ROX (_PAGE_PRIVILEGED | _PAGE_READ | _PAGE_EXEC) #define _PAGE_KERNEL_RWX (_PAGE_PRIVILEGED | _PAGE_DIRTY | \ _PAGE_RW | _PAGE_EXEC) /*
In the past we had a fallback definition for _PAGE_KERNEL_ROX, but we removed that in commit d82fd29c5a8c ("powerpc/mm: Distribute platform specific PAGE and PMD flags and definitions") and added definitions for each MMU family. However we missed adding a definition for 64s, which was not really a bug because it's currently not used. But we'd like to use PAGE_KERNEL_ROX in a future patch so add a definition now. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/include/asm/book3s/64/pgtable.h | 1 + 1 file changed, 1 insertion(+) v2: Unchanged.