ArmPkg/ArmMmuLib AARCH64: Add missing ISB after page table update

The helper that updates live page table entries writes a zero entry,
invalidates the covered address range from the TLBs, and finally writes
the actual entry. This ensures that no TLB conflicts can occur.

Writing the final entry needs to complete before any translations can be
performed, as otherwise, the zero entry, which describes an invalid
translation, may be observed by the page table walker, resulting in a
translation fault. For this reason, the final write is followed by a DSB
barrier instruction.

However, this barrier will not stall the pipeline, and instruction
fetches may still hit this invalid translation, as has been observed and
reported by Oliver. To ensure that the new translation is fully active
before returning from this helper, we have to insert an ISB barrier as
well.

Reported-by: Oliver Steffen <osteffen@redhat.com>
Tested-by: Oliver Steffen <osteffen@redhat.com>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
Acked-by: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Ard Biesheuvel 2023-05-19 23:44:12 +02:00 committed by mergify[bot]
parent c5cf7f69c9
commit 5ce29ae84d
1 changed files with 1 additions and 0 deletions

View File

@ -65,6 +65,7 @@
// write updated entry // write updated entry
str x1, [x0] str x1, [x0]
dsb nshst dsb nshst
isb
.L2_\@: .L2_\@:
.endm .endm