]> git.ozlabs.org Git - petitboot/blobdiff - discover/boot.c
discover/resource: create_url_resource should take ownership of url
[petitboot] / discover / boot.c
index 583d141ddc440ccaa45ae80288d664e65ec44828..ec6f6e579eb6cb31f8929c1ab140accc9be99b35 100644 (file)
@@ -27,13 +27,13 @@ enum {
        BOOT_HOOK_EXIT_UPDATE   = 2,
 };
 
-
 struct boot_task {
-       char *local_image;
-       char *local_initrd;
-       char *local_dtb;
-       char *args;
-
+       struct load_url_result *image;
+       struct load_url_result *initrd;
+       struct load_url_result *dtb;
+       const char *args;
+       boot_status_fn status_fn;
+       void *status_arg;
        bool dry_run;
 };
 
@@ -53,16 +53,16 @@ static int kexec_load(struct boot_task *boot_task)
        *p++ = pb_system_apps.kexec;    /* 1 */
        *p++ = "-l";                    /* 2 */
 
-       if (boot_task->local_initrd) {
+       if (boot_task->initrd) {
                s_initrd = talloc_asprintf(boot_task, "--initrd=%s",
-                               boot_task->local_initrd);
+                               boot_task->initrd->local);
                assert(s_initrd);
                *p++ = s_initrd;         /* 3 */
        }
 
-       if (boot_task->local_dtb) {
+       if (boot_task->dtb) {
                s_dtb = talloc_asprintf(boot_task, "--dtb=%s",
-                                               boot_task->local_dtb);
+                                               boot_task->dtb->local);
                assert(s_dtb);
                *p++ = s_dtb;            /* 4 */
        }
@@ -74,7 +74,7 @@ static int kexec_load(struct boot_task *boot_task)
                *p++ = s_args;          /* 5 */
        }
 
-       *p++ = boot_task->local_image;  /* 6 */
+       *p++ = boot_task->image->local; /* 6 */
        *p++ = NULL;                    /* 7 */
 
        result = process_run_simple_argv(boot_task, argv);
@@ -121,17 +121,25 @@ static int kexec_reboot(struct boot_task *task)
        return result;
 }
 
-static void update_status(boot_status_fn fn, void *arg, int type,
-               char *message)
+static void __attribute__((format(__printf__, 4, 5))) update_status(
+               boot_status_fn fn, void *arg, int type, char *fmt, ...)
 {
        struct boot_status status;
+       va_list ap;
+
+       va_start(ap, fmt);
+       status.message = talloc_vasprintf(NULL, fmt, ap);
+       va_end(ap);
 
        status.type = type;
-       status.message = message;
        status.progress = -1;
        status.detail = NULL;
 
+       pb_debug("boot status: [%d] %s\n", type, status.message);
+
        fn(arg, &status);
+
+       talloc_free(status.message);
 }
 
 static void boot_hook_update_param(void *ctx, struct boot_task *task,
@@ -139,11 +147,11 @@ static void boot_hook_update_param(void *ctx, struct boot_task *task,
 {
        struct p {
                const char *name;
-               char **p;
+               const char **p;
        } *param, params[] = {
-               { "boot_image",         &task->local_image },
-               { "boot_initrd",        &task->local_initrd },
-               { "boot_dtb",           &task->local_dtb },
+               { "boot_image",         &task->image->local },
+               { "boot_initrd",        &task->initrd->local },
+               { "boot_dtb",           &task->dtb->local },
                { "boot_args",          &task->args },
                { NULL, NULL },
        };
@@ -191,11 +199,11 @@ static void boot_hook_setenv(struct boot_task *task)
        unsetenv("boot_dtb");
        unsetenv("boot_args");
 
-       setenv("boot_image", task->local_image, 1);
-       if (task->local_initrd)
-               setenv("boot_initrd", task->local_initrd, 1);
-       if (task->local_dtb)
-               setenv("boot_dtb", task->local_dtb, 1);
+       setenv("boot_image", task->image->local, 1);
+       if (task->initrd)
+               setenv("boot_initrd", task->initrd->local, 1);
+       if (task->dtb)
+               setenv("boot_dtb", task->dtb->local, 1);
        if (task->args)
                setenv("boot_args", task->args, 1);
 }
@@ -210,8 +218,7 @@ static int hook_cmp(const struct dirent **a, const struct dirent **b)
        return strcmp((*a)->d_name, (*b)->d_name);
 }
 
-static void run_boot_hooks(struct boot_task *task, boot_status_fn status_fn,
-               void *status_arg)
+static void run_boot_hooks(struct boot_task *task)
 {
        struct dirent **hooks;
        int i, n;
@@ -220,7 +227,7 @@ static void run_boot_hooks(struct boot_task *task, boot_status_fn status_fn,
        if (n < 1)
                return;
 
-       update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+       update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
                        "running boot hooks");
 
        boot_hook_setenv(task);
@@ -271,19 +278,117 @@ static void run_boot_hooks(struct boot_task *task, boot_status_fn status_fn,
        free(hooks);
 }
 
+static bool load_pending(struct load_url_result *result)
+{
+       return result && result->status == LOAD_ASYNC;
+}
+
+static int check_load(struct boot_task *task, const char *name,
+               struct load_url_result *result)
+{
+       if (!result)
+               return 0;
+       if (result->status != LOAD_ERROR)
+               return 0;
+
+       update_status(task->status_fn, task->status_arg,
+                       BOOT_STATUS_ERROR,
+                       "Couldn't load %s", name);
+       return -1;
+}
+
+static void cleanup_load(struct load_url_result *result)
+{
+       if (!result)
+               return;
+       if (result->status != LOAD_OK)
+               return;
+       if (!result->cleanup_local)
+               return;
+       unlink(result->local);
+}
+
+static void boot_process(struct load_url_result *result __attribute__((unused)),
+               void *data)
+{
+       struct boot_task *task = data;
+       int rc = -1;
+
+       if (load_pending(task->image) ||
+                       load_pending(task->initrd) ||
+                       load_pending(task->dtb))
+               return;
+
+       if (check_load(task, "kernel image", task->image) ||
+                       check_load(task, "initrd", task->initrd) ||
+                       check_load(task, "dtb", task->dtb))
+               goto no_load;
+
+       run_boot_hooks(task);
+
+       update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
+                       "performing kexec_load");
+
+       rc = kexec_load(task);
+       if (rc) {
+               update_status(task->status_fn, task->status_arg,
+                               BOOT_STATUS_ERROR, "kexec load failed");
+       }
+
+no_load:
+       cleanup_load(task->image);
+       cleanup_load(task->initrd);
+       cleanup_load(task->dtb);
+
+       if (!rc) {
+               update_status(task->status_fn, task->status_arg,
+                               BOOT_STATUS_INFO,
+                               "performing kexec reboot");
+
+               rc = kexec_reboot(task);
+               if (rc) {
+                       update_status(task->status_fn, task->status_arg,
+                                       BOOT_STATUS_ERROR,
+                                       "kexec reboot failed");
+               }
+       }
+
+       talloc_free(task);
+}
+
+static int start_url_load(struct boot_task *task, const char *name,
+               struct pb_url *url, struct load_url_result **result)
+{
+       if (!url)
+               return 0;
+
+       *result = load_url_async(task, url, boot_process, task);
+       if (!*result) {
+               update_status(task->status_fn, task->status_arg,
+                               BOOT_STATUS_ERROR,
+                               "Error loading %s", name);
+               return -1;
+       }
+       return 0;
+}
+
 int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
                int dry_run, boot_status_fn status_fn, void *status_arg)
 {
+       struct pb_url *image = NULL, *initrd = NULL, *dtb = NULL;
        struct boot_task *boot_task;
-       struct pb_url *image, *initrd, *dtb;
-       unsigned int clean_image = 0;
-       unsigned int clean_initrd = 0;
-       unsigned int clean_dtb = 0;
-       int result;
+       const char *boot_desc;
+       int rc;
 
-       image = NULL;
-       initrd = NULL;
-       dtb = NULL;
+       if (opt && opt->option->name)
+               boot_desc = opt->option->name;
+       else if (cmd && cmd->boot_image_file)
+               boot_desc = cmd->boot_image_file;
+       else
+               boot_desc = "(unknown)";
+
+       update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+                       "Booting %s.", boot_desc);
 
        if (cmd && cmd->boot_image_file) {
                image = pb_url_parse(opt, cmd->boot_image_file);
@@ -291,12 +396,11 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
                image = opt->boot_image->url;
        } else {
                pb_log("%s: no image specified\n", __func__);
+               update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+                               "Boot failed: no image specified");
                return -1;
        }
 
-       boot_task = talloc_zero(ctx, struct boot_task);
-       boot_task->dry_run = dry_run;
-
        if (cmd && cmd->initrd_file) {
                initrd = pb_url_parse(opt, cmd->initrd_file);
        } else if (opt && opt->initrd) {
@@ -309,6 +413,11 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
                dtb = opt->dtb->url;
        }
 
+       boot_task = talloc_zero(ctx, struct boot_task);
+       boot_task->dry_run = dry_run;
+       boot_task->status_fn = status_fn;
+       boot_task->status_arg = status_arg;
+
        if (cmd && cmd->boot_args) {
                boot_task->args = talloc_strdup(boot_task, cmd->boot_args);
        } else if (opt && opt->option->boot_args) {
@@ -318,72 +427,14 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
                boot_task->args = NULL;
        }
 
-       result = -1;
-
-       update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-                       "loading kernel");
-       boot_task->local_image = load_url(NULL, image, &clean_image);
-       if (!boot_task->local_image) {
-               update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
-                               "Couldn't load kernel image");
-               goto no_load;
-       }
-
-       if (initrd) {
-               update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-                               "loading initrd");
-               boot_task->local_initrd = load_url(NULL, initrd, &clean_initrd);
-               if (!boot_task->local_initrd) {
-                       update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
-                                       "Couldn't load initrd image");
-                       goto no_load;
-               }
-       }
-
-       if (dtb) {
-               update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-                               "loading device tree");
-               boot_task->local_dtb = load_url(NULL, dtb, &clean_dtb);
-               if (!boot_task->local_dtb) {
-                       update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
-                                       "Couldn't load device tree");
-                       goto no_load;
-               }
-       }
+       /* start async loads for boot resources */
+       rc = start_url_load(boot_task, "kernel image", image, &boot_task->image)
+         || start_url_load(boot_task, "initrd", initrd, &boot_task->initrd)
+         || start_url_load(boot_task, "dtb", dtb, &boot_task->dtb);
 
-       run_boot_hooks(boot_task, status_fn, status_arg);
-
-       update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-                       "performing kexec_load");
+       /* If all URLs are local, we may be done. */
+       if (!rc)
+               boot_process(NULL, boot_task);
 
-       result = kexec_load(boot_task);
-
-       if (result) {
-               update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
-                               "kexec load failed");
-       }
-
-no_load:
-       if (clean_image)
-               unlink(boot_task->local_image);
-       if (clean_initrd)
-               unlink(boot_task->local_initrd);
-       if (clean_dtb)
-               unlink(boot_task->local_dtb);
-
-       if (!result) {
-               update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-                               "performing kexec reboot");
-
-               result = kexec_reboot(boot_task);
-
-               if (result) {
-                       update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
-                                       "kexec reboot failed");
-               }
-       }
-
-       talloc_free(boot_task);
-
-       return result;
+       return rc;
 }