Changeset 63a045c in mainline for boot/arch/ia64

Timestamp:

2018-10-10T17:41:44Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9286475

Parents:

63c1dd5

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-10 17:11:15)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-10 17:41:44)

Message:

Unify handling of compressed init data and use regular tar + gzip to achieve it

There are two issues this commit solves.

First is that architecture-specific code duplicates most of the init binary
handling in each architecture, each with miniscule and confusing variations.
After this commit, the init binary expansion is almost entirely handled by
unified generic code.

Second is that the way we used to generate the incorporated data is somewhat
convoluted. Previously we have a Python script which generates a zip archive
with individual deflate-compressed files and accompanying header and C files
which contain structures describing the archive contents.
The zip file is then extracted and the individual deflate-compressed files are
included in the binary via assembler code.
Since gas doesn't take particular care to be consistent between architectures,
the assembly portions are also not uniform and the build script needs to know
particulars of the architecture's assembly.

Instead of doing that, after this commit we first gzip each included file, then
we pack the gzipped files into a tar archive, and then we include the archive
into the binary using objcopy.
Linker script provides symbols for the start and end of the archive,
and the payload is in a self-describing format, so there is no need for any
generated code.

Note that we are doing the opposite of the conventional .tar.gz format.
It would be somewhat inconvenient to use .tar.gz since the uncompressed files
need to be aligned to page size, so we'd have to first decompress the entire
payload to determine the final position of the files (and hence the required
amount of memory).

Location:

boot/arch/ia64

Files:

• Makefile.inc (modified) (3 diffs)
• _link.ld.in (modified) (2 diffs)
• include/arch/types.h (modified) (2 diffs)
• src/main.c (modified) (3 diffs)

boot/arch/ia64/Makefile.inc

@@ -48 +48 @@
         arch/$(BARCH)/src/pal_asm.S \
         arch/$(BARCH)/src/putchar.c \
-        $(COMPS).s \
-        $(COMPS)_desc.c \
+        $(COMPS).o \
         genarch/src/efi.c \
         genarch/src/division.c \
@@ -59 +58 @@
         generic/src/str.c \
         generic/src/version.c \
-        generic/src/inflate.c
+        generic/src/inflate.c \
+        generic/src/tar.c \
+        generic/src/gzip.c \
+        generic/src/payload.c
 
 ifeq ($(MACHINE),ski)
@@ -97 +99 @@
         platform/ski
 endif
-
-PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)

boot/arch/ia64/_link.ld.in

@@ -4 +4 @@
 SECTIONS {
         .boot 0x4400000: AT (0x4400000) {
+                loader_start = .;
                 *(BOOTSTRAP);
                 *(.text);
@@ -16 +17 @@
                 *(.bss);                /* uninitialized static variables */
                 *(COMMON);
-                *(.components);
+                loader_end = .;
+                payload_start = .;
+                *(.payload);
+                payload_end = .;
         }
 

boot/arch/ia64/include/arch/types.h

@@ -40 +40 @@
         size_t size;
         char name[BOOTINFO_TASK_NAME_BUFLEN];
-} binit_task_t;
+} task_t;
 
 typedef struct {
         size_t cnt;
-        binit_task_t tasks[TASKMAP_MAX_RECORDS];
-} binit_t;
+        task_t tasks[TASKMAP_MAX_RECORDS];
+} taskmap_t;
 
 typedef struct {
@@ -54 +54 @@
 
 typedef struct {
-        binit_t taskmap;
+        taskmap_t taskmap;
 
         memmap_item_t memmap[MEMMAP_ITEMS];

boot/arch/ia64/src/main.c

@@ -43 +43 @@
 #include <str.h>
 #include <errno.h>
-#include <inflate.h>
-#include "../../components.h"
+#include <payload.h>
 
 #define DEFAULT_MEMORY_BASE             0x4000000ULL
@@ -150 +149 @@
         version_print();
 
+        printf("Boot loader: %p -> %p\n", loader_start, loader_end);
         printf(" %p|%p: boot info structure\n", &bootinfo, &bootinfo);
         printf(" %p|%p: kernel entry point\n",
@@ -156 +156 @@
             (void *) LOADER_ADDRESS, (void *) LOADER_ADDRESS);
 
-        size_t i;
-        for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].addr,
-                    components[i].addr, components[i].name,
-                    components[i].inflated, components[i].size);
-
-        void *dest[COMPONENTS];
-        size_t top = KERNEL_ADDRESS;
-        size_t cnt = 0;
-        bootinfo.taskmap.cnt = 0;
-        for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
-                top = ALIGN_UP(top, PAGE_SIZE);
-
-                if (i > 0) {
-                        bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr =
-                            (void *) top;
-                        bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size =
-                            components[i].inflated;
-
-                        str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name,
-                            BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-
-                        bootinfo.taskmap.cnt++;
-                }
-
-                dest[i] = (void *) top;
-                top += components[i].inflated;
-                cnt++;
-        }
-
-        printf("\nInflating components ... ");
-
-        /*
-         * We will use the next available address for a copy of each component to
-         * make sure that inflate() works with disjunctive memory regions.
-         */
-        top = ALIGN_UP(top, PAGE_SIZE);
-
-        for (i = cnt; i > 0; i--) {
-                printf("%s ", components[i - 1].name);
-
-                /*
-                 * Copy the component to a location which is guaranteed not to
-                 * overlap with the destination for inflate().
-                 */
-                memmove((void *) top, components[i - 1].addr, components[i - 1].size);
-
-                int err = inflate((void *) top, components[i - 1].size,
-                    dest[i - 1], components[i - 1].inflated);
-
-                if (err != EOK) {
-                        printf("\n%s: Inflating error %d, halting.\n",
-                            components[i - 1].name, err);
-                        halt();
-                }
-        }
-
-        printf(".\n");
-
         read_efi_memmap();
         read_sal_configuration();
         read_pal_configuration();
 
+        uint8_t *kernel_start = (uint8_t *) KERNEL_ADDRESS;
+        uint8_t *ram_end = NULL;
+
+        /* Find the end of the memory area occupied by the kernel. */
+        for (unsigned i = 0; i < bootinfo.memmap_items; i++) {
+                memmap_item_t m = bootinfo.memmap[i];
+                if (m.type == MEMMAP_FREE_MEM &&
+                    m.base <= (uintptr_t) kernel_start &&
+                    m.base + m.size > (uintptr_t) kernel_start) {
+                        ram_end = (uint8_t *) (m.base + m.size);
+                }
+        }
+
+        if (ram_end == NULL) {
+                printf("Memory map doesn't contain usable area at kernel's address.\n");
+                halt();
+        }
+
+        // FIXME: Correct kernel's logical address.
+        extract_payload(&bootinfo.taskmap, kernel_start, ram_end,
+            (uintptr_t) kernel_start, NULL);
+
         printf("Booting the kernel ...\n");
         jump_to_kernel(&bootinfo);