1 From: Yousong Zhou <yszhou4tech@gmail.com>
2 Subject: MIPS: kexec: Accept command line parameters from userspace.
4 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 arch/mips/kernel/machine_kexec.c | 153 +++++++++++++++++++++++++++++++-----
7 arch/mips/kernel/machine_kexec.h | 20 +++++
8 arch/mips/kernel/relocate_kernel.S | 21 +++--
9 3 files changed, 167 insertions(+), 27 deletions(-)
10 create mode 100644 arch/mips/kernel/machine_kexec.h
12 --- a/arch/mips/kernel/machine_kexec.c
13 +++ b/arch/mips/kernel/machine_kexec.c
16 #include <linux/delay.h>
18 +#include <asm/bootinfo.h>
19 #include <asm/cacheflush.h>
22 -extern const unsigned char relocate_new_kernel[];
23 -extern const size_t relocate_new_kernel_size;
25 -extern unsigned long kexec_start_address;
26 -extern unsigned long kexec_indirection_page;
27 +#include <linux/uaccess.h>
28 +#include "machine_kexec.h"
30 int (*_machine_kexec_prepare)(struct kimage *) = NULL;
31 void (*_machine_kexec_shutdown)(void) = NULL;
32 @@ -28,6 +25,101 @@ atomic_t kexec_ready_to_reboot = ATOMIC_
33 void (*_crash_smp_send_stop)(void) = NULL;
36 +static void machine_kexec_print_args(void)
38 + unsigned long argc = (int)kexec_args[0];
41 + pr_info("kexec_args[0] (argc): %lu\n", argc);
42 + pr_info("kexec_args[1] (argv): %p\n", (void *)kexec_args[1]);
43 + pr_info("kexec_args[2] (env ): %p\n", (void *)kexec_args[2]);
44 + pr_info("kexec_args[3] (desc): %p\n", (void *)kexec_args[3]);
46 + for (i = 0; i < argc; i++) {
47 + pr_info("kexec_argv[%d] = %p, %s\n",
48 + i, kexec_argv[i], kexec_argv[i]);
52 +static void machine_kexec_init_argv(struct kimage *image)
54 + void __user *buf = NULL;
60 + for (i = 0; i < image->nr_segments; i++) {
61 + struct kexec_segment *seg;
63 + seg = &image->segment[i];
67 + if (strncmp((char *) seg->buf, "kexec ", 6))
78 + size = KEXEC_COMMAND_LINE_SIZE;
79 + size = min(size, bufsz);
81 + pr_warn("kexec command line truncated to %zd bytes\n", size);
83 + /* Copy to kernel space */
84 + if (copy_from_user(kexec_argv_buf, buf, size))
85 + pr_warn("kexec command line copy to kernel space failed\n");
87 + kexec_argv_buf[size - 1] = 0;
90 +static void machine_kexec_parse_argv(struct kimage *image)
92 + char *reboot_code_buffer;
98 + ptr = kexec_argv_buf;
102 + * convert command line string to array of parameters
103 + * (as bootloader does).
105 + while (ptr && *ptr && (KEXEC_MAX_ARGC > argc)) {
111 + kexec_argv[argc++] = ptr;
112 + ptr = strchr(ptr, ' ');
118 + kexec_args[0] = argc;
119 + kexec_args[1] = (unsigned long)kexec_argv;
123 + reboot_code_buffer = page_address(image->control_code_page);
124 + reloc_delta = reboot_code_buffer - (char *)kexec_relocate_new_kernel;
126 + kexec_args[1] += reloc_delta;
127 + for (i = 0; i < argc; i++)
128 + kexec_argv[i] += reloc_delta;
131 static void kexec_image_info(const struct kimage *kimage)
134 @@ -52,6 +144,18 @@ int
135 machine_kexec_prepare(struct kimage *kimage)
137 kexec_image_info(kimage);
139 + * Whenever arguments passed from kexec-tools, Init the arguments as
140 + * the original ones to try avoiding booting failure.
143 + kexec_args[0] = fw_arg0;
144 + kexec_args[1] = fw_arg1;
145 + kexec_args[2] = fw_arg2;
146 + kexec_args[3] = fw_arg3;
148 + machine_kexec_init_argv(kimage);
149 + machine_kexec_parse_argv(kimage);
151 if (_machine_kexec_prepare)
152 return _machine_kexec_prepare(kimage);
153 @@ -89,10 +193,12 @@ machine_kexec(struct kimage *image)
157 - (unsigned long)page_address(image->control_code_page);
158 + (unsigned long)page_address(image->control_code_page);
159 + pr_info("reboot_code_buffer = %p\n", (void *)reboot_code_buffer);
161 kexec_start_address =
162 (unsigned long) phys_to_virt(image->start);
163 + pr_info("kexec_start_address = %p\n", (void *)kexec_start_address);
165 if (image->type == KEXEC_TYPE_DEFAULT) {
166 kexec_indirection_page =
167 @@ -100,9 +206,19 @@ machine_kexec(struct kimage *image)
169 kexec_indirection_page = (unsigned long)&image->head;
171 + pr_info("kexec_indirection_page = %p\n", (void *)kexec_indirection_page);
173 - memcpy((void*)reboot_code_buffer, relocate_new_kernel,
174 - relocate_new_kernel_size);
175 + pr_info("Where is memcpy: %p\n", memcpy);
176 + pr_info("kexec_relocate_new_kernel = %p, kexec_relocate_new_kernel_end = %p\n",
177 + (void *)kexec_relocate_new_kernel, &kexec_relocate_new_kernel_end);
178 + pr_info("Copy %lu bytes from %p to %p\n", KEXEC_RELOCATE_NEW_KERNEL_SIZE,
179 + (void *)kexec_relocate_new_kernel, (void *)reboot_code_buffer);
180 + memcpy((void*)reboot_code_buffer, kexec_relocate_new_kernel,
181 + KEXEC_RELOCATE_NEW_KERNEL_SIZE);
183 + pr_info("Before _print_args().\n");
184 + machine_kexec_print_args();
185 + pr_info("Before eval loop.\n");
188 * The generic kexec code builds a page list with physical
189 @@ -124,15 +240,16 @@ machine_kexec(struct kimage *image)
191 * we do not want to be bothered.
193 + pr_info("Before irq_disable.\n");
196 - printk("Will call new kernel at %08lx\n", image->start);
197 - printk("Bye ...\n");
198 + pr_info("Will call new kernel at %08lx\n", image->start);
199 + pr_info("Bye ...\n");
202 /* All secondary cpus now may jump to kexec_wait cycle */
203 relocated_kexec_smp_wait = reboot_code_buffer +
204 - (void *)(kexec_smp_wait - relocate_new_kernel);
205 + (void *)(kexec_smp_wait - kexec_relocate_new_kernel);
207 atomic_set(&kexec_ready_to_reboot, 1);
210 +++ b/arch/mips/kernel/machine_kexec.h
212 +#ifndef _MACHINE_KEXEC_H
213 +#define _MACHINE_KEXEC_H
215 +#ifndef __ASSEMBLY__
216 +extern const unsigned char kexec_relocate_new_kernel[];
217 +extern unsigned long kexec_relocate_new_kernel_end;
218 +extern unsigned long kexec_start_address;
219 +extern unsigned long kexec_indirection_page;
221 +extern char kexec_argv_buf[];
222 +extern char *kexec_argv[];
224 +#define KEXEC_RELOCATE_NEW_KERNEL_SIZE ((unsigned long)&kexec_relocate_new_kernel_end - (unsigned long)kexec_relocate_new_kernel)
225 +#endif /* !__ASSEMBLY__ */
227 +#define KEXEC_COMMAND_LINE_SIZE 256
228 +#define KEXEC_ARGV_SIZE (KEXEC_COMMAND_LINE_SIZE / 16)
229 +#define KEXEC_MAX_ARGC (KEXEC_ARGV_SIZE / sizeof(long))
232 --- a/arch/mips/kernel/relocate_kernel.S
233 +++ b/arch/mips/kernel/relocate_kernel.S
235 #include <asm/mipsregs.h>
236 #include <asm/stackframe.h>
237 #include <asm/addrspace.h>
238 +#include "machine_kexec.h"
240 -LEAF(relocate_new_kernel)
241 +LEAF(kexec_relocate_new_kernel)
245 @@ -98,7 +99,7 @@ done:
247 /* jump to kexec_start_address */
249 - END(relocate_new_kernel)
250 + END(kexec_relocate_new_kernel)
254 @@ -184,9 +185,15 @@ kexec_indirection_page:
256 .size kexec_indirection_page, PTRSIZE
258 -relocate_new_kernel_end:
260 + EXPORT(kexec_argv_buf)
261 + .skip KEXEC_COMMAND_LINE_SIZE
262 + .size kexec_argv_buf, KEXEC_COMMAND_LINE_SIZE
266 + .skip KEXEC_ARGV_SIZE
267 + .size kexec_argv, KEXEC_ARGV_SIZE
269 -relocate_new_kernel_size:
270 - EXPORT(relocate_new_kernel_size)
271 - PTR relocate_new_kernel_end - relocate_new_kernel
272 - .size relocate_new_kernel_size, PTRSIZE
273 +kexec_relocate_new_kernel_end:
274 + EXPORT(kexec_relocate_new_kernel_end)