Kernel command line: add support for arbitrary configuration settings

klib/cloud_init.c

@@ -82,7 +82,7 @@ static enum cloud cloud_detect(void)
 
 static int cloud_init_parse_vector(value config, int (*parse_each)(tuple, vector), vector tasks)
 {
-    if (!(is_tuple(config) || is_vector(config)))
+    if (!is_composite(config))
         return KLIB_INIT_FAILED;
     /* allow parsing either tuple or vector for backward compatibility with older ops/tfs... */
     value v;

klib/firewall.c

@@ -555,7 +555,7 @@ int init(status_handler complete)
     value rules = get(config, sym(rules));
     if (!rules)
         return KLIB_INIT_OK;
-    if (!(is_tuple(rules) || is_vector(rules))) {
+    if (!is_composite(rules)) {
         rprintf("invalid firewall rules\n");
         return KLIB_INIT_FAILED;
     }

platform/pc/service.c

@@ -243,16 +243,6 @@ static void __attribute__((noinline)) init_service_new_stack()
 {
     kernel_heaps kh = get_kernel_heaps();
     early_init_debug("in init_service_new_stack");
-    bytes pagesize = is_low_memory_machine() ? PAGESIZE : PAGESIZE_2M;
-    init_integers(locking_heap_wrapper(heap_general(kh),
-                  allocate_tagged_region(kh, tag_integer, pagesize)));
-    init_tuples(locking_heap_wrapper(heap_general(kh),
-                allocate_tagged_region(kh, tag_table_tuple, pagesize)));
-    init_symbols(allocate_tagged_region(kh, tag_symbol, pagesize), heap_locked(kh));
-    heap vh = allocate_tagged_region(kh, tag_vector, pagesize);
-    init_vectors(locking_heap_wrapper(heap_general(kh), vh), heap_locked(kh));
-    heap sh = allocate_tagged_region(kh, tag_string, pagesize);
-    init_strings(locking_heap_wrapper(heap_general(kh), sh), heap_locked(kh));
 
     for_regions(e) {
         switch (e->type) {
@@ -265,7 +255,6 @@ static void __attribute__((noinline)) init_service_new_stack()
         }
     }
 
-    init_management(allocate_tagged_region(kh, tag_function_tuple, pagesize), heap_general(kh));
     early_init_debug("init_hwrand");
     init_hwrand();
 
@@ -332,15 +321,10 @@ id_heap init_physical_id_heap(heap h)
     early_init_debug("physical memory:");
     for_regions(e) {
 	if (e->type == REGION_PHYSICAL) {
-	    /* Align for 2M pages */
 	    u64 base = e->base;
-	    u64 end = base + e->length;
-	    u64 page2m_mask = MASK(PAGELOG_2M);
-	    base = (base + page2m_mask) & ~page2m_mask;
-	    end &= ~MASK(PAGELOG);
-	    if (base >= end)
+	    u64 length = e->length;
+	    if (length == 0)
 		continue;
-	    u64 length = end - base;
 #ifdef INIT_DEBUG
 	    early_debug("INIT:  [");
 	    early_debug_u64(base);
@@ -405,26 +389,6 @@ static inline void jump_to_virtual(void) {
         1: \n");
 }
 
-static void cmdline_parse(const char *cmdline)
-{
-    early_init_debug("parsing cmdline");
-    const char *opt_end, *prefix_end;
-    while (*cmdline) {
-        opt_end = runtime_strchr(cmdline, ' ');
-        if (!opt_end)
-            opt_end = cmdline + runtime_strlen(cmdline);
-        prefix_end = runtime_strchr(cmdline, '.');
-        if (prefix_end && (prefix_end < opt_end)) {
-            int prefix_len = prefix_end - cmdline;
-            if ((prefix_len == sizeof("virtio_mmio") - 1) &&
-                    !runtime_memcmp(cmdline, "virtio_mmio", prefix_len))
-                virtio_mmio_parse(get_kernel_heaps(), prefix_end + 1,
-                    opt_end - (prefix_end + 1));
-        }
-        cmdline = opt_end + 1;
-    }
-}
-
 extern void *READONLY_END;
 
 /* Returns the number of pages have been allocated from the temporary page table region. */
@@ -495,7 +459,6 @@ void init_service(u64 rdi, u64 rsi)
              */
             assert(u64_from_pointer(params) + cmdline_size < MBR_ADDRESS);
             runtime_memcpy(params, cmdline, cmdline_size);
-            params[cmdline_size] = '\0';
             cmdline = (char *)params;
         }
 
@@ -512,7 +475,7 @@ void init_service(u64 rdi, u64 rsi)
     init_page_initial_map(pointer_from_u64(PAGES_BASE), initial_pages);
     init_kernel_heaps();
     if (cmdline)
-        cmdline_parse(cmdline);
+        create_region(u64_from_pointer(cmdline), cmdline_size, REGION_CMDLINE);
     u64 stack_size = 32*PAGESIZE;
     u64 stack_location = allocate_u64((heap)heap_page_backed(get_kernel_heaps()), stack_size);
     stack_location += stack_size - STACK_ALIGNMENT;
@@ -623,3 +586,23 @@ void detect_devices(kernel_heaps kh, storage_attach sa)
     init_virtio_balloon(kh);
     init_virtio_rng(kh);
 }
+
+void cmdline_consume(const char *opt_name, cmdline_handler h)
+{
+    for_regions(e) {
+        if (e->type == REGION_CMDLINE) {
+            e->length = cmdline_parse(pointer_from_u64(e->base), e->length, opt_name, h);
+            return;
+        }
+    }
+}
+
+void boot_params_apply(tuple t)
+{
+    for_regions(e) {
+        if (e->type == REGION_CMDLINE) {
+            cmdline_apply(pointer_from_u64(e->base), e->length, t);
+            return;
+        }
+    }
+}

platform/riscv-virt/service.c

@@ -47,7 +47,7 @@ id_heap init_physical_id_heap(heap h)
     u64 end = PHYSMEM_BASE + mem_size;
     u64 bootstrap_size = init_bootstrap_heap(end - base);
     map(BOOTSTRAP_BASE, base, bootstrap_size, pageflags_writable(pageflags_memory()));
-    base = pad(base + bootstrap_size, PAGESIZE_2M);
+    base += bootstrap_size;
     init_debug("\nfree base ");
     init_debug_u64(base);
     init_debug("\nend ");
@@ -102,17 +102,6 @@ static void __attribute__((noinline)) init_service_new_stack(void)
 {
     init_debug("in init_service_new_stack\n");
     kernel_heaps kh = get_kernel_heaps();
-    bytes pagesize = is_low_memory_machine() ? PAGESIZE : PAGESIZE_2M;
-    init_integers(locking_heap_wrapper(heap_general(kh),
-                  allocate_tagged_region(kh, tag_integer, pagesize)));
-    init_tuples(locking_heap_wrapper(heap_general(kh),
-                allocate_tagged_region(kh, tag_table_tuple, pagesize)));
-    init_symbols(allocate_tagged_region(kh, tag_symbol, pagesize), heap_locked(kh));
-    heap vh = allocate_tagged_region(kh, tag_vector, pagesize);
-    init_vectors(locking_heap_wrapper(heap_general(kh), vh), heap_locked(kh));
-    heap sh = allocate_tagged_region(kh, tag_string, pagesize);
-    init_strings(locking_heap_wrapper(heap_general(kh), sh), heap_locked(kh));
-    init_management(allocate_tagged_region(kh, tag_function_tuple, pagesize), heap_general(kh));
     init_debug("calling runtime init\n");
     kernel_runtime_init(kh);
     while(1);

platform/virt/service.c

@@ -110,9 +110,6 @@ static void add_heap_range_internal(id_heap h, range r, range *remainder)
         r = *remainder;
         *remainder = tmp;
     }
-    r.start = pad(r.start, PAGESIZE_2M);
-    if (r.start >= r.end)
-        return;
     init_debug("adding range [0x");
     init_debug_u64(r.start);
     init_debug(" 0x");
@@ -198,7 +195,7 @@ id_heap init_physical_id_heap(heap h)
         u64 end = base + get_memory_size(pointer_from_u64(DEVICETREE_BLOB_BASE));
         u64 bootstrap_size = init_bootstrap_heap(end - base);
         map(BOOTSTRAP_BASE, base, bootstrap_size, pageflags_writable(pageflags_memory()));
-        base = pad(base + bootstrap_size, PAGESIZE_2M);
+        base += bootstrap_size;
         init_debug("\nfree base ");
         init_debug_u64(base);
         init_debug("\nend ");
@@ -247,17 +244,6 @@ static void __attribute__((noinline)) init_service_new_stack(void)
 {
     init_debug("in init_service_new_stack\n");
     kernel_heaps kh = get_kernel_heaps();
-    bytes pagesize = is_low_memory_machine() ? PAGESIZE : PAGESIZE_2M;
-    init_integers(locking_heap_wrapper(heap_general(kh),
-                  allocate_tagged_region(kh, tag_integer, pagesize)));
-    init_tuples(locking_heap_wrapper(heap_general(kh),
-                allocate_tagged_region(kh, tag_table_tuple, pagesize)));
-    init_symbols(allocate_tagged_region(kh, tag_symbol, pagesize), heap_locked(kh));
-    heap vh = allocate_tagged_region(kh, tag_vector, pagesize);
-    init_vectors(locking_heap_wrapper(heap_general(kh), vh), heap_locked(kh));
-    heap sh = allocate_tagged_region(kh, tag_string, pagesize);
-    init_strings(locking_heap_wrapper(heap_general(kh), sh), heap_locked(kh));
-    init_management(allocate_tagged_region(kh, tag_function_tuple, pagesize), heap_general(kh));
     init_debug("calling runtime init\n");
     kernel_runtime_init(kh);
     while(1);

src/aarch64/kernel_machine.c

@@ -45,7 +45,7 @@ static u64 tag_alloc(heap h, bytes s)
     return a;
 }
 
-heap allocate_tagged_region(kernel_heaps kh, u64 tag, bytes pagesize)
+heap allocate_tagged_region(kernel_heaps kh, u64 tag, bytes pagesize, boolean locking)
 {
     heap h = heap_locked(kh);
     struct tagheap *th = allocate(h, sizeof(struct tagheap));

src/aarch64/kernel_machine.h

@@ -205,6 +205,9 @@ static inline void wait_for_interrupt(void)
     enable_interrupts();
 }
 
+#define cmdline_consume(o, h)   (void)(h)
+#define boot_params_apply(t)
+
 /* locking constructs */
 #include <mutex.h>
 

src/drivers/console.c

@@ -104,7 +104,7 @@ void config_console(tuple root)
     value v = get(root, sym(consoles));
     if (v == 0)
         return;
-    if (!(is_vector(v) || is_tuple(v))) {
+    if (!is_composite(v)) {
         msg_err("consoles config is neither vector nor tuple\n");
         return;
     }

src/fs/tlog.c

@@ -499,7 +499,7 @@ closure_function(2, 1, void, log_switch_complete,
     if (is_ok(s))
         table_foreach(old_tl->dictionary, k, v) {
             (void)v;
-            if ((is_tuple(k) || is_vector(k)) && !table_find(new_tl->dictionary, k)) {
+            if (is_composite(k) && !table_find(new_tl->dictionary, k)) {
                 tlog_debug("  destroying value %p\n", __func__, k);
                 destruct_value(k, false);
             }
@@ -842,7 +842,7 @@ closure_function(4, 1, void, log_read_complete,
         table newdict = allocate_table(tl->h, identity_key, pointer_equal);
         table_foreach(tl->dictionary, k, v) {
             tlog_debug("   dict swap: k %p, v %p, type %d\n", k, v, tagof(v));
-            assert(is_tuple(v) || is_symbol(v) || is_vector(v));
+            assert(is_composite(v) || is_symbol(v));
             table_set(newdict, v, k);
         }
         deallocate_table(tl->dictionary);