aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMiquel Sabaté Solà <mikisabate@gmail.com>2024-11-21 13:09:21 +0100
committerMiquel Sabaté Solà <mikisabate@gmail.com>2024-11-21 13:09:21 +0100
commit40ffc517e20c381ce8fdb3a881726a26a52e35db (patch)
treeb969f6e1bc4c400e8c2c8b1d5a18ed75d3f2fd95 /kernel
parentd394978a73fce080128dc414e1771d8d89e1e1e0 (diff)
downloadfbos-40ffc517e20c.tar.gz
fbos-40ffc517e20c.zip
Initial parsing of the provided initrd file
We expect a CPIO archive with the 'newc' format for the initrd. Parse this archive from the given initrd address and fetch the address for each ELF executable while also pairing which task correspond to which ELF. This commit leaves to do the actual parsing of the ELF file for each task, while also leaving some string utilities to be refined. Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/initrd.c135
-rw-r--r--kernel/main.c3
-rw-r--r--kernel/string.S28
3 files changed, 164 insertions, 2 deletions
diff --git a/kernel/initrd.c b/kernel/initrd.c
new file mode 100644
index 0000000..c05e77d
--- /dev/null
+++ b/kernel/initrd.c
@@ -0,0 +1,135 @@
+#include <fbos/init.h>
+#include <fbos/sched.h>
+#include <fbos/printk.h>
+#include <fbos/string.h>
+
+#define BUFFER_SIZE 16
+
+#define CPIO_HEADER_FILESIZE 54
+#define CPIO_HEADER_NAMESIZE 94
+#define CPIO_HEADER_SIZE 110
+
+// TODO: move to assembly
+__kernel void *memcpy(void *dest, const void *src, size_t count)
+{
+ char *destc = dest;
+ const char *srcc = src;
+
+ for (uint64_t i = 0; i < count; i++) {
+ *destc++ = *srcc++;
+ }
+ return dest;
+}
+
+// TODO: this is required by GCC which must be doing some optimization
+// underneath. For now let's keep it simple (and wrong) by just calling memcpy.
+__kernel void *memmove(void *dest, const void *src, size_t count)
+{
+ return memcpy(dest, src, count);
+}
+
+__kernel uint64_t strtoul16(const char *str, size_t count)
+{
+ char c;
+ uint64_t ret = 0;
+ uint64_t aux = 0;
+
+ for (uint64_t i = 1; count > 0; i *= 16, count--) {
+ c = str[count - 1];
+ if (c >= 'A' && c <= 'F') {
+ aux = 10 + (uint64_t)(c - 'A');
+ } else if (c >= 'a' && c <= 'f') {
+ aux = 10 + (uint64_t)(c - 'a');
+ } else if (c < '0' || c > '9') {
+ die("Bad number\n");
+ } else {
+ aux = (uint64_t)c - '0';
+ }
+
+ ret += aux * i;
+ }
+ return ret;
+}
+
+__kernel int get_task_id_from_name(const char *const name)
+{
+ if (strcmp(name, "usr/bin/foo") == 0) {
+ return TASK_FOO;
+ } else if (strcmp(name, "usr/bin/bar") == 0) {
+ return TASK_BAR;
+ } else if (strcmp(name, "usr/bin/foobar") == 0) {
+ return TASK_FOOBAR;
+ }
+ return TASK_UNKNOWN;
+}
+
+__kernel void extract_elf(int task_id, const char *const addr, size_t size)
+{
+ __unused(task_id);
+ __unused(addr);
+ __unused(size);
+
+ // TODO
+}
+
+__kernel void extract_initrd(const char *const initrd_addr, uint64_t size)
+{
+ char buffer[BUFFER_SIZE];
+ uint64_t name_size, file_size, padding, base = 0;
+ int task_id;
+
+ // The `base` is the index from `initrd_addr` which points to the first byte
+ // of the header of the currently evaluated file inside of the CPIO archive.
+ while (base < size) {
+ // Only the "newc" format is supported, without checksums nor fancy
+ // stuff.
+ if (memcmp(&initrd_addr[base], "070701", 6) != 0) {
+ if (memcmp(&initrd_addr[base], "070702", 6) == 0 ||
+ memcmp(&initrd_addr[base], "070707", 6) == 0) {
+ die("Incorrect cpio format: stick to 'newc'");
+ } else {
+ die("No cpio magic number");
+ }
+ }
+
+ // We identify the task being extracted by looking at the file's path,
+ // so let's first get the size of it.
+ memcpy(buffer, &initrd_addr[base + CPIO_HEADER_NAMESIZE], 8);
+ buffer[8] = '\0';
+ name_size = strtoul16(buffer, 8);
+ if (name_size >= BUFFER_SIZE) {
+ die("Path too large for initrd executable");
+ }
+
+ // Right after the header (hence current header + its size) there is the
+ // actual file's path, which is exactly `name_size` long. Fetch it now
+ // to identify the task at hand.
+ memcpy(buffer, &initrd_addr[base + CPIO_HEADER_SIZE], name_size);
+ buffer[name_size] = '\0';
+ task_id = get_task_id_from_name(buffer);
+
+ // Note that this is not necessarily a bad CPIO archive, it might just
+ // be the end "TRAILER!!!" delimiter. Either way, just quit at this
+ // point.
+ if (task_id == TASK_UNKNOWN) {
+ break;
+ }
+
+ // Fetch the size of the executable, which is needed for `extract_elf`,
+ // as well as for advancing the `base` to the next file.
+ memcpy(buffer, &initrd_addr[base + CPIO_HEADER_FILESIZE], 8);
+ buffer[8] = '\0';
+ file_size = strtoul16(buffer, 8);
+
+ // Files are aligned in 4-byte boundaries after the header. That's why
+ // there might be some padding in between the header and the file.
+ padding = 4 - ((CPIO_HEADER_SIZE + name_size) & 3);
+
+ // And extract everything from the ELF file for the given task.
+ extract_elf(task_id, &initrd_addr[base + name_size + CPIO_HEADER_SIZE + padding],
+ file_size);
+
+ // Advance the base to the next file.
+ base += CPIO_HEADER_SIZE + name_size + padding + file_size;
+ }
+}
diff --git a/kernel/main.c b/kernel/main.c
index 11f2721..7eb2ef6 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -20,7 +20,8 @@ __noreturn __kernel void start_kernel(void *dtb)
printk("Welcome to FizzBuzz OS!\n");
struct initrd_addr addr = find_dt_initrd_addr(dtb);
- __unused(addr); // TODO
+
+ extract_initrd((char *)addr.start, addr.end - addr.start);
// TODO: reenable stuff
diff --git a/kernel/string.S b/kernel/string.S
index afd5985..4fb1ccc 100644
--- a/kernel/string.S
+++ b/kernel/string.S
@@ -35,12 +35,38 @@ strcmp:
1:
lbu t0, 0(a0)
lbu t1, 0(a1)
- bne t0, t1, 2f
addi a0, a0, 1
addi a1, a1, 1
+ bne t0, t1, 2f
bnez t0, 1b
li a0, 0
ret
2:
sub a0, t0, t1
ret
+
+/*
+ * Defined in include/fbos/string.h
+ *
+ * int memcmp(const void *ptr1, const void *ptr2, size_t n)
+ *
+ * Returns (a0): comparison result as in stdlib.
+ * Parameter (a0, a1): strings to compare.
+ * Clobbers: t0, t1.
+ */
+.global memcmp
+.type memcmp, @function
+memcmp:
+1:
+ lbu t0, 0(a0)
+ lbu t1, 0(a1)
+ bne t0, t1, 2f
+ addi a0, a0, 1
+ addi a1, a1, 1
+ addi a2, a2, -1
+ bnez a2, 1b
+ li a0, 0
+ ret
+2:
+ sub a0, t0, t1
+ ret