aboutsummaryrefslogtreecommitdiff
path: root/util/cbmem
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2012-12-18 16:23:28 -0800
committerRonald G. Minnich <rminnich@gmail.com>2013-01-12 19:09:55 +0100
commitd37ab454d4ea702df276a66d4e0ea9f73d4f6fe0 (patch)
tree99b901a5ef3184f11871c4b9b66e43aad47ffaad /util/cbmem
parent6e21f43008bcf74e64755ca896149943b1cc4229 (diff)
Implement GCC code coverage analysis
In order to provide some insight on what code is executed during coreboot's run time and how well our test scenarios work, this adds code coverage support to coreboot's ram stage. This should be easily adaptable for payloads, and maybe even romstage. See http://gcc.gnu.org/onlinedocs/gcc/Gcov.html for more information. To instrument coreboot, select CONFIG_COVERAGE ("Code coverage support") in Kconfig, and recompile coreboot. coreboot will then store its code coverage information into CBMEM, if possible. Then, run "cbmem -CV" as root on the target system running the instrumented coreboot binary. This will create a whole bunch of .gcda files that contain coverage information. Tar them up, copy them to your build system machine, and untar them. Then you can use your favorite coverage utility (gcov, lcov, ...) to visualize code coverage. For a sneak peak of what will expect you, please take a look at http://www.coreboot.org/~stepan/coreboot-coverage/ Change-Id: Ib287d8309878a1f5c4be770c38b1bc0bb3aa6ec7 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/2052 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix@chromium.org> Reviewed-by: Martin Roth <martin@se-eng.com> Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'util/cbmem')
-rw-r--r--util/cbmem/cbmem.c136
1 files changed, 129 insertions, 7 deletions
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index a777a8f302..bc6bd6b9c8 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -27,6 +27,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
+#include <libgen.h>
+#include <assert.h>
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
#define MAP_BYTES (1024*1024)
@@ -82,7 +84,7 @@ static void *map_memory(u64 physical)
/* Mapped memory must be aligned to page size */
p = physical & ~(page - 1);
- debug("Mapping 1MB of physical memory at %zx.\n", p);
+ debug("Mapping 1MB of physical memory at 0x%zx.\n", p);
v = mmap(NULL, MAP_BYTES, PROT_READ, MAP_SHARED, fd, p);
@@ -103,8 +105,13 @@ static void *map_memory(u64 physical)
static void unmap_memory(void)
{
+ if (mapped_virtual == NULL) {
+ fprintf(stderr, "Error unmapping memory\n");
+ return;
+ }
debug("Unmapping 1MB of virtual memory at %p.\n", mapped_virtual);
munmap(mapped_virtual, MAP_BYTES);
+ mapped_virtual = NULL;
}
/*
@@ -347,7 +354,7 @@ struct cbmem_entry {
uint64_t size;
};
-void dump_cbmem_toc(void)
+static void dump_cbmem_toc(void)
{
int i;
uint64_t start;
@@ -374,7 +381,7 @@ void dump_cbmem_toc(void)
case CBMEM_ID_GDT: printf("GDT "); break;
case CBMEM_ID_ACPI: printf("ACPI "); break;
case CBMEM_ID_ACPI_GNVS: printf("ACPI GNVS "); break;
- case CBMEM_ID_CBTABLE: printf("COREBOOTE "); break;
+ case CBMEM_ID_CBTABLE: printf("COREBOOT "); break;
case CBMEM_ID_PIRQ: printf("IRQ TABLE "); break;
case CBMEM_ID_MPTABLE: printf("SMP TABLE "); break;
case CBMEM_ID_RESUME: printf("ACPI RESUME "); break;
@@ -384,6 +391,7 @@ void dump_cbmem_toc(void)
case CBMEM_ID_MRCDATA: printf("MRC DATA "); break;
case CBMEM_ID_CONSOLE: printf("CONSOLE "); break;
case CBMEM_ID_ELOG: printf("ELOG "); break;
+ case CBMEM_ID_COVERAGE: printf("COVERAGE "); break;
default: printf("%08x ",
entries[i].id); break;
}
@@ -393,7 +401,111 @@ void dump_cbmem_toc(void)
unmap_memory();
}
-void print_version(void)
+#define COVERAGE_MAGIC 0x584d4153
+struct file {
+ uint32_t magic;
+ uint32_t next;
+ uint32_t filename;
+ uint32_t data;
+ int offset;
+ int len;
+};
+
+static int mkpath(char *path, mode_t mode)
+{
+ assert (path && *path);
+ char *p;
+ for (p = strchr(path+1, '/'); p; p = strchr(p + 1, '/')) {
+ *p = '\0';
+ if (mkdir(path, mode) == -1) {
+ if (errno != EEXIST) {
+ *p = '/';
+ return -1;
+ }
+ }
+ *p = '/';
+ }
+ return 0;
+}
+
+static void dump_coverage(void)
+{
+ int i, found = 0;
+ uint64_t start;
+ struct cbmem_entry *entries;
+ void *coverage;
+ unsigned long phys_offset;
+#define phys_to_virt(x) ((void *)(unsigned long)(x) + phys_offset)
+
+ if (cbmem.type != LB_MEM_TABLE) {
+ fprintf(stderr, "No coreboot table area found!\n");
+ return;
+ }
+
+ start = unpack_lb64(cbmem.start);
+
+ entries = (struct cbmem_entry *)map_memory(start);
+
+ for (i=0; i<MAX_CBMEM_ENTRIES; i++) {
+ if (entries[i].magic != CBMEM_MAGIC)
+ break;
+ if (entries[i].id == CBMEM_ID_COVERAGE) {
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found) {
+ unmap_memory();
+ fprintf(stderr, "No coverage information found in"
+ " CBMEM area.\n");
+ return;
+ }
+
+ start = entries[i].base;
+ unmap_memory();
+ /* Map coverage area */
+ coverage = map_memory(start);
+ phys_offset = (unsigned long)coverage - (unsigned long)start;
+
+ printf("Dumping coverage data...\n");
+
+ struct file *file = (struct file *)coverage;
+ while (file && file->magic == COVERAGE_MAGIC) {
+ FILE *f;
+ char *filename;
+
+ debug(" -> %s\n", (char *)phys_to_virt(file->filename));
+ filename = strdup((char *)phys_to_virt(file->filename));
+ if (mkpath(filename, 0755) == -1) {
+ perror("Directory for coverage data could "
+ "not be created");
+ exit(1);
+ }
+ f = fopen(filename, "wb");
+ if (!f) {
+ printf("Could not open %s: %s\n",
+ filename, strerror(errno));
+ exit(1);
+ }
+ if (fwrite((void *)phys_to_virt(file->data),
+ file->len, 1, f) != 1) {
+ printf("Could not write to %s: %s\n",
+ filename, strerror(errno));
+ exit(1);
+ }
+ fclose(f);
+ free(filename);
+
+ if (file->next)
+ file = (struct file *)phys_to_virt(file->next);
+ else
+ file = NULL;
+ }
+ unmap_memory();
+}
+
+static void print_version(void)
{
printf("cbmem v%s -- ", CBMEM_VERSION);
printf("Copyright (C) 2012 The ChromiumOS Authors. All rights reserved.\n\n");
@@ -409,11 +521,12 @@ void print_version(void)
"along with this program. If not, see <http://www.gnu.org/licenses/>.\n\n");
}
-void print_usage(const char *name)
+static void print_usage(const char *name)
{
- printf("usage: %s [-vh?]\n", name);
+ printf("usage: %s [-cCltVvh?]\n", name);
printf("\n"
" -c | --console: print cbmem console\n"
+ " -C | --coverage: dump coverage information\n"
" -l | --list: print cbmem table of contents\n"
" -t | --timestamps: print timestamp information\n"
" -V | --verbose: verbose (debugging) output\n"
@@ -430,12 +543,14 @@ int main(int argc, char** argv)
int print_defaults = 1;
int print_console = 0;
+ int print_coverage = 0;
int print_list = 0;
int print_timestamps = 0;
int opt, option_index = 0;
static struct option long_options[] = {
{"console", 0, 0, 'c'},
+ {"coverage", 0, 0, 'C'},
{"list", 0, 0, 'l'},
{"timestamps", 0, 0, 't'},
{"verbose", 0, 0, 'V'},
@@ -443,13 +558,17 @@ int main(int argc, char** argv)
{"help", 0, 0, 'h'},
{0, 0, 0, 0}
};
- while ((opt = getopt_long(argc, argv, "cltVvh?",
+ while ((opt = getopt_long(argc, argv, "cCltVvh?",
long_options, &option_index)) != EOF) {
switch (opt) {
case 'c':
print_console = 1;
print_defaults = 0;
break;
+ case 'C':
+ print_coverage = 1;
+ print_defaults = 0;
+ break;
case 'l':
print_list = 1;
print_defaults = 0;
@@ -490,6 +609,9 @@ int main(int argc, char** argv)
if (print_console)
dump_console();
+ if (print_coverage)
+ dump_coverage();
+
if (print_list)
dump_cbmem_toc();