test: Add a simple test for bloblist

Add a unit test for the bloblist functionality and enable bloblist for
sandbox.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index 9fdd2f7e66aea3f21593e4ddcc7985b7c7aa70b3..947070fdd35cc59163ca144da8514f6f6cb98bcd 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -91,6 +91,7 @@ config SANDBOX
        select SPI
        select SUPPORT_OF_CONTROL
        imply BITREVERSE
+       select BLOBLIST
        imply CMD_DM
        imply CMD_GETTIME
        imply CMD_HASH

diff --git a/include/test/suites.h b/include/test/suites.h
index abb3a4b8169abf427c21b90369810ecf983cca44..77d863b4a6a5de32ff2517ab1f3bab56a12f492d 100644 (file)
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -23,6 +23,7 @@ struct unit_test;
 int cmd_ut_category(const char *name, struct unit_test *tests, int n_ents,
                    int argc, char * const argv[]);
 
+int do_ut_bloblist(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_compression(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 int do_ut_env(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);

diff --git a/test/Makefile b/test/Makefile
index 1e434730b681d215a927bf43d2c542a2765572fb..2fe41f489c3b7814710b26b303c12231769981a1 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,6 +2,7 @@
 #
 # (C) Copyright 2012 The Chromium Authors
 
+obj-$(CONFIG_SANDBOX) += bloblist.o
 obj-$(CONFIG_UNIT_TEST) += cmd_ut.o
 obj-$(CONFIG_UNIT_TEST) += ut.o
 obj-$(CONFIG_SANDBOX) += command_ut.o

diff --git a/test/bloblist.c b/test/bloblist.c
new file mode 100644 (file)
index 0000000..89bdb01
--- /dev/null
+++ b/test/bloblist.c
@@ -0,0 +1,187 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2018, Google Inc. All rights reserved.
+ */
+
+#include <common.h>
+#include <bloblist.h>
+#include <log.h>
+#include <mapmem.h>
+#include <test/suites.h>
+#include <test/test.h>
+#include <test/ut.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* Declare a new compression test */
+#define BLOBLIST_TEST(_name, _flags) \
+               UNIT_TEST(_name, _flags, bloblist_test)
+
+enum {
+       TEST_TAG                = 1,
+       TEST_TAG2               = 2,
+       TEST_TAG_MISSING        = 3,
+
+       TEST_SIZE               = 10,
+       TEST_SIZE2              = 20,
+
+       TEST_ADDR               = CONFIG_BLOBLIST_ADDR,
+       TEST_BLOBLIST_SIZE      = 0x100,
+};
+
+static struct bloblist_hdr *clear_bloblist(void)
+{
+       struct bloblist_hdr *hdr;
+
+       /* Clear out any existing bloblist so we have a clean slate */
+       hdr = map_sysmem(CONFIG_BLOBLIST_ADDR, TEST_BLOBLIST_SIZE);
+       memset(hdr, '\0', TEST_BLOBLIST_SIZE);
+
+       return hdr;
+}
+
+static int bloblist_test_init(struct unit_test_state *uts)
+{
+       struct bloblist_hdr *hdr;
+
+       hdr = clear_bloblist();
+       ut_asserteq(-ENOENT, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
+       hdr->version++;
+       ut_asserteq(-EPROTONOSUPPORT, bloblist_check(TEST_ADDR,
+                                                    TEST_BLOBLIST_SIZE));
+
+       ut_asserteq(-ENOSPC, bloblist_new(TEST_ADDR, 0x10, 0));
+       ut_asserteq(-EFAULT, bloblist_new(1, TEST_BLOBLIST_SIZE, 0));
+       ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
+
+       ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       ut_assertok(bloblist_finish());
+       ut_assertok(bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       hdr->flags++;
+       ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+
+       return 1;
+}
+BLOBLIST_TEST(bloblist_test_init, 0);
+
+static int bloblist_test_blob(struct unit_test_state *uts)
+{
+       struct bloblist_hdr *hdr;
+       struct bloblist_rec *rec, *rec2;
+       char *data;
+
+       /* At the start there should be no records */
+       hdr = clear_bloblist();
+       ut_assertnull(bloblist_find(TEST_TAG, TEST_BLOBLIST_SIZE));
+       ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
+
+       /* Add a record and check that we can find it */
+       data = bloblist_add(TEST_TAG, TEST_SIZE);
+       rec = (void *)(hdr + 1);
+       ut_asserteq_ptr(rec + 1, data);
+       data = bloblist_find(TEST_TAG, TEST_SIZE);
+       ut_asserteq_ptr(rec + 1, data);
+
+       /* Check the 'ensure' method */
+       ut_asserteq_ptr(data, bloblist_ensure(TEST_TAG, TEST_SIZE));
+       ut_assertnull(bloblist_ensure(TEST_TAG, TEST_SIZE2));
+       rec2 = (struct bloblist_rec *)(data + ALIGN(TEST_SIZE, BLOBLIST_ALIGN));
+
+       /* Check for a non-existent record */
+       ut_asserteq_ptr(data, bloblist_ensure(TEST_TAG, TEST_SIZE));
+       ut_asserteq_ptr(rec2 + 1, bloblist_ensure(TEST_TAG2, TEST_SIZE2));
+       ut_assertnull(bloblist_find(TEST_TAG_MISSING, 0));
+
+       return 0;
+}
+BLOBLIST_TEST(bloblist_test_blob, 0);
+
+static int bloblist_test_bad_blob(struct unit_test_state *uts)
+{
+       struct bloblist_hdr *hdr;
+       void *data;
+
+       hdr = clear_bloblist();
+       ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
+       data = hdr + 1;
+       data += sizeof(struct bloblist_rec);
+       ut_asserteq_ptr(data, bloblist_ensure(TEST_TAG, TEST_SIZE));
+       ut_asserteq_ptr(data, bloblist_ensure(TEST_TAG, TEST_SIZE));
+
+       return 0;
+}
+BLOBLIST_TEST(bloblist_test_bad_blob, 0);
+
+static int bloblist_test_checksum(struct unit_test_state *uts)
+{
+       struct bloblist_hdr *hdr;
+       char *data, *data2;
+
+       hdr = clear_bloblist();
+       ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
+       ut_assertok(bloblist_finish());
+       ut_assertok(bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+
+       /*
+        * Now change things amd make sure that the checksum notices. We cannot
+        * change the size or alloced fields, since that will crash the code.
+        * It has to rely on these being correct.
+        */
+       hdr->flags--;
+       ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       hdr->flags++;
+
+       hdr->size--;
+       ut_asserteq(-EFBIG, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       hdr->size++;
+
+       hdr->spare++;
+       ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       hdr->spare--;
+
+       hdr->chksum++;
+       ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       hdr->chksum--;
+
+       /* Make sure the checksum changes when we add blobs */
+       data = bloblist_add(TEST_TAG, TEST_SIZE);
+       ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+
+       data2 = bloblist_add(TEST_TAG2, TEST_SIZE2);
+       ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       ut_assertok(bloblist_finish());
+
+       /* It should also change if we change the data */
+       ut_assertok(bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       *data += 1;
+       ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       *data -= 1;
+
+       ut_assertok(bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       *data2 += 1;
+       ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       *data2 -= 1;
+
+       /*
+        * Changing data outside the range of valid data should not affect
+        * the checksum.
+        */
+       ut_assertok(bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+       data[TEST_SIZE]++;
+       data2[TEST_SIZE2]++;
+       ut_assertok(bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
+
+       return 0;
+}
+
+BLOBLIST_TEST(bloblist_test_checksum, 0);
+
+int do_ut_bloblist(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+{
+       struct unit_test *tests = ll_entry_start(struct unit_test,
+                                                bloblist_test);
+       const int n_ents = ll_entry_count(struct unit_test, bloblist_test);
+
+       return cmd_ut_category("bloblist", tests, n_ents, argc, argv);
+}

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index b7e01a4847ebc825383c721aae8dd58bbd57e4f5..56924a52726128ba43fe7f8295fc1938ad792e1a 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -55,6 +55,8 @@ static cmd_tbl_t cmd_ut_sub[] = {
 #ifdef CONFIG_SANDBOX
        U_BOOT_CMD_MKENT(compression, CONFIG_SYS_MAXARGS, 1, do_ut_compression,
                         "", ""),
+       U_BOOT_CMD_MKENT(bloblist, CONFIG_SYS_MAXARGS, 1, do_ut_bloblist,
+                        "", ""),
 #endif
 };
 
@@ -97,6 +99,7 @@ static int do_ut(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 static char ut_help_text[] =
        "all - execute all enabled tests\n"
 #ifdef CONFIG_SANDBOX
+       "ut bloblist - Test bloblist implementation\n"
        "ut compression - Test compressors and bootm decompression\n"
 #endif
 #ifdef CONFIG_UT_DM