X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=ce9c1e099f071d51245b8610e90db514fcb7a29b;hp=ca088dc7673cc58293b0d93062153bd684031e1e;hb=1d69ceee0b8fac1f4451a75b6e4b14ee2d5d91dc;hpb=a7c41a2339e0ed4bfd0954c2238eca8bc866a66c diff --git a/discover/boot.c b/discover/boot.c index ca088dc..ce9c1e0 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -1,5 +1,7 @@ -#define _GNU_SOURCE +#if defined(HAVE_CONFIG_H) +#include "config.h" +#endif #include #include @@ -15,6 +17,7 @@ #include #include #include +#include #include "device-handler.h" #include "boot.h" @@ -31,10 +34,14 @@ struct boot_task { struct load_url_result *image; struct load_url_result *initrd; struct load_url_result *dtb; + const char *local_image; + const char *local_initrd; + const char *local_dtb; const char *args; boot_status_fn status_fn; void *status_arg; bool dry_run; + bool cancelled; }; /** @@ -53,16 +60,16 @@ static int kexec_load(struct boot_task *boot_task) *p++ = pb_system_apps.kexec; /* 1 */ *p++ = "-l"; /* 2 */ - if (boot_task->initrd) { + if (boot_task->local_initrd) { s_initrd = talloc_asprintf(boot_task, "--initrd=%s", - boot_task->initrd->local); + boot_task->local_initrd); assert(s_initrd); *p++ = s_initrd; /* 3 */ } - if (boot_task->dtb) { + if (boot_task->local_dtb) { s_dtb = talloc_asprintf(boot_task, "--dtb=%s", - boot_task->dtb->local); + boot_task->local_dtb); assert(s_dtb); *p++ = s_dtb; /* 4 */ } @@ -74,7 +81,7 @@ static int kexec_load(struct boot_task *boot_task) *p++ = s_args; /* 5 */ } - *p++ = boot_task->image->local; /* 6 */ + *p++ = boot_task->local_image; /* 6 */ *p++ = NULL; /* 7 */ result = process_run_simple_argv(boot_task, argv); @@ -135,6 +142,8 @@ static void __attribute__((format(__printf__, 4, 5))) update_status( status.progress = -1; status.detail = NULL; + pb_debug("boot status: [%d] %s\n", type, status.message); + fn(arg, &status); talloc_free(status.message); @@ -147,9 +156,9 @@ static void boot_hook_update_param(void *ctx, struct boot_task *task, const char *name; const char **p; } *param, params[] = { - { "boot_image", &task->image->local }, - { "boot_initrd", &task->initrd->local }, - { "boot_dtb", &task->dtb->local }, + { "boot_image", &task->local_image }, + { "boot_initrd", &task->local_initrd }, + { "boot_dtb", &task->local_dtb }, { "boot_args", &task->args }, { NULL, NULL }, }; @@ -197,11 +206,11 @@ static void boot_hook_setenv(struct boot_task *task) unsetenv("boot_dtb"); unsetenv("boot_args"); - 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); + 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); if (task->args) setenv("boot_args", task->args, 1); } @@ -262,11 +271,9 @@ static void run_boot_hooks(struct boot_task *task) /* if the hook returned with BOOT_HOOK_EXIT_UPDATE, * then we process stdout to look for updated params */ - if (rc == BOOT_HOOK_EXIT_UPDATE) { - boot_hook_update(task, hooks[i]->d_name, - process->stdout_buf); - boot_hook_setenv(task); - } + boot_hook_update(task, hooks[i]->d_name, + process->stdout_buf); + boot_hook_setenv(task); } process_release(process); @@ -306,12 +313,55 @@ static void cleanup_load(struct load_url_result *result) unlink(result->local); } -static void boot_process(struct load_url_result *result __attribute__((unused)), - void *data) +static void cleanup_cancellations(struct boot_task *task, + struct load_url_result *cur_result) +{ + struct load_url_result *result, **results[] = { + &task->image, &task->initrd, &task->dtb, + }; + bool pending = false; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(results); i++) { + result = *results[i]; + + if (!result) + continue; + + /* We need to cleanup and free any completed loads */ + if (result == cur_result || result->status == LOAD_OK + || result->status == LOAD_ERROR) { + cleanup_load(result); + talloc_free(result); + *results[i] = NULL; + + /* ... and cancel any pending loads, which we'll free in + * the completion callback */ + } else if (result->status == LOAD_ASYNC) { + load_url_async_cancel(result); + pending = true; + + /* if we're waiting for a cancellation, we still need to + * wait for the completion before freeing the boot task */ + } else if (result->status == LOAD_CANCELLED) { + pending = true; + } + } + + if (!pending) + talloc_free(task); +} + +static void boot_process(struct load_url_result *result, void *data) { struct boot_task *task = data; int rc = -1; + if (task->cancelled) { + cleanup_cancellations(task, result); + return; + } + if (load_pending(task->image) || load_pending(task->initrd) || load_pending(task->dtb)) @@ -322,6 +372,12 @@ static void boot_process(struct load_url_result *result __attribute__((unused)), check_load(task, "dtb", task->dtb)) goto no_load; + /* we make a copy of the local paths, as the boot hooks might update + * and/or create these */ + task->local_image = task->image ? task->image->local : NULL; + task->local_initrd = task->initrd ? task->initrd->local : NULL; + task->local_dtb = task->dtb ? task->dtb->local : NULL; + run_boot_hooks(task); update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO, @@ -350,8 +406,6 @@ no_load: "kexec reboot failed"); } } - - talloc_free(task); } static int start_url_load(struct boot_task *task, const char *name, @@ -370,8 +424,9 @@ static int start_url_load(struct boot_task *task, const char *name, 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 boot_task *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; @@ -396,7 +451,7 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd, pb_log("%s: no image specified\n", __func__); update_status(status_fn, status_arg, BOOT_STATUS_INFO, "Boot failed: no image specified"); - return -1; + return NULL; } if (cmd && cmd->initrd_file) { @@ -431,8 +486,22 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd, || start_url_load(boot_task, "dtb", dtb, &boot_task->dtb); /* If all URLs are local, we may be done. */ - if (!rc) - boot_process(NULL, boot_task); + if (rc) { + talloc_free(boot_task); + return NULL; + } + + boot_process(NULL, boot_task); + + return boot_task; +} + +void boot_cancel(struct boot_task *task) +{ + task->cancelled = true; + + update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO, + "Boot cancelled"); - return rc; + cleanup_cancellations(task, NULL); }