1 files changed, 152 insertions, 19 deletions
diff --git a/arch/x86_64/kernel/relocate_kernel.S b/arch/x86_64/kernel/relocate_kernel.S
index d24fa9b72a2b..14e95872c6a3 100644
--- a/arch/x86_64/kernel/relocate_kernel.S
+++ b/arch/x86_64/kernel/relocate_kernel.S
@@ -7,31 +7,169 @@
 */
 #include <linux/linkage.h>
+#include <asm/page.h>
+#include <asm/kexec.h>
-        /*
+/*
-         * Must be relocatable PIC code callable as a C function, that once
+ * Must be relocatable PIC code callable as a C function
-         * it starts can not use the previous processes stack.
+ */
-         */
-        .globl relocate_new_kernel
+#define PTR(x) (x << 3)
+#define PAGE_ALIGNED (1 << PAGE_SHIFT)
+#define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */
+        .text
+        .align PAGE_ALIGNED
        .code64
+        .globl relocate_kernel
+relocate_kernel:
+        /* %rdi indirection_page
+         * %rsi page_list
+         * %rdx start address
+         */
+        /* map the control page at its virtual address */
+        movq    $0x0000ff8000000000, %r10        /* mask */
+        mov     $(39 - 3), %cl                   /* bits to shift */
+        movq    PTR(VA_CONTROL_PAGE)(%rsi), %r11 /* address to map */
+        movq    %r11, %r9
+        andq    %r10, %r9
+        shrq    %cl, %r9
+        movq    PTR(VA_PGD)(%rsi), %r8
+        addq    %r8, %r9
+        movq    PTR(PA_PUD_0)(%rsi), %r8
+        orq     $PAGE_ATTR, %r8
+        movq    %r8, (%r9)
+        shrq    $9, %r10
+        sub     $9, %cl
+        movq    %r11, %r9
+        andq    %r10, %r9
+        shrq    %cl, %r9
+        movq    PTR(VA_PUD_0)(%rsi), %r8
+        addq    %r8, %r9
+        movq    PTR(PA_PMD_0)(%rsi), %r8
+        orq     $PAGE_ATTR, %r8
+        movq    %r8, (%r9)
+        shrq    $9, %r10
+        sub     $9, %cl
+        movq    %r11, %r9
+        andq    %r10, %r9
+        shrq    %cl, %r9
+        movq    PTR(VA_PMD_0)(%rsi), %r8
+        addq    %r8, %r9
+        movq    PTR(PA_PTE_0)(%rsi), %r8
+        orq     $PAGE_ATTR, %r8
+        movq    %r8, (%r9)
+        shrq    $9, %r10
+        sub     $9, %cl
+        movq    %r11, %r9
+        andq    %r10, %r9
+        shrq    %cl, %r9
+        movq    PTR(VA_PTE_0)(%rsi), %r8
+        addq    %r8, %r9
+        movq    PTR(PA_CONTROL_PAGE)(%rsi), %r8
+        orq     $PAGE_ATTR, %r8
+        movq    %r8, (%r9)
+        /* identity map the control page at its physical address */
+        movq    $0x0000ff8000000000, %r10        /* mask */
+        mov     $(39 - 3), %cl                   /* bits to shift */
+        movq    PTR(PA_CONTROL_PAGE)(%rsi), %r11 /* address to map */
+        movq    %r11, %r9
+        andq    %r10, %r9
+        shrq    %cl, %r9
+        movq    PTR(VA_PGD)(%rsi), %r8
+        addq    %r8, %r9
+        movq    PTR(PA_PUD_1)(%rsi), %r8
+        orq     $PAGE_ATTR, %r8
+        movq    %r8, (%r9)
+        shrq    $9, %r10
+        sub     $9, %cl
+        movq    %r11, %r9
+        andq    %r10, %r9
+        shrq    %cl, %r9
+        movq    PTR(VA_PUD_1)(%rsi), %r8
+        addq    %r8, %r9
+        movq    PTR(PA_PMD_1)(%rsi), %r8
+        orq     $PAGE_ATTR, %r8
+        movq    %r8, (%r9)
+        shrq    $9, %r10
+        sub     $9, %cl
+        movq    %r11, %r9
+        andq    %r10, %r9
+        shrq    %cl, %r9
+        movq    PTR(VA_PMD_1)(%rsi), %r8
+        addq    %r8, %r9
+        movq    PTR(PA_PTE_1)(%rsi), %r8
+        orq     $PAGE_ATTR, %r8
+        movq    %r8, (%r9)
+        shrq    $9, %r10
+        sub     $9, %cl
+        movq    %r11, %r9
+        andq    %r10, %r9
+        shrq    %cl, %r9
+        movq    PTR(VA_PTE_1)(%rsi), %r8
+        addq    %r8, %r9
+        movq    PTR(PA_CONTROL_PAGE)(%rsi), %r8
+        orq     $PAGE_ATTR, %r8
+        movq    %r8, (%r9)
 relocate_new_kernel:
-        /* %rdi page_list
+        /* %rdi indirection_page
-         * %rsi reboot_code_buffer
+         * %rsi page_list
         * %rdx start address
-         * %rcx page_table
-         * %r8  arg5
-         * %r9  arg6
         */
        /* zero out flags, and disable interrupts */
        pushq $0
        popfq
-        /* set a new stack at the bottom of our page... */
+        /* get physical address of control page now */
-        lea   4096(%rsi), %rsp
+        /* this is impossible after page table switch */
+        movq    PTR(PA_CONTROL_PAGE)(%rsi), %r8
+        /* get physical address of page table now too */
+        movq    PTR(PA_TABLE_PAGE)(%rsi), %rcx
-        /* store the parameters back on the stack */
+        /* switch to new set of page tables */
-        pushq   %rdx /* store the start address */
+        movq    PTR(PA_PGD)(%rsi), %r9
+        movq    %r9, %cr3
+        /* setup a new stack at the end of the physical control page */
+        lea     4096(%r8), %rsp
+        /* jump to identity mapped page */
+        addq    $(identity_mapped - relocate_kernel), %r8
+        pushq   %r8
+        ret
+identity_mapped:
+        /* store the start address on the stack */
+        pushq   %rdx
        /* Set cr0 to a known state:
         * 31 1 == Paging enabled
@@ -136,8 +274,3 @@ relocate_new_kernel:
        xorq    %r15, %r15
        ret
-relocate_new_kernel_end:
-        .globl relocate_new_kernel_size
-relocate_new_kernel_size:
-        .quad relocate_new_kernel_end - relocate_new_kernel

diff --git a/arch/x86_64/kernel/relocate_kernel.S b/arch/x86_64/kernel/relocate_kernel.S index d24fa9b72a2b..14e95872c6a3 100644 --- a/arch/x86_64/kernel/relocate_kernel.S +++ b/arch/x86_64/kernel/relocate_kernel.S
@@ -7,31 +7,169 @@
7	*/	7	*/
8		8
9	#include <linux/linkage.h>	9	#include <linux/linkage.h>
		10	#include <asm/page.h>
		11	#include <asm/kexec.h>
10		12
11	/*	13	/*
12	* Must be relocatable PIC code callable as a C function, that once	14	* Must be relocatable PIC code callable as a C function
13	* it starts can not use the previous processes stack.	15	*/
14	*/	16
15	.globl relocate_new_kernel	17	#define PTR(x) (x << 3)
		18	#define PAGE_ALIGNED (1 << PAGE_SHIFT)
		19	#define PAGE_ATTR 0x63 /* _PAGE_PRESENT\|_PAGE_RW\|_PAGE_ACCESSED\|_PAGE_DIRTY */
		20
		21	.text
		22	.align PAGE_ALIGNED
16	.code64	23	.code64
		24	.globl relocate_kernel
		25	relocate_kernel:
		26	/* %rdi indirection_page
		27	* %rsi page_list
		28	* %rdx start address
		29	*/
		30
		31	/* map the control page at its virtual address */
		32
		33	movq $0x0000ff8000000000, %r10 /* mask */
		34	mov $(39 - 3), %cl /* bits to shift */
		35	movq PTR(VA_CONTROL_PAGE)(%rsi), %r11 /* address to map */
		36
		37	movq %r11, %r9
		38	andq %r10, %r9
		39	shrq %cl, %r9
		40
		41	movq PTR(VA_PGD)(%rsi), %r8
		42	addq %r8, %r9
		43	movq PTR(PA_PUD_0)(%rsi), %r8
		44	orq $PAGE_ATTR, %r8
		45	movq %r8, (%r9)
		46
		47	shrq $9, %r10
		48	sub $9, %cl
		49
		50	movq %r11, %r9
		51	andq %r10, %r9
		52	shrq %cl, %r9
		53
		54	movq PTR(VA_PUD_0)(%rsi), %r8
		55	addq %r8, %r9
		56	movq PTR(PA_PMD_0)(%rsi), %r8
		57	orq $PAGE_ATTR, %r8
		58	movq %r8, (%r9)
		59
		60	shrq $9, %r10
		61	sub $9, %cl
		62
		63	movq %r11, %r9
		64	andq %r10, %r9
		65	shrq %cl, %r9
		66
		67	movq PTR(VA_PMD_0)(%rsi), %r8
		68	addq %r8, %r9
		69	movq PTR(PA_PTE_0)(%rsi), %r8
		70	orq $PAGE_ATTR, %r8
		71	movq %r8, (%r9)
		72
		73	shrq $9, %r10
		74	sub $9, %cl
		75
		76	movq %r11, %r9
		77	andq %r10, %r9
		78	shrq %cl, %r9
		79
		80	movq PTR(VA_PTE_0)(%rsi), %r8
		81	addq %r8, %r9
		82	movq PTR(PA_CONTROL_PAGE)(%rsi), %r8
		83	orq $PAGE_ATTR, %r8
		84	movq %r8, (%r9)
		85
		86	/* identity map the control page at its physical address */
		87
		88	movq $0x0000ff8000000000, %r10 /* mask */
		89	mov $(39 - 3), %cl /* bits to shift */
		90	movq PTR(PA_CONTROL_PAGE)(%rsi), %r11 /* address to map */
		91
		92	movq %r11, %r9
		93	andq %r10, %r9
		94	shrq %cl, %r9
		95
		96	movq PTR(VA_PGD)(%rsi), %r8
		97	addq %r8, %r9
		98	movq PTR(PA_PUD_1)(%rsi), %r8
		99	orq $PAGE_ATTR, %r8
		100	movq %r8, (%r9)
		101
		102	shrq $9, %r10
		103	sub $9, %cl
		104
		105	movq %r11, %r9
		106	andq %r10, %r9
		107	shrq %cl, %r9
		108
		109	movq PTR(VA_PUD_1)(%rsi), %r8
		110	addq %r8, %r9
		111	movq PTR(PA_PMD_1)(%rsi), %r8
		112	orq $PAGE_ATTR, %r8
		113	movq %r8, (%r9)
		114
		115	shrq $9, %r10
		116	sub $9, %cl
		117
		118	movq %r11, %r9
		119	andq %r10, %r9
		120	shrq %cl, %r9
		121
		122	movq PTR(VA_PMD_1)(%rsi), %r8
		123	addq %r8, %r9
		124	movq PTR(PA_PTE_1)(%rsi), %r8
		125	orq $PAGE_ATTR, %r8
		126	movq %r8, (%r9)
		127
		128	shrq $9, %r10
		129	sub $9, %cl
		130
		131	movq %r11, %r9
		132	andq %r10, %r9
		133	shrq %cl, %r9
		134
		135	movq PTR(VA_PTE_1)(%rsi), %r8
		136	addq %r8, %r9
		137	movq PTR(PA_CONTROL_PAGE)(%rsi), %r8
		138	orq $PAGE_ATTR, %r8
		139	movq %r8, (%r9)
		140
17	relocate_new_kernel:	141	relocate_new_kernel:
18	/* %rdi page_list	142	/* %rdi indirection_page
19	* %rsi reboot_code_buffer	143	* %rsi page_list
20	* %rdx start address	144	* %rdx start address
21	* %rcx page_table
22	* %r8 arg5
23	* %r9 arg6
24	*/	145	*/
25		146
26	/* zero out flags, and disable interrupts */	147	/* zero out flags, and disable interrupts */
27	pushq $0	148	pushq $0
28	popfq	149	popfq
29		150
30	/* set a new stack at the bottom of our page... */	151	/* get physical address of control page now */
31	lea 4096(%rsi), %rsp	152	/* this is impossible after page table switch */
		153	movq PTR(PA_CONTROL_PAGE)(%rsi), %r8
		154
		155	/* get physical address of page table now too */
		156	movq PTR(PA_TABLE_PAGE)(%rsi), %rcx
32		157
33	/* store the parameters back on the stack */	158	/* switch to new set of page tables */
34	pushq %rdx /* store the start address */	159	movq PTR(PA_PGD)(%rsi), %r9
		160	movq %r9, %cr3
		161
		162	/* setup a new stack at the end of the physical control page */
		163	lea 4096(%r8), %rsp
		164
		165	/* jump to identity mapped page */
		166	addq $(identity_mapped - relocate_kernel), %r8
		167	pushq %r8
		168	ret
		169
		170	identity_mapped:
		171	/* store the start address on the stack */
		172	pushq %rdx
35		173
36	/* Set cr0 to a known state:	174	/* Set cr0 to a known state:
37	* 31 1 == Paging enabled	175	* 31 1 == Paging enabled
@@ -136,8 +274,3 @@ relocate_new_kernel:
136	xorq %r15, %r15	274	xorq %r15, %r15
137		275
138	ret	276	ret
139	relocate_new_kernel_end:
140
141	.globl relocate_new_kernel_size
142	relocate_new_kernel_size:
143	.quad relocate_new_kernel_end - relocate_new_kernel