Changeset c3ebc47 in mainline for kernel/generic/include/mm/slab.h

Timestamp:

2009-03-24T03:06:21Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

21a639b7

Parents:

05641a9e

Message:

add malloc slab caches for up to 4 MB blocks

File:

• kernel/generic/include/mm/slab.h (modified) (6 diffs)

kernel/generic/include/mm/slab.h

@@ -42 +42 @@
 
 /** Minimum size to be allocated by malloc */
-#define SLAB_MIN_MALLOC_W 4
+#define SLAB_MIN_MALLOC_W  4
 
 /** Maximum size to be allocated by malloc */
-#define SLAB_MAX_MALLOC_W 18
+#define SLAB_MAX_MALLOC_W  22
 
 /** Initial Magazine size (TODO: dynamically growing magazines) */
@@ -51 +51 @@
 
 /** If object size is less, store control structure inside SLAB */
-#define SLAB_INSIDE_SIZE   (PAGE_SIZE >> 3)
+#define SLAB_INSIDE_SIZE  (PAGE_SIZE >> 3)
 
 /** Maximum wasted space we allow for cache */
-#define SLAB_MAX_BADNESS(cache) \
+#define SLAB_MAX_BADNESS(cache) \
         (((unsigned int) PAGE_SIZE << (cache)->order) >> 2)
 
@@ -65 +65 @@
 
 /** Do not use per-cpu cache */
-#define SLAB_CACHE_NOMAGAZINE 0x1
+#define SLAB_CACHE_NOMAGAZINE   0x01
 /** Have control structure inside SLAB */
-#define SLAB_CACHE_SLINSIDE   0x2
+#define SLAB_CACHE_SLINSIDE     0x02
 /** We add magazine cache later, if we have this flag */
-#define SLAB_CACHE_MAGDEFERRED (0x4 | SLAB_CACHE_NOMAGAZINE)
+#define SLAB_CACHE_MAGDEFERRED  (0x04 | SLAB_CACHE_NOMAGAZINE)
 
 typedef struct {
         link_t link;
-        count_t busy;   /**< Count of full slots in magazine */
-        count_t size;   /**< Number of slots in magazine */
-        void *objs[];   /**< Slots in magazine */
+        count_t busy;  /**< Count of full slots in magazine */
+        count_t size;  /**< Number of slots in magazine */
+        void *objs[];  /**< Slots in magazine */
 } slab_magazine_t;
 
@@ -87 +87 @@
 typedef struct {
         char *name;
-
+        
         link_t link;
-
+        
         /* Configuration */
         /** Size of slab position - align_up(sizeof(obj)) */
         size_t size;
-
+        
         int (*constructor)(void *obj, int kmflag);
         int (*destructor)(void *obj);
-
+        
         /** Flags changing behaviour of cache */
         int flags;
-
+        
         /* Computed values */
-        uint8_t order;                  /**< Order of frames to be allocated */
-        unsigned int objects;           /**< Number of objects that fit in */
-
+        uint8_t order;         /**< Order of frames to be allocated */
+        unsigned int objects;  /**< Number of objects that fit in */
+        
         /* Statistics */
         atomic_t allocated_slabs;
@@ -110 +110 @@
         /** How many magazines in magazines list */
         atomic_t magazine_counter; 
-
+        
         /* Slabs */
-        link_t full_slabs;      /**< List of full slabs */
-        link_t partial_slabs;   /**< List of partial slabs */
+        link_t full_slabs;     /**< List of full slabs */
+        link_t partial_slabs;  /**< List of partial slabs */
         SPINLOCK_DECLARE(slablock);
-        /* Magazines  */
-        link_t magazines;       /**< List o full magazines */
+        /* Magazines */
+        link_t magazines;  /**< List o full magazines */
         SPINLOCK_DECLARE(maglock);
-
+        
         /** CPU cache */
         slab_mag_cache_t *mag_cache;
@@ -142 +142 @@
 extern void *realloc(void *, unsigned int, int);
 extern void free(void *);
+
 #endif