Merge branch 'master' into sata-ahci-dev

[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 44295625f3adb8f6bfe239618e565219a0829657..0c4d4d4020e2167cf85c7a5d304812f80abc144a 100644 (file)
--- a/lunaix-os/kernel/mm/valloc.c
+++ b/lunaix-os/kernel/mm/valloc.c
@@ -3,27 +3,40 @@
 #define MAX_CLASS 6
 
 static char piles_names[MAX_CLASS][PILE_NAME_MAXLEN] = {
-    "valloc_128", "valloc_256", "valloc_512",
-    "valloc_1k",  "valloc_2k",  "valloc_4k"
+    "valloc_16",  "valloc_32",  "valloc_64",
+    "valloc_128", "valloc_256", "valloc_512"
+};
+
+static char piles_names_dma[MAX_CLASS][PILE_NAME_MAXLEN] = {
+    "valloc_dma_128", "valloc_dma_512", "valloc_dma_512",
+    "valloc_dma_1k",  "valloc_dma_2k",  "valloc_dma_4k"
 };
 
 static struct cake_pile* piles[MAX_CLASS];
+static struct cake_pile* piles_dma[MAX_CLASS];
 
 void
 valloc_init()
 {
+    for (size_t i = 0; i < MAX_CLASS; i++) {
+        int size = 1 << (i + 4);
+        piles[i] = cake_new_pile(&piles_names[i], size, 1, 0);
+    }
+
+    // DMA 内存保证128字节对齐
     for (size_t i = 0; i < MAX_CLASS; i++) {
         int size = 1 << (i + 7);
-        piles[i] = cake_new_pile(&piles_names[i], size, size > 1024 ? 8 : 1);
+        piles_dma[i] = cake_new_pile(
+          &piles_names_dma[i], size, size > 1024 ? 8 : 1, PILE_CACHELINE);
     }
 }
 
 void*
-valloc(unsigned int size)
+__valloc(unsigned int size, struct cake_pile** segregate_list)
 {
     size_t i = 0;
     for (; i < MAX_CLASS; i++) {
-        if (piles[i]->piece_size > size) {
+        if (segregate_list[i]->piece_size >= size) {
             goto found_class;
         }
     }
@@ -31,16 +44,40 @@ valloc(unsigned int size)
     return NULL;
 
 found_class:
-    return cake_grab(piles[i]);
+    return cake_grab(segregate_list[i]);
 }
 
 void
-vfree(void* ptr)
+__vfree(void* ptr, struct cake_pile** segregate_list)
 {
     size_t i = 0;
     for (; i < MAX_CLASS; i++) {
-        if (cake_release(piles[i], ptr)) {
+        if (cake_release(segregate_list[i], ptr)) {
             return;
         }
     }
+}
+
+void*
+valloc(unsigned int size)
+{
+    return __valloc(size, &piles);
+}
+
+void
+vfree(void* ptr)
+{
+    __vfree(ptr, &piles);
+}
+
+void*
+valloc_dma(unsigned int size)
+{
+    return __valloc(size, &piles_dma);
+}
+
+void
+vfree_dma(void* ptr)
+{
+    __vfree(ptr, &piles_dma);
 }
\ No newline at end of file