target/linux/generic/pending-5.4/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch

   1 From: Yousong Zhou <yszhou4tech@gmail.com>
   2 Subject: MIPS: kexec: Accept command line parameters from userspace.
   3
   4 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
   5 ---
   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
  11
  12 --- a/arch/mips/kernel/machine_kexec.c
  13 +++ b/arch/mips/kernel/machine_kexec.c
  14 @@ -10,14 +10,11 @@
  15  #include <linux/mm.h>
  16  #include <linux/delay.h>
  17
  18 +#include <asm/bootinfo.h>
  19  #include <asm/cacheflush.h>
  20  #include <asm/page.h>
  21 -
  22 -extern const unsigned char relocate_new_kernel[];
  23 -extern const size_t relocate_new_kernel_size;
  24 -
  25 -extern unsigned long kexec_start_address;
  26 -extern unsigned long kexec_indirection_page;
  27 +#include <linux/uaccess.h>
  28 +#include "machine_kexec.h"
  29
  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;
  34  #endif
  35
  36 +static void machine_kexec_print_args(void)
  37 +{
  38 +       unsigned long argc = (int)kexec_args[0];
  39 +       int i;
  40 +
  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]);
  45 +
  46 +       for (i = 0; i < argc; i++) {
  47 +               pr_info("kexec_argv[%d] = %p, %s\n",
  48 +                               i, kexec_argv[i], kexec_argv[i]);
  49 +       }
  50 +}
  51 +
  52 +static void machine_kexec_init_argv(struct kimage *image)
  53 +{
  54 +       void __user *buf = NULL;
  55 +       size_t bufsz;
  56 +       size_t size;
  57 +       int i;
  58 +
  59 +       bufsz = 0;
  60 +       for (i = 0; i < image->nr_segments; i++) {
  61 +               struct kexec_segment *seg;
  62 +
  63 +               seg = &image->segment[i];
  64 +               if (seg->bufsz < 6)
  65 +                       continue;
  66 +
  67 +               if (strncmp((char *) seg->buf, "kexec ", 6))
  68 +                       continue;
  69 +
  70 +               buf = seg->buf;
  71 +               bufsz = seg->bufsz;
  72 +               break;
  73 +       }
  74 +
  75 +       if (!buf)
  76 +               return;
  77 +
  78 +       size = KEXEC_COMMAND_LINE_SIZE;
  79 +       size = min(size, bufsz);
  80 +       if (size < bufsz)
  81 +               pr_warn("kexec command line truncated to %zd bytes\n", size);
  82 +
  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");
  86 +
  87 +       kexec_argv_buf[size - 1] = 0;
  88 +}
  89 +
  90 +static void machine_kexec_parse_argv(struct kimage *image)
  91 +{
  92 +       char *reboot_code_buffer;
  93 +       int reloc_delta;
  94 +       char *ptr;
  95 +       int argc;
  96 +       int i;
  97 +
  98 +       ptr = kexec_argv_buf;
  99 +       argc = 0;
 100 +
 101 +       /*
 102 +        * convert command line string to array of parameters
 103 +        * (as bootloader does).
 104 +        */
 105 +       while (ptr && *ptr && (KEXEC_MAX_ARGC > argc)) {
 106 +               if (*ptr == ' ') {
 107 +                       *ptr++ = '\0';
 108 +                       continue;
 109 +               }
 110 +
 111 +               kexec_argv[argc++] = ptr;
 112 +               ptr = strchr(ptr, ' ');
 113 +       }
 114 +
 115 +       if (!argc)
 116 +               return;
 117 +
 118 +       kexec_args[0] = argc;
 119 +       kexec_args[1] = (unsigned long)kexec_argv;
 120 +       kexec_args[2] = 0;
 121 +       kexec_args[3] = 0;
 122 +
 123 +       reboot_code_buffer = page_address(image->control_code_page);
 124 +       reloc_delta = reboot_code_buffer - (char *)kexec_relocate_new_kernel;
 125 +
 126 +       kexec_args[1] += reloc_delta;
 127 +       for (i = 0; i < argc; i++)
 128 +               kexec_argv[i] += reloc_delta;
 129 +}
 130 +
 131  static void kexec_image_info(const struct kimage *kimage)
 132  {
 133         unsigned long i;
 134 @@ -52,6 +144,18 @@ int
 135  machine_kexec_prepare(struct kimage *kimage)
 136  {
 137         kexec_image_info(kimage);
 138 +       /*
 139 +        * Whenever arguments passed from kexec-tools, Init the arguments as
 140 +        * the original ones to try avoiding booting failure.
 141 +        */
 142 +
 143 +       kexec_args[0] = fw_arg0;
 144 +       kexec_args[1] = fw_arg1;
 145 +       kexec_args[2] = fw_arg2;
 146 +       kexec_args[3] = fw_arg3;
 147 +
 148 +       machine_kexec_init_argv(kimage);
 149 +       machine_kexec_parse_argv(kimage);
 150
 151         if (_machine_kexec_prepare)
 152                 return _machine_kexec_prepare(kimage);
 153 @@ -89,10 +193,12 @@ machine_kexec(struct kimage *image)
 154         unsigned long *ptr;
 155
 156         reboot_code_buffer =
 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);
 160
 161         kexec_start_address =
 162                 (unsigned long) phys_to_virt(image->start);
 163 +       pr_info("kexec_start_address = %p\n", (void *)kexec_start_address);
 164
 165         if (image->type == KEXEC_TYPE_DEFAULT) {
 166                 kexec_indirection_page =
 167 @@ -100,9 +206,19 @@ machine_kexec(struct kimage *image)
 168         } else {
 169                 kexec_indirection_page = (unsigned long)&image->head;
 170         }
 171 +       pr_info("kexec_indirection_page = %p\n", (void *)kexec_indirection_page);
 172
 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);
 182 +
 183 +       pr_info("Before _print_args().\n");
 184 +       machine_kexec_print_args();
 185 +       pr_info("Before eval loop.\n");
 186
 187         /*
 188          * The generic kexec code builds a page list with physical
 189 @@ -124,15 +240,16 @@ machine_kexec(struct kimage *image)
 190         /*
 191          * we do not want to be bothered.
 192          */
 193 +       pr_info("Before irq_disable.\n");
 194         local_irq_disable();
 195
 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");
 200         __flush_cache_all();
 201  #ifdef CONFIG_SMP
 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);
 206         smp_wmb();
 207         atomic_set(&kexec_ready_to_reboot, 1);
 208  #endif
 209 --- /dev/null
 210 +++ b/arch/mips/kernel/machine_kexec.h
 211 @@ -0,0 +1,20 @@
 212 +#ifndef _MACHINE_KEXEC_H
 213 +#define _MACHINE_KEXEC_H
 214 +
 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;
 220 +
 221 +extern char kexec_argv_buf[];
 222 +extern char *kexec_argv[];
 223 +
 224 +#define KEXEC_RELOCATE_NEW_KERNEL_SIZE ((unsigned long)&kexec_relocate_new_kernel_end - (unsigned long)kexec_relocate_new_kernel)
 225 +#endif /* !__ASSEMBLY__ */
 226 +
 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))
 230 +
 231 +#endif
 232 --- a/arch/mips/kernel/relocate_kernel.S
 233 +++ b/arch/mips/kernel/relocate_kernel.S
 234 @@ -12,8 +12,9 @@
 235  #include <asm/mipsregs.h>
 236  #include <asm/stackframe.h>
 237  #include <asm/addrspace.h>
 238 +#include "machine_kexec.h"
 239
 240 -LEAF(relocate_new_kernel)
 241 +LEAF(kexec_relocate_new_kernel)
 242         PTR_L a0,       arg0
 243         PTR_L a1,       arg1
 244         PTR_L a2,       arg2
 245 @@ -98,7 +99,7 @@ done:
 246  #endif
 247         /* jump to kexec_start_address */
 248         j               s1
 249 -       END(relocate_new_kernel)
 250 +       END(kexec_relocate_new_kernel)
 251
 252  #ifdef CONFIG_SMP
 253  /*
 254 @@ -184,9 +185,15 @@ kexec_indirection_page:
 255         PTR             0
 256         .size           kexec_indirection_page, PTRSIZE
 257
 258 -relocate_new_kernel_end:
 259 +kexec_argv_buf:
 260 +       EXPORT(kexec_argv_buf)
 261 +       .skip           KEXEC_COMMAND_LINE_SIZE
 262 +       .size           kexec_argv_buf, KEXEC_COMMAND_LINE_SIZE
 263 +
 264 +kexec_argv:
 265 +       EXPORT(kexec_argv)
 266 +       .skip           KEXEC_ARGV_SIZE
 267 +       .size           kexec_argv, KEXEC_ARGV_SIZE
 268
 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)