From 9352abbed0f1266f511f170517a4094c6c4ff917 Mon Sep 17 00:00:00 2001 From: dzwdz Date: Tue, 26 Jul 2022 00:37:24 +0200 Subject: user: mount the initrd and /kdev in user_bootstrap --- src/user/app/init/driver/tar.c | 158 ---------------------------------------- src/user/app/init/driver/tar.h | 4 -- src/user/app/init/main.c | 16 +---- src/user_bootstrap/main.c | 63 +++++----------- src/user_bootstrap/tar.c | 159 +++++++++++++++++++++++++++++++++++++++++ src/user_bootstrap/tar.h | 5 ++ 6 files changed, 186 insertions(+), 219 deletions(-) delete mode 100644 src/user/app/init/driver/tar.c delete mode 100644 src/user/app/init/driver/tar.h create mode 100644 src/user_bootstrap/tar.c create mode 100644 src/user_bootstrap/tar.h (limited to 'src') diff --git a/src/user/app/init/driver/tar.c b/src/user/app/init/driver/tar.c deleted file mode 100644 index 60deccd..0000000 --- a/src/user/app/init/driver/tar.c +++ /dev/null @@ -1,158 +0,0 @@ -#include -#include -#include -#include - -#define BUF_SIZE 64 - -static void *tar_open(const char *path, int len, void *base, size_t base_len); -static void tar_read(struct fs_wait_response *res, void *base, size_t base_len); -static int tar_size(void *sector); -static void *tar_find(const char *path, size_t path_len, void *base, size_t base_len); -static int oct_parse(char *str, size_t len); - - -static const char *root_fakemeta = ""; /* see comment in tar_open */ - - -void tar_driver(void *base) { - static char buf[BUF_SIZE]; - struct fs_wait_response res; - void *ptr; - while (!_syscall_fs_wait(buf, BUF_SIZE, &res)) { - switch (res.op) { - case VFSOP_OPEN: - ptr = tar_open(buf, res.len, base, ~0); - _syscall_fs_respond(ptr, ptr ? 0 : -1, 0); - break; - - case VFSOP_READ: - tar_read(&res, base, ~0); - break; - - default: - _syscall_fs_respond(NULL, -1, 0); // unsupported - break; - } - } - _syscall_exit(0); -} - -static void *tar_open(const char *path, int len, void *base, size_t base_len) { - if (len <= 0) return NULL; - path += 1; // skip the leading slash - len -= 1; - - /* TAR archives don't (seem to) contain an entry for the root dir, so i'm - * returning a fake one. this isn't a full entry because i'm currently too - * lazy to create a full one - thus, it has to be special cased in tar_read */ - if (len == 0) - return (void*)root_fakemeta; - - return tar_find(path, len, base, base_len); -} - -static void tar_read(struct fs_wait_response *res, void *base, size_t base_len) { - void *meta = (void*)res->id; - char type = *(char*)(meta + 156); - size_t meta_len; - int size; - - static char buf[BUF_SIZE]; // TODO reuse a single buffer - size_t buf_pos = 0; - - if (meta == root_fakemeta) type = '5'; /* see comment in tar_open() */ - - switch (type) { - case '\0': - case '0': /* normal files */ - size = tar_size(meta); - if (res->offset < 0 || res->offset > size) { - // TODO support negative offsets - _syscall_fs_respond(NULL, -1, 0); - } else { - _syscall_fs_respond(meta + 512 + res->offset, size - res->offset, 0); - } - break; - - case '5': /* directory */ - meta_len = strlen(meta); - size_t to_skip = res->offset; - - /* find files in dir */ - for (size_t off = 0; off < base_len;) { - if (0 != memcmp(base + off + 257, "ustar", 5)) - break; // not a metadata sector - // TODO more meaningful variable names and clean code up - - /* check if prefix matches */ - if (0 == memcmp(base + off, meta, meta_len) && - *(char*)(base + off + meta_len) != '\0') { - char *suffix = base + off + meta_len; - size_t suffix_len = strlen(suffix); - - /* check if the path contains any non-trailing slashes */ - char *next = suffix; - while (*next && *next != '/') next++; - if (*next == '/') next++; - if (*next == '\0') { - if (to_skip > suffix_len) { - to_skip -= suffix_len; - } else { - suffix += to_skip; - suffix_len -= to_skip; - to_skip = 0; - - /* it doesn't - so let's add it to the result */ - memcpy(buf + buf_pos, suffix, suffix_len); - buf[buf_pos + suffix_len] = '\0'; - buf_pos += suffix_len + 1; - // TODO no buffer overrun check - } - } - } - - size = tar_size(base + off); - off += 512; // skip this metadata sector - off += (size + 511) & ~511; // skip the data sectors - } - - _syscall_fs_respond(buf, buf_pos, 0); - break; - - default: - _syscall_fs_respond(NULL, -1, 0); - break; - } -} - -static int tar_size(void *sector) { - return oct_parse(sector + 124, 11); -} - -static void *tar_find(const char *path, size_t path_len, void *base, size_t base_len) { - int size; - if (path_len > 100) return NULL; // illegal path - - for (size_t off = 0; off < base_len;) { - if (0 != memcmp(base + off + 257, "ustar", 5)) - break; // not a metadata sector - if (0 == memcmp(base + off, path, path_len) && - *(char*)(base + off + path_len) == '\0') - return base + off; // file found, quit - - size = tar_size(base + off); - off += 512; // skip this metadata sector - off += (size + 511) & ~511; // skip the data sectors - } - return NULL; -} - -static int oct_parse(char *str, size_t len) { - int res = 0; - for (size_t i = 0; i < len; i++) { - res *= 8; - res += str[i] - '0'; // no format checking - } - return res; -} diff --git a/src/user/app/init/driver/tar.h b/src/user/app/init/driver/tar.h deleted file mode 100644 index c1dee78..0000000 --- a/src/user/app/init/driver/tar.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include - -_Noreturn void tar_driver(void *base); diff --git a/src/user/app/init/main.c b/src/user/app/init/main.c index a2c5e46..fe06fab 100644 --- a/src/user/app/init/main.c +++ b/src/user/app/init/main.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -15,21 +14,12 @@ extern char _image_base[]; void read_file(const char *path, size_t len); __attribute__((section(".text.startup"))) -int main(void *initrd) { +int main(void) { elf_selfreloc(); - file_reopen(stdout, "/com1", 0); - printf("in init, loaded at 0x%x\n", &_image_base); + file_reopen(stdout, "/kdev/com1", 0); + printf("in init (stage 2), loaded at 0x%x\n", &_image_base); - /* move everything provided by the kernel to /kdev */ - MOUNT("/kdev/", fs_passthru(NULL)); - if (!fork2_n_mount("/")) { - const char *l[] = {"/kdev/", NULL}; - fs_whitelist(l); - } - if (!fork2_n_mount("/")) fs_dir_inject("/kdev/"); // TODO should be part of fs_whitelist - - MOUNT("/init/", tar_driver(initrd)); MOUNT("/tmp/", tmpfs_drv()); MOUNT("/keyboard", ps2_drv()); MOUNT("/vga_tty", ansiterm_drv()); diff --git a/src/user_bootstrap/main.c b/src/user_bootstrap/main.c index 8fed3ce..5f36aa1 100644 --- a/src/user_bootstrap/main.c +++ b/src/user_bootstrap/main.c @@ -2,60 +2,35 @@ #include #include #include +#include + +#include "tar.h" extern char _bss_start; extern char _bss_end; extern char _initrd; -static void *tar_find(void *tar, const char *path); -static int oct_parse(char *str, size_t len); - -static void *tar_find(void *tar, const char *path) { - size_t path_len = strlen(path); - int size; - if (path_len > 100) return NULL; - - for (size_t off = 0;;) { - if (0 != memcmp(tar + off + 257, "ustar", 5)) - return NULL; // not a metadata sector, end of archive - - _klogf("%s", tar + off); - size = oct_parse(tar + off + 124, 11); - if (0 == memcmp(tar + off, path, path_len) && - *(char*)(tar + off + path_len) == '\0') - { - return tar + off + 512; - } - off += 512; - off += (size + 511) & ~511; - } -} - -static int oct_parse(char *str, size_t len) { - int res = 0; - for (size_t i = 0; i < len; i++) { - res *= 8; - res += str[i] - '0'; // no format checking - } - return res; -} - - __attribute__((section(".text.startup"))) int main(void) { _syscall_memflag(&_bss_start, &_bss_end - &_bss_start, MEMFLAG_PRESENT); - void *init = tar_find(&_initrd, "init.elf"); - if (!init) { - _klogf("couldn't find init.elf\n"); - _syscall_exit(0); + /* move everything provided by the kernel to /kdev */ + MOUNT("/kdev/", fs_passthru(NULL)); + if (!fork2_n_mount("/")) { + const char *l[] = {"/kdev/", NULL}; + fs_whitelist(l); } - void (*entry)(void*) = elf_partialexec(init); - if (entry) { - // TODO dynamically link initrd - entry(&_initrd); + if (!fork2_n_mount("/")) fs_dir_inject("/kdev/"); // TODO should be part of fs_whitelist + + MOUNT("/init/", tar_driver(&_initrd)); + + void *init = tar_find("init.elf", 8, &_initrd, ~0) + 512; + if (init) { + _klogf("execing init.elf"); + elf_exec(init); + _klogf("elf_exec failed"); } else { - _klogf("couldn't execute init.elf\n"); + _klogf("couldn't find init.elf"); } - _syscall_exit(0); + _syscall_exit(1); } diff --git a/src/user_bootstrap/tar.c b/src/user_bootstrap/tar.c new file mode 100644 index 0000000..40da437 --- /dev/null +++ b/src/user_bootstrap/tar.c @@ -0,0 +1,159 @@ +#include +#include +#include +#include + +#include "tar.h" + +#define BUF_SIZE 64 + +static void *tar_open(const char *path, int len, void *base, size_t base_len); +static void tar_read(struct fs_wait_response *res, void *base, size_t base_len); +static int tar_size(void *sector); +static int oct_parse(char *str, size_t len); + + +static const char *root_fakemeta = ""; /* see comment in tar_open */ + + +void tar_driver(void *base) { + static char buf[BUF_SIZE]; + struct fs_wait_response res; + void *ptr; + while (!_syscall_fs_wait(buf, BUF_SIZE, &res)) { + switch (res.op) { + case VFSOP_OPEN: + ptr = tar_open(buf, res.len, base, ~0); + _syscall_fs_respond(ptr, ptr ? 0 : -1, 0); + break; + + case VFSOP_READ: + tar_read(&res, base, ~0); + break; + + default: + _syscall_fs_respond(NULL, -1, 0); // unsupported + break; + } + } + _syscall_exit(0); +} + +static void *tar_open(const char *path, int len, void *base, size_t base_len) { + if (len <= 0) return NULL; + path += 1; // skip the leading slash + len -= 1; + + /* TAR archives don't (seem to) contain an entry for the root dir, so i'm + * returning a fake one. this isn't a full entry because i'm currently too + * lazy to create a full one - thus, it has to be special cased in tar_read */ + if (len == 0) + return (void*)root_fakemeta; + + return tar_find(path, len, base, base_len); +} + +static void tar_read(struct fs_wait_response *res, void *base, size_t base_len) { + void *meta = (void*)res->id; + char type = *(char*)(meta + 156); + size_t meta_len; + int size; + + static char buf[BUF_SIZE]; // TODO reuse a single buffer + size_t buf_pos = 0; + + if (meta == root_fakemeta) type = '5'; /* see comment in tar_open() */ + + switch (type) { + case '\0': + case '0': /* normal files */ + size = tar_size(meta); + if (res->offset < 0 || res->offset > size) { + // TODO support negative offsets + _syscall_fs_respond(NULL, -1, 0); + } else { + _syscall_fs_respond(meta + 512 + res->offset, size - res->offset, 0); + } + break; + + case '5': /* directory */ + meta_len = strlen(meta); + size_t to_skip = res->offset; + + /* find files in dir */ + for (size_t off = 0; off < base_len;) { + if (0 != memcmp(base + off + 257, "ustar", 5)) + break; // not a metadata sector + // TODO more meaningful variable names and clean code up + + /* check if prefix matches */ + if (0 == memcmp(base + off, meta, meta_len) && + *(char*)(base + off + meta_len) != '\0') { + char *suffix = base + off + meta_len; + size_t suffix_len = strlen(suffix); + + /* check if the path contains any non-trailing slashes */ + char *next = suffix; + while (*next && *next != '/') next++; + if (*next == '/') next++; + if (*next == '\0') { + if (to_skip > suffix_len) { + to_skip -= suffix_len; + } else { + suffix += to_skip; + suffix_len -= to_skip; + to_skip = 0; + + /* it doesn't - so let's add it to the result */ + memcpy(buf + buf_pos, suffix, suffix_len); + buf[buf_pos + suffix_len] = '\0'; + buf_pos += suffix_len + 1; + // TODO no buffer overrun check + } + } + } + + size = tar_size(base + off); + off += 512; // skip this metadata sector + off += (size + 511) & ~511; // skip the data sectors + } + + _syscall_fs_respond(buf, buf_pos, 0); + break; + + default: + _syscall_fs_respond(NULL, -1, 0); + break; + } +} + +static int tar_size(void *sector) { + return oct_parse(sector + 124, 11); +} + +void *tar_find(const char *path, size_t path_len, void *base, size_t base_len) { + int size; + if (path_len > 100) return NULL; // illegal path + + for (size_t off = 0; off < base_len;) { + if (0 != memcmp(base + off + 257, "ustar", 5)) + break; // not a metadata sector + if (0 == memcmp(base + off, path, path_len) && + *(char*)(base + off + path_len) == '\0') + return base + off; // file found, quit + + size = tar_size(base + off); + off += 512; // skip this metadata sector + off += (size + 511) & ~511; // skip the data sectors + } + return NULL; +} + +static int oct_parse(char *str, size_t len) { + int res = 0; + for (size_t i = 0; i < len; i++) { + res *= 8; + res += str[i] - '0'; // no format checking + } + return res; +} diff --git a/src/user_bootstrap/tar.h b/src/user_bootstrap/tar.h new file mode 100644 index 0000000..43aa9ed --- /dev/null +++ b/src/user_bootstrap/tar.h @@ -0,0 +1,5 @@ +#pragma once +#include + +_Noreturn void tar_driver(void *base); +void *tar_find(const char *path, size_t path_len, void *base, size_t base_len); -- cgit v1.2.3