search

OP-TEE / optee_os

Trusted side of the TEE
Other
1.51k stars 1.03k forks source link

core: mm: core_mmu: skip unmapped regions when searching by PA #6914

Closed lyctw closed 1 day ago

lyctw commented 2 days ago

Currently, OP-TEE OS on RISC-V platforms uses external device-tree located at 'Domain1 Next Arg1' passed by previous boot stages (i.e. U-Boot SPL and OpenSBI). For example:

Domain1 Name : trusted-domain ... Domain1 Next Address : 0x0000000010000000 // OP-TEE OS

Domain1 Next Arg1 : 0x000000000187f760 // device-tree Domain1 Next Mode : S-mode

In this case, 0x0187f760 lies in SHM_VASPACE, which is not yet mapped and not intended to load an external DT:

type TEE_RAM_RX va 0x10000000..0x10092fff pa 0x10000000..0x10092fff type TEE_RAM_RW va 0x10093000..0x101fffff pa 0x10093000..0x101fffff type RES_VASPACE va 0x10200000..0x10bfffff pa 0x00000000..0x009fffff

type SHM_VASPACE va 0x10c00000..0x12bfffff pa 0x00000000..0x01ffffff type TA_RAM va 0x12c00000..0x139fffff pa 0x10200000..0x10ffffff type IO_SEC va 0x13a00000..0x13bfffff pa 0xf0200000..0xf03fffff

To address this issue, add a memory region attribute check to skip such regions. In this way, when init_external_dt() calls core_mmu_get_type_by_pa(), it can properly return MEM_AREA_MAXTYPE (i.e. valid region not found) and map a MEM_AREA_EXT_DT region.

Note that this bug cannot be reproduced on QEMU virt machine, as its memory regions have no overlapping with the external DT.

Reviewed-by: Alvin Chang alvinga@andestech.com

jforissier commented 2 days ago

QEMUv7 CI error addressed in https://github.com/OP-TEE/manifest/pull/284