From: Ard Biesheuvel <ardb@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Cc: maz@kernel.org, linux@armlinux.org.uk, Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH] ARM: decompressor: cover BSS in cache clean and reorder with MMU disable on v7
Date: Fri, 22 Jan 2021 16:20:12 +0100 [thread overview]
Message-ID: <20210122152012.30075-1-ardb@kernel.org> (raw)
To ensure that no cache lines cover any of the data that is accessed by
the booting kernel with the MMU off, cover the uncompressed kernel's BSS
region in the cache clean operation.
Also, to ensure that no cachelines are allocated while the cache is being
cleaned, perform the cache clean operation *after* disabling the MMU and
caches when running on v7 or later, by making a tail call to the clean
routine from the cache_off routine. This requires passing the VA range
to cache_off(), which means some care needs to be taken to preserve
R0 and R1 across the call to cache_off().
Since this makes the first cache clean redundant, call it with the
range reduced to zero. This only affects v7, as all other versions
ignore R0/R1 entirely.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
arch/arm/boot/compressed/head.S | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index caa27322a0ab..b0e5c41cefc5 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -614,11 +614,24 @@ not_relocated: mov r0, #0
mov r3, r7
bl decompress_kernel
+ @
+ @ Perform a cache clean before disabling the MMU entirely.
+ @ In cases where the MMU needs to be disabled first (v7+),
+ @ the clean is performed again by cache_off(), using by-VA
+ @ operations on the range [R0, R1], making this prior call to
+ @ cache_clean_flush() redundant. In other cases, the clean is
+ @ performed by set/way and R0/R1 are ignored.
+ @
+ mov r0, #0
+ mov r1, #0
+ bl cache_clean_flush
+
get_inflated_image_size r1, r2, r3
+ ldr r2, =_kernel_bss_size
+ add r1, r1, r2
- mov r0, r4 @ start of inflated image
- add r1, r1, r0 @ end of inflated image
- bl cache_clean_flush
+ mov r0, r4 @ start of decompressed kernel
+ add r1, r1, r0 @ end of kernel BSS
bl cache_off
#ifdef CONFIG_ARM_VIRT_EXT
@@ -1135,12 +1148,14 @@ proc_types:
* reading the control register, but ARMv4 does.
*
* On exit,
- * r0, r1, r2, r3, r9, r12 corrupted
+ * r0, r1, r2, r3, r9, r10, r11, r12 corrupted
* This routine must preserve:
* r4, r7, r8
*/
.align 5
cache_off: mov r3, #12 @ cache_off function
+ mov r10, r0
+ mov r11, r1
b call_cache_fn
__armv4_mpu_cache_off:
@@ -1187,7 +1202,9 @@ __armv7_mmu_cache_off:
mcr p15, 0, r0, c7, c5, 6 @ invalidate BTC
mcr p15, 0, r0, c7, c10, 4 @ DSB
mcr p15, 0, r0, c7, c5, 4 @ ISB
- mov pc, lr
+
+ mov r0, r10
+ b __armv7_mmu_cache_flush
/*
* Clean and flush the cache to maintain consistency.
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2021-01-22 15:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 15:20 Ard Biesheuvel [this message]
2021-01-22 16:13 ` [PATCH] ARM: decompressor: cover BSS in cache clean and reorder with MMU disable on v7 Russell King - ARM Linux admin
2021-01-22 16:32 ` Ard Biesheuvel
2021-01-24 13:35 ` Ard Biesheuvel
2021-01-24 15:21 ` Russell King - ARM Linux admin
2021-01-24 15:45 ` Ard Biesheuvel
2021-01-24 16:18 ` Russell King - ARM Linux admin
2021-01-24 23:08 ` Russell King - ARM Linux admin
2021-01-25 7:51 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210122152012.30075-1-ardb@kernel.org \
--to=ardb@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=maz@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.