kern: mmap: make the lowest mmap address MiB; mmap ld.so at MiB

[akaros.git] / kern / include / kmalloc.h

diff --git a/kern/include/kmalloc.h b/kern/include/kmalloc.h
index c2774cf..03d7c55 100644 (file)
--- a/kern/include/kmalloc.h
+++ b/kern/include/kmalloc.h
@@ -9,31 +9,54 @@
 #define ROS_KERN_KMALLOC_H
 
 #include <ros/common.h>
+#include <kref.h>
 
 #define NUM_KMALLOC_CACHES 13
 #define KMALLOC_ALIGNMENT 16
-#define KMALLOC_SMALLEST 32
+#define KMALLOC_SMALLEST (sizeof(struct kmalloc_tag) << 1)
 #define KMALLOC_LARGEST KMALLOC_SMALLEST << NUM_KMALLOC_CACHES
-#define KMALLOC_OFFSET ROUNDUP(sizeof(struct kmalloc_tag), KMALLOC_ALIGNMENT)
 
 void kmalloc_init(void);
 void* (DALLOC(size) kmalloc)(size_t size, int flags);
-void* (DALLOC(size) krealloc)(void* buf, size_t size, int flags);
-void  (DFREE(addr) kfree)(void *addr);
-
-/* Flags */
-#define KMALLOC_TAG_CACHE 1
-#define KMALLOC_TAG_PAGES 2
+void* (DALLOC(size) kzmalloc)(size_t size, int flags);
+void *kmalloc_align(size_t size, int flags, size_t align);
+void *kzmalloc_align(size_t size, int flags, size_t align);
+void *krealloc(void *buf, size_t size, int flags);
+int kmalloc_refcnt(void *buf);
+void kmalloc_incref(void *buf);
+void kfree(void *buf);
+void kmalloc_canary_check(char *str);
+void *debug_canary;
+
+/* Flags to pass to kmalloc */
+/* Not implemented yet. Block until it is available. */
+#define KMALLOC_WAIT                   4
+
+/* Kmalloc tag flags looks like this:
+ *
+ * +--------------28---------------+-----4------+
+ * |       Flag specific data      |    Flags   |
+ * +-------------------------------+------------+
+ */
+#define KMALLOC_TAG_CACHE              1       /* memory came from slabs */
+#define KMALLOC_TAG_PAGES              2       /* memory came from page allocator */
+#define KMALLOC_TAG_UNALIGN            3       /* not a real tag, jump back by offset */
+#define KMALLOC_ALIGN_SHIFT            4       /* max flag is 16 */
+#define KMALLOC_FLAG_MASK              ((1 << KMALLOC_ALIGN_SHIFT) - 1)
 
 #define KMALLOC_CANARY 0xdeadbabe
 
+/* The kmalloc align/free paths require that flags is at the end of this
+ * struct, and that it is not padded. */
 struct kmalloc_tag {
-       int flags;
-       uint32_t canary;
        union {
                struct kmem_cache *my_cache WHEN(flags == KMALLOC_TAG_CACHE);
                size_t num_pages WHEN(flags == KMALLOC_TAG_PAGES);
+               uint64_t unused_force_align;
        };
+       struct kref kref;
+       uint32_t canary;
+       int flags;
 };
 
 #endif //ROS_KERN_KMALLOC_H