blspec: sort entries according to specification
cover blspec: sort entries according to specification
Boot entries generated from bootloader spec are currently sorted by the order the files are read from the file system.
This is inadequate if we have multiple entries with different kernels and we want to sort the newer kernels higher.
The UAPI.1 Boot Loader Specification defines an algorithm[1] to order the entries that takes care of this, so implement it into barebox.
[1]: https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting
Ahmad Fatoum (5):
boot: aggregate bootentry provider entries one by one
blspec: sort entries according to specification
boot: give struct bootentry a path member
commands: boot: support file path in boot -M for default entry
test: self: add bootloader spec files test
commands/boot.c | 62 +++++++++++++---- common/Kconfig | 1 + common/blspec.c | 66 +++++++++++++++++-- common/boot.c | 42 ++++++++---- include/asm-generic/bug.h | 7 ++ include/boot.h | 3 + include/bselftest.h | 20 ++++++ include/fnmatch.h | 9 +++ test/self/Kconfig | 5 ++ test/self/Makefile | 2 + test/self/blspec.c | 46 +++++++++++++ .../data/test/boot/boot.sh | 3 + .../data/test/loader/entries/boarda.conf | 6 ++ .../data/test/loader/entries/boardb.conf | 6 ++ .../data/test/loader/entries/boardc.conf | 6 ++ .../data/test/loader/entries/boardd.conf | 5 ++ 16 files changed, 260 insertions(+), 29 deletions(-) create mode 100644 test/self/blspec.c create mode 100755 test/self/defaultenv-blspec-test/data/test/boot/boot.sh create mode 100644 test/self/defaultenv-blspec-test/data/test/loader/entries/boarda.conf create mode 100644 test/self/defaultenv-blspec-test/data/test/loader/entries/boardb.conf create mode 100644 test/self/defaultenv-blspec-test/data/test/loader/entries/boardc.conf create mode 100644 test/self/defaultenv-blspec-test/data/test/loader/entries/boardd.conf
Signature · 1 line
2.47.3
PATCH 1/5 boot: aggregate bootentry provider entries one by one
To allow individual bootentry providers to more easily sort their entries, pass each provider an empty list that's spliced onto the tail of the aggregated list at the end.
This way we maintain that boot entries of different providers are sorted by provider priority and boot entries of a single provider can be sorted by each provider without having to worry about foreign boot entries.
--- common/boot.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
common/boot.c +17 -1
@@ -26,6 +26,14 @@ int bootentries_add_entry(struct bootentries *entries, struct bootentry *entry)return 0 ; } +#define BOOTENTRIES (name) \ + struct bootentries name = { .entries = LIST_HEAD_INIT(name.entries) } + +static inline void bootentries_merge (struct bootentries *dst,struct bootentries *src) +{ +list_splice_tail_init (&src->entries, &dst->entries); +} +struct bootentries *bootentries_alloc (void ) {struct bootentries *bootentries;
@@ -452,9 +460,17 @@ int bootentry_create_from_name(struct bootentries *bootentries, name = nfspath;list_for_each_entry (p, &bootentry_providers, list) { - ret = p->generate (bootentries, name); +BOOTENTRIES (provider_bootentries); + + ret = p->generate (&provider_bootentries, name);if (ret >0 ) found += ret; + +/* We want to allow for providers to sort their bootentries as +* they see fit, so they are passed an empty list above with +* only their own entries and then we aggregate here +*/ +bootentries_merge (bootentries, &provider_bootentries); }free (nfspath);
Signature · 1 line
2.47.3
PATCH 2/5 blspec: sort entries according to specification
In reply to Ahmad FatoumBoot entries generated from bootloader spec are currently sorted by the order the files are read from the file system.
This is inadequate if we have multiple entries with different kernels and we want to sort the newer kernels higher.
The UAPI.1 Boot Loader Specification defines an algorithm[1] to order the entries that takes care of this, so implement it into barebox.
[1]: https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting
--- common/Kconfig | 1 + common/blspec.c | 62 ++++++++++++++++++++++++++++++++++++++- common/boot.c | 7 +++++ include/asm-generic/bug.h | 7 +++++ include/boot.h | 2 ++ 5 files changed, 78 insertions(+), 1 deletion(-)
common/Kconfig +1 -0
@@ -715,6 +715,7 @@ config BLSPEC select BOOT select BOOTM select OFTREE + select VERSION_CMP bool prompt "Support bootloader spec" help
common/blspec.c +61 -1
92 lines not on this page · raw message
common/boot.c +7 -0
@@ -34,6 +34,13 @@ static inline void bootentries_merge(struct bootentries *dst, struct bootentrieslist_splice_tail_init (&src->entries, &dst->entries); } +void bootentries_add_entry_sorted (struct bootentries *entries,struct bootentry *entry, +int (*compare)(struct list_head *,struct list_head *)) + +{ +list_add_sort (&entry->list, &entries->entries, compare); +} +struct bootentries *bootentries_alloc (void ) {struct bootentries *bootentries;
include/asm-generic/bug.h +7 -0
@@ -78,4 +78,11 @@BUG_ON (!(expr)); \ } while (0) + +#ifdef DEBUG +#define DEBUG_ASSERT (expr) BUG_ON(!(expr)) +#else +#define DEBUG_ASSERT (expr) ((void)(expr)) +#endif +#endif
include/boot.h +2 -0
@@ -24,6 +24,8 @@ struct bootentry { };int bootentries_add_entry (struct bootentries *entries,struct bootentry *entry); +void bootentries_add_entry_sorted (struct bootentries *entries,struct bootentry *entry, +int (*compare)(struct list_head *,struct list_head *));struct bootentry_provider {const char *name;
Signature · 1 line
2.47.3
Quoted 156 lines · Ahmad Fatoum
Boot entries generated from bootloader spec are currently sorted by the order the files are read from the file system.
This is inadequate if we have multiple entries with different kernels and we want to sort the newer kernels higher.
The UAPI.1 Boot Loader Specification defines an algorithm[1] to order the entries that takes care of this, so implement it into barebox.
[1]: https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting
Signed-off-by Ahmad Fatoum <[email protected]>--- common/Kconfig | 1 + common/blspec.c | 62 ++++++++++++++++++++++++++++++++++++++- common/boot.c | 7 +++++ include/asm-generic/bug.h | 7 +++++ include/boot.h | 2 ++ 5 files changed, 78 insertions(+), 1 deletion(-)common/Kconfig +1
-0@@ -715,6 +715,7 @@ config BLSPEC select BOOT select BOOTM select OFTREE + select VERSION_CMP bool prompt "Support bootloader spec" helpcommon/blspec.c +61
-1@@ -28,6 +28,7 @@ struct blspec_entry {struct cdev *cdev;const char *rootpath;const char *configpath; +char *sortkey; };/* @@ -181,6 +182,7 @@ static void blspec_entry_free(struct bootentry *be)of_delete_node (entry->node);free_const (entry->configpath);free_const (entry->rootpath); +free (entry->sortkey);free (entry); }@@ -268,6 +270,12 @@ static struct blspec_entry *blspec_entry_open(struct bootentries *bootentries, } } +/* This will be read often during comparison, so we cache it */ +if (!strcmp (name,"sort-key" )) { + entry->sortkey =xstrdup (val); +continue ; + } +blspec_entry_var_set (entry, name, val); }@@ -414,6 +422,58 @@ static const char *get_blspec_prefix_path(const char *configname)return get_mounted_path (configname); } +static int blspec_compare (struct list_head *list_a,struct list_head *list_b) +{ + struct bootentry *be_a = container_of(list_a, struct bootentry, list); + struct bootentry *be_b = container_of(list_b, struct bootentry, list); +struct blspec_entry *a, *b; +const char *a_version, *b_version; +int r; + +/* The boot entry providers are called one by one and passed an empty +* list that's aggregated later, so we should only be encountering +* bootloader spec entries here. +*/ +DEBUG_ASSERT (is_blspec_entry (be_a) &&is_blspec_entry (be_b)); + + a = container_of(be_a, struct blspec_entry, entry); + b = container_of(be_b, struct blspec_entry, entry); + + a_version = a->configpath; + b_version = b->configpath; + +if (a->sortkey && b->sortkey) { +const char *a_machine_id, *b_machine_id; + +/* A-Z, increasing alphanumerical order */ + r =strcmp (a->sortkey, b->sortkey); +if (r !=0 ) +return r; + + a_machine_id =blspec_entry_var_get (a,"machine-id" ); + b_machine_id =blspec_entry_var_get (b,"machine-id" ); + +/* A-Z, increasing alphanumerical order) */ + r =strcmp_ptr (a_machine_id, b_machine_id); +if (r !=0 ) +return r; + +/* Will be compared in decreasing version order */ + a_version =blspec_entry_var_get (a,"version" ); + b_version =blspec_entry_var_get (b,"version" ); + }else if (a->sortkey != b->sortkey) { +/* If sort-key is set on one entry, it sorts earlier. */ +return a->sortkey ?-1 :1 ; + } + +/* At the end, if necessary, when sort-key is not set or +* those fields are not set or are all equal, the boot loader +* should sort using the file name of the entry (decreasing +* version sort), with the suffix removed. +*/ +return -strverscmp (a_version, b_version); +} +static int __blspec_scan_file (struct bootentries *bootentries,const char *root,const char *configname) {@@ -459,7 +519,7 @@ static int __blspec_scan_file(struct bootentries *bootentries, const char *root, entry->entry.me.type =MENU_ENTRY_NORMAL ; entry->entry.release = blspec_entry_free; -bootentries_add_entry (bootentries, &entry->entry); +bootentries_add_entry_sorted (bootentries, &entry->entry, blspec_compare);return 1 ; }common/boot.c +7
-0@@ -34,6 +34,13 @@ static inline void bootentries_merge(struct bootentries *dst, struct bootentrieslist_splice_tail_init (&src->entries, &dst->entries); } +void bootentries_add_entry_sorted (struct bootentries *entries,struct bootentry *entry, +int (*compare)(struct list_head *,struct list_head *)) + +{ +list_add_sort (&entry->list, &entries->entries, compare); +} +struct bootentries *bootentries_alloc (void ) {struct bootentries *bootentries;include/asm-generic/bug.h +0
-0
include/asm-generic/bug.h line 86
Quoted 9 lines
include/asm-generic/bug.h +6
-0@@ -78,4 +78,11 @@BUG_ON (!(expr)); \ } while (0) + +#ifdef DEBUG +#define DEBUG_ASSERT (expr) BUG_ON(!(expr)) +#else +#define DEBUG_ASSERT (expr) ((void)(expr)) +#endif
Is this change intentional here?
Sascha
Quoted 20 lines
include/asm-generic/bug.h +1
-0+#endif include/boot.h +2
-0@@ -24,6 +24,8 @@ struct bootentry { };int bootentries_add_entry (struct bootentries *entries,struct bootentry *entry); +void bootentries_add_entry_sorted (struct bootentries *entries,struct bootentry *entry, +int (*compare)(struct list_head *,struct list_head *));struct bootentry_provider {const char *name;Signature · 1 line
2.47.3
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Hello Sascha,
Quoted 15 lines · Sascha Hauer
common/blspec.c static const char *get_blspec_prefix_path(const char *configname) · line 437
Quoted 13 lines · Ahmad Fatoum
common/blspec.c +13
-0+static int blspec_compare (struct list_head *list_a,struct list_head *list_b) +{ + struct bootentry *be_a = container_of(list_a, struct bootentry, list); + struct bootentry *be_b = container_of(list_b, struct bootentry, list); +struct blspec_entry *a, *b; +const char *a_version, *b_version; +int r; + +/* The boot entry providers are called one by one and passed an empty +* list that's aggregated later, so we should only be encountering +* bootloader spec entries here. +*/ +DEBUG_ASSERT (is_blspec_entry (be_a) &&is_blspec_entry (be_b));
[sni[]
Quoted 8 lines
include/asm-generic/bug.h line 86
Quoted 6 lines
include/asm-generic/bug.h +6
-0+ +#ifdef DEBUG +#define DEBUG_ASSERT (expr) BUG_ON(!(expr)) +#else +#define DEBUG_ASSERT (expr) ((void)(expr)) +#endif Is this change intentional here?
Yes, DEBUG_ASSERT is used within this patch.
Cheers,
Ahmad
Quoted 24 lines
Sascha
Quoted 20 lines
(quoted diff) +1
-0+ #endifinclude/boot.h +2
-0@@ -24,6 +24,8 @@ struct bootentry { };int bootentries_add_entry (struct bootentries *entries,struct bootentry *entry); +void bootentries_add_entry_sorted (struct bootentries *entries,struct bootentry *entry, +int (*compare)(struct list_head *,struct list_head *));struct bootentry_provider {const char *name;Signature · 1 line
2.47.3
PATCH 3/5 boot: give struct bootentry a path member
In reply to Ahmad FatoumBoth bootloader spec entries and boot spec maintain a path to the file the struct bootentry was generated from. Add this member to the struct bootentry directly to allow referencing it from the boot command in a follow-up commit.
No functional change intended.
--- common/blspec.c | 12 ++++-------- common/boot.c | 17 +++++++---------- include/boot.h | 1 + 3 files changed, 12 insertions(+), 18 deletions(-)
common/blspec.c +4 -8
@@ -27,7 +27,7 @@ struct blspec_entry {struct device_node *node;struct cdev *cdev;const char *rootpath; -const char *configpath; +/* configpath is entry.path */ char *sortkey; };
@@ -180,7 +180,6 @@ static void blspec_entry_free(struct bootentry *be) struct blspec_entry *entry = container_of(be, struct blspec_entry, entry);of_delete_node (entry->node); -free_const (entry->configpath);free_const (entry->rootpath);free (entry->sortkey);free (entry);
@@ -305,7 +304,7 @@ static int blspec_have_entry(struct bootentries *bootentries, const char *path)if (!is_blspec_entry (be))continue ; e = container_of(be, struct blspec_entry, entry); -if (e->configpath && !strcmp (e->configpath, path)) +if (e->entry.path && !strcmp (e->entry.path, path))return 1 ; }
@@ -426,8 +425,8 @@ static int blspec_compare(struct list_head *list_a, struct list_head *list_b) { struct bootentry *be_a = container_of(list_a, struct bootentry, list); struct bootentry *be_b = container_of(list_b, struct bootentry, list); +const char *a_version = be_a->path, *b_version = be_b->path;struct blspec_entry *a, *b; -const char *a_version, *b_version;int r;/* The boot entry providers are called one by one and passed an empty
@@ -439,9 +438,6 @@ static int blspec_compare(struct list_head *list_a, struct list_head *list_b) a = container_of(be_a, struct blspec_entry, entry); b = container_of(be_b, struct blspec_entry, entry); - a_version = a->configpath; - b_version = b->configpath; -if (a->sortkey && b->sortkey) {const char *a_machine_id, *b_machine_id;
@@ -489,7 +485,7 @@ static int __blspec_scan_file(struct bootentries *bootentries, const char *root, root = root ?:get_blspec_prefix_path (configname); entry->rootpath =xstrdup_const (root); - entry->configpath =xstrdup_const (configname); + entry->entry.path =xstrdup_const (configname); entry->cdev =get_cdev_by_mountpath (root);if (!entry_is_of_compatible (entry)) {
common/boot.c +7 -10
@@ -64,6 +64,7 @@ void bootentries_free(struct bootentries *bootentries)list_del (&be->list);free_const (be->title);free (be->description); +free_const (be->path);free_const (be->me.display); be->release (be); }
@@ -81,7 +82,6 @@ void bootentries_free(struct bootentries *bootentries)struct bootentry_script {struct bootentry entry; -const char *scriptpath; };/*
@@ -96,7 +96,7 @@ static int bootscript_boot(struct bootentry *entry, int verbose, int dryrun)struct bootm_data backup = {}, data = {};if (dryrun ==1 ) { -printf ("Would run %s\n" , bs->scriptpath); +printf ("Would run %s\n" , bs->entry.path);return 0 ; }
@@ -107,9 +107,9 @@ static int bootscript_boot(struct bootentry *entry, int verbose, int dryrun) bootm_nattempts =bootm_command_attempts (); - ret =run_command (bs->scriptpath); + ret =run_command (bs->entry.path);if (ret) { -pr_err ("Running script '%s' failed: %pe\n" , bs->scriptpath,ERR_PTR (ret)); +pr_err ("Running script '%s' failed: %s\n" , bs->entry.path,strerror (-ret)); goto out; }
@@ -222,10 +222,7 @@ static void bootsource_action(struct menu *m, struct menu_entry *me)static void bootscript_entry_release (struct bootentry *entry) { - struct bootentry_script *bs = container_of(entry, struct bootentry_script, entry); - -free_const (bs->scriptpath); -free (bs); +free (entry); }/*
@@ -248,8 +245,8 @@ static int bootscript_create_entry(struct bootentries *bootentries, const char * bs->entry.me.type =MENU_ENTRY_NORMAL ; bs->entry.release = bootscript_entry_release; bs->entry.boot = bootscript_boot; - bs->scriptpath =xstrdup_const (name); - bs->entry.title =xstrdup_const (kbasename (bs->scriptpath)); + bs->entry.path =xstrdup_const (name); + bs->entry.title =xstrdup_const (kbasename (bs->entry.path)); bs->entry.description =basprintf ("script: %s" , name);bootentries_add_entry (bootentries, &bs->entry);
include/boot.h +1 -0
@@ -18,6 +18,7 @@ struct bootentry {struct menu_entry me;const char *title;char *description; +const char *path;int (*boot)(struct bootentry *entry,int verbose,int dryrun);void (*release)(struct bootentry *entry);struct bootm_overrides overrides;
Signature · 1 line
2.47.3
PATCH 4/5 commands: boot: support file path in boot -M for default entry
In reply to Ahmad FatoumThe boot command supports specifying a preselection by index, but this is not so useful when the boot entries come from external media as the order may easily change.
Add thus the ability to preselect an entry by file path as well via the -M option. Unlike -M 1337 which would usually leads to a normal error, a non-existent file path will just be silently ignored and the menu shown anyway without preselection.
--- commands/boot.c | 62 +++++++++++++++++++++++++++++++++++++---------- include/fnmatch.h | 9 +++++++ 2 files changed, 58 insertions(+), 13 deletions(-)
commands/boot.c +49 -13
@@ -7,6 +7,7 @@#include <malloc.h> #include <boot.h> #include <bootm.h> +#include <fnmatch.h> #include <complete.h> #include <linux/stat.h>
@@ -55,12 +56,41 @@ static int boot_add_override(struct bootm_overrides *overrides, char *var)return 0 ; } +static int bootentries_get_default_menu_entry (struct bootentries *entries, +char *id) +{ +struct bootentry *entry; +int ret, idx =1 ; + +if (!id) +return 0 ; + +/* To simplify scripting, an empty string is treated as 1 */ +if (*id =='\0' ) +return 1 ; + + ret =kstrtouint (id,0 , &idx); +if (!ret) +return idx; +if (ret != -EINVAL ) +return ret; + +bootentries_for_each_entry (entries, entry) { +if ((IS_ENABLED (CONFIG_FNMATCH ) && !fnmatch (id, entry->path,0 )) || +streq_ptr (id, entry->path)) +return idx; + idx++; + } + +return 0 ; +} +static int do_boot (int argc,char *argv[]) {char *freep =NULL ;int opt, ret =0 , do_list =0 , do_menu =0 ;int dryrun =0 , verbose =0 , timeout =-1 ; -unsigned default_menu_entry =0 ; +char *default_menu_entry =NULL ;struct bootentries *entries;struct bootentry *entry;struct bootm_overrides overrides = {};
@@ -80,14 +110,7 @@ static int do_boot(int argc, char *argv[]) dryrun++;break ;case 'M' : -/* To simplify scripting, an empty string is treated as 1 */ -if (*optarg =='\0' ) { - default_menu_entry =1 ; - }else { - ret =kstrtouint (optarg,0 , &default_menu_entry); -if (ret) -return ret; - } + default_menu_entry = optarg; fallthrough;case 'm' : do_menu =1 ;
@@ -152,10 +175,17 @@ static int do_boot(int argc, char *argv[]) goto out; } -if (do_list) +if (do_list) {bootsources_list (entries); -else if (do_menu) -bootsources_menu (entries, default_menu_entry, timeout); + }else if (do_menu) { +int idx; + + idx =bootentries_get_default_menu_entry (entries, default_menu_entry); +if (idx <0 ) +return idx; + +bootsources_menu (entries, idx, timeout); + } ret =0 ; out:
@@ -189,6 +219,12 @@ BAREBOX_CMD_HELP_TEXT("- \"storage.removable\": boot from removable media") BAREBOX_CMD_HELP_TEXT("- \"storage.builtin\": boot from non-removable media") BAREBOX_CMD_HELP_TEXT("- \"storage\": boot from any available media")#endif +BAREBOX_CMD_HELP_TEXT("DEFAULT can be:") +BAREBOX_CMD_HELP_TEXT("- the numeric index of the menu entry to choose") +BAREBOX_CMD_HELP_TEXT("- the path to the file backing the entry (e.g. bootspec config file)") +#ifdef CONFIG_FNMATCH +BAREBOX_CMD_HELP_TEXT(" with wildcards allowed") +#endif BAREBOX_CMD_HELP_TEXT("") BAREBOX_CMD_HELP_TEXT("Multiple bootsources may be given which are probed in order until")BAREBOX_CMD_HELP_TEXT ("one succeeds." )
@@ -198,7 +234,7 @@ BAREBOX_CMD_HELP_OPT ("-v","Increase verbosity") BAREBOX_CMD_HELP_OPT ("-d","Dryrun. See what happens but do no actually boot (pass twice to run scripts)") BAREBOX_CMD_HELP_OPT ("-l","List available boot sources") BAREBOX_CMD_HELP_OPT ("-m","Show a menu with boot options") -BAREBOX_CMD_HELP_OPT ("-M INDEX","Show a menu with boot options with entry INDEX preselected") +BAREBOX_CMD_HELP_OPT ("-M DEFAULT","Show a menu with boot options with entry DEFAULT preselected") BAREBOX_CMD_HELP_OPT ("-w SECS","Start watchdog with timeout SECS before booting")#ifdef CONFIG_BOOT_OVERRIDE BAREBOX_CMD_HELP_OPT ("-o VAR[=VAL]" ,"override VAR (bootm.{oftree,initrd}) with VAL" )
include/fnmatch.h +9 -0
@@ -17,8 +17,17 @@/* Value returned by `fnmatch' if STRING does not match PATTERN. */ #define FNM_NOMATCH 1 +#ifdef CONFIG_FNMATCH +/* Match NAME against the filename pattern PATTERN, returning zero if it matches, FNM_NOMATCH if not. */ extern int fnmatch (const char *pattern,const char *name,int flags); +#else +static inline int fnmatch (const char *pattern,const char *name,int flags) +{ +return 0 ; +} +#endif +#endif /* fnmatch.h */
Signature · 1 line
2.47.3
PATCH 5/5 test: self: add bootloader spec files test
In reply to Ahmad FatoumWith spec-conformant sorting added for bootloader specification entries, add a simple self test that verifies that the sort order is as one would expect.
--- include/bselftest.h | 20 ++++++++ test/self/Kconfig | 5 ++ test/self/Makefile | 2 + test/self/blspec.c | 46 +++++++++++++++++++ .../data/test/boot/boot.sh | 3 ++ .../data/test/loader/entries/boarda.conf | 6 +++ .../data/test/loader/entries/boardb.conf | 6 +++ .../data/test/loader/entries/boardc.conf | 6 +++ .../data/test/loader/entries/boardd.conf | 5 ++ 9 files changed, 99 insertions(+) create mode 100644 test/self/blspec.c create mode 100755 test/self/defaultenv-blspec-test/data/test/boot/boot.sh create mode 100644 test/self/defaultenv-blspec-test/data/test/loader/entries/boarda.conf create mode 100644 test/self/defaultenv-blspec-test/data/test/loader/entries/boardb.conf create mode 100644 test/self/defaultenv-blspec-test/data/test/loader/entries/boardc.conf create mode 100644 test/self/defaultenv-blspec-test/data/test/loader/entries/boardd.conf
include/bselftest.h +20 -0
@@ -78,4 +78,24 @@ static inline void selftests_run(void)int selftest_run (struct selftest *test);bool selftest_is_running (struct selftest *test); +#define __assert_cond (cond) ({ total_tests++; cond || (failed_tests++, false); }) + +#define assert_cond (cond) ({ \ + bool __cond = __assert_cond(cond); \ + if (!__cond) \ + pr_warn("%s:%d: condition %s unexpectedly false\n", \ + __func__, __LINE__, #cond); \ + __cond; \ +}) + +#define assert_inteq (a, b) assert_cond(a == b) + +#define assert_streq (a, b) ({ \ + bool __cond = __assert_cond(strcmp(a, b) == 0); \ + if (!__cond) \ + pr_warn("%s:%d: %s and %s unexpectedly unequal\n", \ + __func__, __LINE__, a, b); \ + __cond; \ +}) +#endif
test/self/Kconfig +5 -0
@@ -51,6 +51,7 @@ config SELFTEST_ENABLE_ALL select SELFTEST_TLV select SELFTEST_DM select SELFTEST_TALLOC + select SELFTEST_BLSPEC if BLSPEC && DEFAULT_ENVIRONMENT help Selects all self-tests compatible with current configuration
@@ -127,6 +128,10 @@ config SELFTEST_SETJMP bool "setjmp/longjmp library selftest" depends on ARCH_HAS_SJLJ +config SELFTEST_BLSPEC + bool "bootloader spec selftest" + depends on BLSPEC && DEFAULT_ENVIRONMENT + config SELFTEST_REGULATOR bool "Regulator selftest" depends on REGULATOR_FIXED
test/self/Makefile +2 -0
@@ -25,6 +25,8 @@ obj-$(CONFIG_SELFTEST_TEST_COMMAND) += test_command.o obj-$(CONFIG_SELFTEST_IDR) += idr.o obj-$(CONFIG_SELFTEST_TLV) += tlv.o tlv.dtb.o obj-$(CONFIG_SELFTEST_DM) += dm.o +obj-$(CONFIG_SELFTEST_BLSPEC) += blspec.o +bbenv-$(CONFIG_SELFTEST_BLSPEC) += defaultenv-blspec-test ifdef REGENERATE_KEYTOC
test/self/blspec.c new file +46 -0
46 lines not on this page · raw message
test/self/defaultenv-blspec-test/data/test/boot/boot.sh new file +3 -0
@@ -0,0 +1,3 @@ +#!/bin/sh + +echo boot test
test/self/defaultenv-blspec-test/data/test/loader/entries/boarda.conf new file +6 -0
@@ -0,0 +1,6 @@ +title barebox - Test Image - v6.1-rc2 A +version Dummy v6.1-rc2 +options rootwait +linux /boot/boot.sh +sort-key blspec-test +linux-appendroot true
test/self/defaultenv-blspec-test/data/test/loader/entries/boardb.conf new file +6 -0
@@ -0,0 +1,6 @@ +title barebox - Test Image - v6.19 B +version Dummy v6.19 +options rootwait +linux /boot/boot.sh +sort-key blspec-test +linux-appendroot true
test/self/defaultenv-blspec-test/data/test/loader/entries/boardc.conf new file +6 -0
@@ -0,0 +1,6 @@ +title barebox - Test Image - v6.9 C +version Dummy v6.9 +options rootwait +linux /boot/boot.sh +sort-key blspec-test +linux-appendroot true
test/self/defaultenv-blspec-test/data/test/loader/entries/boardd.conf new file +5 -0
@@ -0,0 +1,5 @@ +title barebox - Test Image - v9999 (no sort-key) D +version v9999 +options rootwait +linux /boot/boot.sh +linux-appendroot true
Signature · 1 line
2.47.3
Sascha Hauer
AppliedQuoted 10 lines · Ahmad Fatoum
Boot entries generated from bootloader spec are currently sorted by the order the files are read from the file system.
This is inadequate if we have multiple entries with different kernels and we want to sort the newer kernels higher.
The UAPI.1 Boot Loader Specification defines an algorithm[1] to order the entries that takes care of this, so implement it into barebox.
[...]
Applied, thanks!
[1/5] boot: aggregate bootentry provider entries one by one
https://git.pengutronix.de/cgit/barebox/commit/?id=6f0f9a44ea2b (link may not be stable)
[2/5] blspec: sort entries according to specification
https://git.pengutronix.de/cgit/barebox/commit/?id=6bf9cd6f5347 (link may not be stable)
[3/5] boot: give struct bootentry a path member
https://git.pengutronix.de/cgit/barebox/commit/?id=2c4d3f594dc4 (link may not be stable)
[4/5] commands: boot: support file path in boot -M for default entry
https://git.pengutronix.de/cgit/barebox/commit/?id=c5ce2a86e1ad (link may not be stable)
[5/5] test: self: add bootloader spec files test
https://git.pengutronix.de/cgit/barebox/commit/?id=989dac4d649e (link may not be stable)
Best regards,
Signature · 1 line
Sascha Hauer <[email protected]>