Boot framework rework (#45)

[lunaix-os.git] / lunaix-os / kernel / mm / valloc.c

diff --git a/lunaix-os/kernel/mm/valloc.c b/lunaix-os/kernel/mm/valloc.c
index 113b7c659c15c0a72f8e6889be9c54dab00ae53f..d2baa352b05ee81f231b0739c75caa022ec175b4 100644 (file)
--- a/lunaix-os/kernel/mm/valloc.c
+++ b/lunaix-os/kernel/mm/valloc.c
@@ -5,24 +5,39 @@
 
 #define CLASS_LEN(class) (sizeof(class) / sizeof(class[0]))
 
 
 #define CLASS_LEN(class) (sizeof(class) / sizeof(class[0]))
 

-static char piles_names[][PILE_NAME_MAXLEN] = {"valloc_8",
-                                               "valloc_16",
-                                               "valloc_32",
-                                               "valloc_64",
-                                               "valloc_128",
-                                               "valloc_256",
-                                               "valloc_512",
-                                               "valloc_1k",
-                                               "valloc_2k",
-                                               "valloc_4k",
-                                               "valloc_8k"};
-
-static char piles_names_dma[][PILE_NAME_MAXLEN] = {"valloc_dma_128",
-                                                   "valloc_dma_256",
-                                                   "valloc_dma_512",
-                                                   "valloc_dma_1k",
-                                                   "valloc_dma_2k",
-                                                   "valloc_dma_4k"};
+// threshold to use external cake metadata
+#define EXTERN_THRESHOLD    128
+
+static char piles_names[][PILE_NAME_MAXLEN] = 
+{
+    "valloc_8",   "valloc_16",  "valloc_32",  "valloc_64",
+    "valloc_128", "valloc_256", "valloc_512", "valloc_1k",
+    "valloc_2k",  "valloc_4k",  "valloc_8k"  
+};
+
+#define M128    (4)
+#define M1K     (M128 + 3)
+
+static int page_counts[] = 
+{
+    [0] = 1,
+    [1] = 1,
+    [2] = 1,
+    [3] = 1,
+    [M128    ] = 1,
+    [M128 + 1] = 2,
+    [M128 + 2] = 2,
+    [M1K     ] = 4,
+    [M1K + 1 ] = 4,
+    [M1K + 2 ] = 8,
+    [M1K + 3 ] = 8
+};
+
+static char piles_names_dma[][PILE_NAME_MAXLEN] = 
+{
+    "valloc_dma_128", "valloc_dma_256", "valloc_dma_512",
+    "valloc_dma_1k",  "valloc_dma_2k",  "valloc_dma_4k"
+};

 
 static struct cake_pile* piles[CLASS_LEN(piles_names)];
 static struct cake_pile* piles_dma[CLASS_LEN(piles_names_dma)];
 
 static struct cake_pile* piles[CLASS_LEN(piles_names)];
 static struct cake_pile* piles_dma[CLASS_LEN(piles_names_dma)];


@@ -30,16 +45,24 @@ static struct cake_pile* piles_dma[CLASS_LEN(piles_names_dma)];
 void
 valloc_init()
 {
 void
 valloc_init()
 {

+    int opts = 0;

     for (size_t i = 0; i < CLASS_LEN(piles_names); i++) {
         int size = 1 << (i + 3);
     for (size_t i = 0; i < CLASS_LEN(piles_names); i++) {
         int size = 1 << (i + 3);

-        piles[i] = cake_new_pile(piles_names[i], size, size > 1024 ? 8 : 1, 0);
+        if (size >= EXTERN_THRESHOLD) {
+            opts |= PILE_FL_EXTERN;
+        }
+        piles[i] = cake_new_pile(piles_names[i], size, page_counts[i], opts);

     }
 
     }
 

+    opts = PILE_ALIGN_CACHE;

     // DMA 内存保证128字节对齐
     for (size_t i = 0; i < CLASS_LEN(piles_names_dma); i++) {
         int size = 1 << (i + 7);
     // DMA 内存保证128字节对齐
     for (size_t i = 0; i < CLASS_LEN(piles_names_dma); i++) {
         int size = 1 << (i + 7);

+        if (size >= EXTERN_THRESHOLD) {
+            opts |= PILE_FL_EXTERN;
+        }

         piles_dma[i] = cake_new_pile(
         piles_dma[i] = cake_new_pile(

-            piles_names_dma[i], size, size > 1024 ? 4 : 1, PILE_ALIGN_CACHE);
+            piles_names_dma[i], size, page_counts[M128 + i], opts);

     }
 }
 
     }
 }
 


@@ -49,7 +72,7 @@ __valloc(unsigned int size,
          size_t len,
          size_t boffset)
 {
          size_t len,
          size_t boffset)
 {

-    size_t i = ILOG2(size);
+    size_t i = ilog2(size);

     i += (size - (1 << i) != 0);
     i -= boffset;
 
     i += (size - (1 << i) != 0);
     i -= boffset;
 


@@ -88,7 +111,7 @@ void*
 vcalloc(unsigned int size, unsigned int count)
 {
     unsigned int alloc_size;
 vcalloc(unsigned int size, unsigned int count)
 {
     unsigned int alloc_size;

-    if (umul_overflow(size, count, &alloc_size)) {
+    if (umul_of(size, count, &alloc_size)) {

         return 0;
     }
 
         return 0;
     }