Skip to content

arm64: relax Image placement rules

Suzuki K. Poulose linux-arm-kernel 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest posting 2/20 of 7 patches 0 repliesNew
  2. v2 posting 1/20 of 7 patches 0 repliesSuperseded

Patches in v2 posting 2/2 No applies recorded yet

None of the 7 patches the cover letter announces are in this archive.

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/7] arm64: relax Image placement rules
Quoted 58 lines · Ard Biesheuvel
Quoted 27 lines · Ard Biesheuvel
Quoted 26 lines · Suzuki K. Poulose

On 23/09/15 01:37, Ard Biesheuvel wrote:

Ard,

I gave your series a quick run and dumping the kernel page tables(with CONFIG_ARM64_PTDUMP)
I find this problem :

...

---[ Kernel Mapping ]---
0xffffffbffc000000-0xffffffbffc600000 6M RW x SHD AF
MEM/NORMAL *****
0xffffffbffc600000-0xffffffbffc7f5000 2004K RW x SHD AF UXN
MEM/NORMAL
0xffffffbffc7f5000-0xffffffbffc875000 512K RW NX SHD AF UXN
MEM/NORMAL
0xffffffbffc875000-0xffffffbffca00000 1580K RW x SHD AF UXN
MEM/NORMAL
---[ Linear Mapping ]---
0xffffffc000000000-0xffffffc040000000 1G RW NX SHD AF UXN
MEM/NORMAL

Quoted 9 lines
Quoted 6 lines

Note that the first mapping in the kernel doesn't have UXN set, which is a regression.
I haven't started digging into it yet, but I thought I will point it out here, in case you
already fixed it.

Ok, thanks for pointing that out. I will look into it.

Turns out that, since the kernel mapping is not overwritten by the linear mapping, it retains the original permissions assigned in head.S. So this is enough to fix it

"""

arch/arm64/kernel/head.S +2 -2
index 2df4a55f00d4..fcd250cff4bf 100644
@@ -62,8 +62,8 @@
  /*
   * Initial memory map attributes.
   */
-#define PTE_FLAGS      PTE_TYPE_PAGE | PTE_AF | PTE_SHARED
-#define PMD_FLAGS      PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S
+#define PTE_FLAGS      PTE_TYPE_PAGE | PTE_AF | PTE_SHARED | PTE_UXN
+#define PMD_FLAGS      PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S | PMD_SECT_UXN
 
  #ifdef CONFIG_ARM64_64K_PAGES
  #define MM_MMUFLAGS    PTE_ATTRINDX(MT_NORMAL) | PTE_FLAGS
Quoted 2 lines

"""

Yes, that fixes it. With that I get :

---[ Kernel Mapping ]---

0xffffffbffc000000-0xffffffbffc600000           6M     RW x  SHD AF    UXN MEM/NORMAL
0xffffffbffc600000-0xffffffbffc7f5000        2004K     RW x  SHD AF    UXN MEM/NORMAL
0xffffffbffc7f5000-0xffffffbffc875000         512K     RW NX SHD AF    UXN MEM/NORMAL
0xffffffbffc875000-0xffffffbffca00000        1580K     RW x  SHD AF    UXN MEM/NORMAL
---[ Linear Mapping ]---
0xffffffc000000000-0xffffffc080000000           2G     RW NX SHD AF    UXN MEM/NORMAL
0xffffffc800000000-0xffffffc880000000           2G     RW NX SHD AF    UXN MEM/NORMAL
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines

Note: I see that you have used CONFIG_ARM64_64K_PAGES to handle section/table mapping
(which I have tried to cleanup in 16K page size series and which is not merged yet).
We should be careful when we merge our patches, as we could miss such new cases.

Quoted 6 lines
Quoted 3 lines

I was aware of this, and I think it makes sense to the 16 KB pages to be merged first, and then I will rebase these patches on top of it.

Do you have a git tree with the latest version?

Yes, it is available here :

git://linux-arm.org/linux-skp.git 16k/v2-4.3-rc1

Thanks
Suzuki