| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 1 Sep 2010 12:17:43 +0300
From: Shmulik Ladkani <shmulik.ladkani@...il.com>
To: ralf@...ux-mips.org, wuzhangjin@...il.com,
linux-mips@...ux-mips.org
Cc: alex@...riz.org.uk, manuel.lauss@...glemail.com, sam@...nborg.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] MIPS: Fix vmlinuz to flush the caches after kernel
decompression
Flush caches after kernel decompression.
When writing instructions, the D-cache should be written-back, and I-cache
should be invalidated.
The patch implements L1 cache flushing, for r4k style caches - suitable for
all MIPS32 CPUs (and probably for other CPUs too).
Signed-off-by: Shmulik Ladkani <shmulik.ladkani@...il.com>
---
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index ed9bb70..9a8d2da 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -30,6 +30,9 @@ targets := head.o decompress.o dbg.o uart-16550.o uart-alchemy.o
# decompressor objects (linked with vmlinuz)
vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/dbg.o
+targets += $(obj)/c-r4k.o
+vmlinuzobjs-$(CONFIG_CPU_MIPS32) += $(obj)/c-r4k.o
+
ifdef CONFIG_DEBUG_ZBOOT
vmlinuzobjs-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
vmlinuzobjs-$(CONFIG_MIPS_ALCHEMY) += $(obj)/uart-alchemy.o
diff --git a/arch/mips/boot/compressed/c-r4k.c b/arch/mips/boot/compressed/c-r4k.c
new file mode 100644
index 0000000..1959cdc
--- /dev/null
+++ b/arch/mips/boot/compressed/c-r4k.c
@@ -0,0 +1,92 @@
+#include <linux/types.h>
+#include <linux/kernel.h>
+
+#include <asm/addrspace.h>
+#include <asm/asm.h>
+#include <asm/cacheops.h>
+#include <asm/mipsregs.h>
+
+#define INDEX_BASE CKSEG0
+
+extern void puts(const char *s);
+extern void puthex(unsigned long long val);
+
+#define cache_op(op, addr) \
+ __asm__ __volatile__( \
+ " .set push \n" \
+ " .set noreorder \n" \
+ " .set mips3 \n" \
+ " cache %1, 0(%0) \n" \
+ " .set pop \n" \
+ : \
+ : "r" (addr), "i" (op))
+
+#define cache_all_index_op(cachesz, linesz, op) do { \
+ unsigned long addr = INDEX_BASE; \
+ for (; addr < INDEX_BASE + (cachesz); addr += (linesz)) \
+ cache_op(op, addr); \
+} while (0)
+
+static void dcache_writeback(const unsigned long cache_size,
+ const unsigned long line_size)
+{
+#ifdef DEBUG
+ puts("dcache writeback, cachesize ");
+ puthex(cache_size);
+ puts(" linesize ");
+ puthex(line_size);
+ puts("\n");
+#endif
+
+ cache_all_index_op(cache_size, line_size, Index_Writeback_Inv_D);
+}
+
+static void icache_invalidate(const unsigned long cache_size,
+ const unsigned long line_size)
+{
+#ifdef DEBUG
+ puts("icache invalidate, cachesize ");
+ puthex(cache_size);
+ puts(" linesize ");
+ puthex(line_size);
+ puts("\n");
+#endif
+
+ cache_all_index_op(cache_size, line_size, Index_Invalidate_I);
+}
+
+void cache_flush(void)
+{
+ volatile unsigned long config1;
+ unsigned long tmp;
+ unsigned long line_size;
+ unsigned long ways;
+ unsigned long sets;
+ unsigned long cache_size;
+
+ if (!(read_c0_config() & MIPS_CONF_M)) {
+ puts("cache_flush error: Config1 unavailable\n");
+ return;
+ }
+ config1 = read_c0_config1();
+
+ /* calculate D-cache line-size and cache-size, then writeback */
+ tmp = (config1 >> 10) & 7;
+ if (tmp) {
+ line_size = 2 << tmp;
+ sets = 64 << ((config1 >> 13) & 7);
+ ways = 1 + ((config1 >> 7) & 7);
+ cache_size = sets * ways * line_size;
+ dcache_writeback(cache_size, line_size);
+ }
+
+ /* calculate I-cache line-size and cache-size, then invalidate */
+ tmp = (config1 >> 19) & 7;
+ if (tmp) {
+ line_size = 2 << tmp;
+ sets = 64 << ((config1 >> 22) & 7);
+ ways = 1 + ((config1 >> 16) & 7);
+ cache_size = sets * ways * line_size;
+ icache_invalidate(cache_size, line_size);
+ }
+}
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c
index 5cad0fa..c86f9bd 100644
--- a/arch/mips/boot/compressed/decompress.c
+++ b/arch/mips/boot/compressed/decompress.c
@@ -30,6 +30,10 @@ extern unsigned char __image_begin, __image_end;
extern void puts(const char *s);
extern void puthex(unsigned long long val);
+void __weak cache_flush(void)
+{
+}
+
void error(char *x)
{
puts("\n\n");
@@ -105,6 +109,7 @@ void decompress_kernel(unsigned long boot_heap_start)
decompress((char *)zimage_start, zimage_size, 0, 0,
(void *)VMLINUX_LOAD_ADDRESS_ULL, 0, error);
- /* FIXME: should we flush cache here? */
+ cache_flush();
+
puts("Now, booting the kernel...\n");
}
--
Shmulik Ladkani
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists