Changeset 4e147a6 in mainline

Timestamp:

2006-02-02T01:51:25Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9ea8a7ca

Parents:

b5e0bb8

Message:

Skeleton of SLAB allocator.

Files:

• Makefile (modified) (1 diff)
• generic/include/mm/frame.h (modified) (3 diffs)
• generic/include/mm/slab.h (added)
• generic/src/console/cmd.c (modified) (4 diffs)
• generic/src/main/main.c (modified) (2 diffs)
• generic/src/mm/frame.c (modified) (2 diffs)
• generic/src/mm/slab.c (added)
• kernel.config (modified) (1 diff)
• test/mm/falloc1/test.c (modified) (1 diff)
• test/mm/falloc2/test.c (modified) (1 diff)
• test/mm/slab1/test.c (added)

Makefile

@@ -116 +116 @@
         generic/src/mm/tlb.c \
         generic/src/mm/as.c \
+        generic/src/mm/slab.c \
         generic/src/lib/func.c \
         generic/src/lib/list.c \

generic/include/mm/frame.h

@@ -36 +36 @@
 #include <synch/spinlock.h>
 #include <mm/buddy.h>
+#include <mm/slab.h>
 
 #define ONE_FRAME       0
@@ -41 +42 @@
 #define FRAME_KA                1       /* skip frames conflicting with user address space */
 #define FRAME_PANIC             2       /* panic on failure */
-#define FRAME_NON_BLOCKING      4       /* do not panic and do not sleep on failure */
+#define FRAME_ATOMIC            4       /* do not panic and do not sleep on failure */
 
 #define FRAME_OK                0       /* frame_alloc return status */
@@ -78 +79 @@
         __u8 buddy_order;       /**< buddy system block order */
         link_t buddy_link;      /**< link to the next free block inside one order */
+        slab_slab_t *slab;      /**< If allocated by slab, this points there */
 };
 

generic/src/console/cmd.c

@@ -51 +51 @@
 #include <mm/frame.h>
 #include <main/version.h>
+#include <mm/slab.h>
 
 /** Data and methods for 'help' command. */
@@ -244 +245 @@
 
 
+static int cmd_slabs(cmd_arg_t *argv);
+static cmd_info_t slabs_info = {
+        .name = "slabs",
+        .description = "List SLAB caches.",
+        .func = cmd_slabs,
+        .argc = 0
+};
+
 /** Data and methods for 'zones' command */
 static int cmd_zones(cmd_arg_t *argv);
@@ -353 +362 @@
         if (!cmd_register(&zones_info))
                 panic("could not register command %s\n", zones_info.name);
+
+        cmd_initialize(&slabs_info);
+        if (!cmd_register(&slabs_info))
+                panic("could not register command %s\n", slabs_info.name);
 
         cmd_initialize(&zone_info);
@@ -604 +617 @@
 }
 
+/** Command for listings SLAB caches
+ *
+ * @param argv Ignores
+ *
+ * @return Always 1
+ */
+int cmd_slabs(cmd_arg_t * argv) {
+        slab_print_list();
+        return 1;
+}
+
 /** Command for listing memory zones
  *

generic/src/main/main.c

@@ -50 +50 @@
 #include <mm/tlb.h>
 #include <mm/as.h>
+#include <mm/slab.h>
 #include <synch/waitq.h>
 #include <arch/arch.h>
@@ -163 +164 @@
         page_init();
         tlb_init();
+        slab_cache_init();
         arch_post_mm_init();
 

generic/src/mm/frame.c

@@ -124 +124 @@
                 interrupts_restore(ipl);
 
-                if (flags & FRAME_NON_BLOCKING) {
+                if (flags & FRAME_ATOMIC) {
                         ASSERT(status != NULL);
                         *status = FRAME_NO_MEMORY;
@@ -158 +158 @@
                 v = PA2KA(v);
         
-        if (flags & FRAME_NON_BLOCKING) {
+        if (flags & FRAME_ATOMIC) {
                 ASSERT(status != NULL);
                 *status = FRAME_OK;

kernel.config

@@ -81 +81 @@
 @ "mm/falloc1" Frame Allocation test 1
 @ "mm/falloc2" Frame Allocation test 2
+@ "mm/slab1" SLAB Allocator test 1
 @ [ARCH=mips32] "debug/mips1" Mips breakpoint-debug test 
 ! CONFIG_TEST (choice)

test/mm/falloc1/test.c

@@ -56 +56 @@
                         allocated = 0;
                         for (i = 0; i < MAX_FRAMES >> order; i++) {
-                                frames[allocated] = frame_alloc(FRAME_NON_BLOCKING | FRAME_KA, order, &status);
+                                frames[allocated] = frame_alloc(FRAME_ATOMIC | FRAME_KA, order, &status);
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {

test/mm/falloc2/test.c

@@ -64 +64 @@
                         allocated = 0;
                         for (i = 0; i < (MAX_FRAMES >> order); i++) {
-                                frames[allocated] = frame_alloc(FRAME_NON_BLOCKING | FRAME_KA, order, &status);
+                                frames[allocated] = frame_alloc(FRAME_ATOMIC | FRAME_KA, order, &status);
                                 if (status == 0) {
                                         memsetb(frames[allocated], FRAME_SIZE << order, val);