feat(unique-asid): force addr spaces to have unique IDs

All address spaces now have their unique ID. The only exception is the
hypervisor itself that always has ID=0.

Signed-off-by: Miguel Silva <[email protected]>

Author: miguelafsilva5

src/core/mmu/inc/mem_prot/mem.h

@@ -10,8 +10,6 @@
 #include <arch/mem.h>
 #include <page_table.h>
 #include <spinlock.h>
-
-#define HYP_ASID 0
 struct addr_space {
     struct page_table pt;
     enum AS_TYPE type;

src/core/mmu/mem.c

@@ -900,13 +900,31 @@ void mem_color_hypervisor(const paddr_t load_addr, struct mem_region* root_regio
     mem_unmap(&cpu()->as, va, p_cpu.num_pages, false);
 }
 
+static unsigned long as_id_alloc(struct addr_space* as)
+{
+    static spinlock_t as_id_alloc_lock = SPINLOCK_INITVAL;
+    static asid_t asid_counter = 1;
+    unsigned long ret = 0;
+
+    spin_lock(&as_id_alloc_lock);
+    if (as->type != AS_HYP) {
+        ret = asid_counter;
+        asid_counter++;
+    }
+    spin_unlock(&as_id_alloc_lock);
+
+    return ret;
+}
+
 void as_init(struct addr_space* as, enum AS_TYPE type, asid_t id, pte_t* root_pt, colormap_t colors)
 {
+    UNUSED_ARG(id);
+
     as->type = type;
     as->pt.dscr = type == AS_HYP || type == AS_HYP_CPY ? hyp_pt_dscr : vm_pt_dscr;
+    as->id = as_id_alloc(as);
     as->colors = colors;
     as->lock = SPINLOCK_INITVAL;
-    as->id = id;
 
     if (root_pt == NULL) {
         size_t n = NUM_PAGES(pt_size(&as->pt, 0));

src/core/mpu/inc/mem_prot/mem.h

@@ -12,9 +12,7 @@
 #include <arch/mem.h>
 #include <arch/spinlock.h>
 
-#define HYP_ASID         0
 #define VMPU_NUM_ENTRIES 64
-
 struct mp_region {
     vaddr_t base;
     size_t size;

src/core/mpu/mem.c

@@ -223,13 +223,30 @@ static void mem_mmio_init_regions(struct addr_space* as)
     }
 }
 
+static unsigned long as_id_alloc(struct addr_space* as)
+{
+    static spinlock_t as_id_alloc_lock = SPINLOCK_INITVAL;
+    static asid_t asid_counter = 1;
+    unsigned long ret = 0;
+
+    spin_lock(&as_id_alloc_lock);
+    if (as->type != AS_HYP) {
+        ret = asid_counter;
+        asid_counter++;
+    }
+    spin_unlock(&as_id_alloc_lock);
+
+    return ret;
+}
+
 void as_init(struct addr_space* as, enum AS_TYPE type, asid_t id, colormap_t colors)
 {
     UNUSED_ARG(colors);
+    UNUSED_ARG(id);
 
     as->type = type;
     as->colors = 0;
-    as->id = id;
+    as->id = as_id_alloc(as);
     as->lock = SPINLOCK_INITVAL;
     as_arch_init(as);