binomial heaps: reuse heap_node slab for allocations

We already have a heap_node slab in litmus.c. We can reuse it for the
other allocations.

This patch also fixes a misnaming of heap_node_alloc/free.

2 files changed, 15 insertions, 13 deletions

diff --git a/include/litmus/heap.h b/include/litmus/heap.h
index 508e0b9f16..e5b4746998 100644
--- a/include/litmus/heap.h
+++ b/include/litmus/heap.h
@@ -45,6 +45,9 @@ static inline void heap_node_init(struct heap_node** _h, void* value)
         h->ref    = _h;
 }
 
+struct heap_node* heap_node_alloc(int gfp_flags);
+void heap_node_free(struct heap_node* hn);
+
 static inline int heap_node_in_heap(struct heap_node* h)
 {
         return h->degree != NOT_IN_HEAP;
@@ -298,22 +301,11 @@ static inline void heap_delete(heap_prio_t higher_prio, struct heap* heap,
         node->degree = NOT_IN_HEAP;
 }
 
-/* un-inline, make it a kmemcache_t */
-static inline struct heap_node* alloc_heap_node(int gfp_flags)
-{
-        return kmalloc(sizeof(struct heap_node), gfp_flags);
-}
-
-static inline void free_heap_node(struct heap_node* hn)
-{
-        kfree(hn);
-}
-
 /* allocate a heap node for value and insert into the heap */
 static inline int heap_add(heap_prio_t higher_prio, struct heap* heap,
                             void* value, int gfp_flags)
 {
-        struct heap_node* hn = alloc_heap_node(gfp_flags);
+        struct heap_node* hn = heap_node_alloc(gfp_flags);
         if (likely(hn)) {
                 heap_node_init(&hn, value);
                 heap_insert(higher_prio, heap, hn);
@@ -328,7 +320,7 @@ static inline void* heap_take_del(heap_prio_t higher_prio,
         void* ret = NULL;
         if (hn) {
                 ret = hn->value;
-                free_heap_node(hn);
+                heap_node_free(hn);
         }
         return ret;
 }
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 979985e4a3..c64a8f6aaa 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -32,6 +32,16 @@ static DEFINE_SPINLOCK(sched_sig_list_lock);
 
 static struct kmem_cache * heap_node_cache;
 
+struct heap_node* heap_node_alloc(int gfp_flags)
+{
+        return kmem_cache_alloc(heap_node_cache, gfp_flags);
+}
+
+void heap_node_free(struct heap_node* hn)
+{
+        kmem_cache_free(heap_node_cache, hn);
+}
+
 /*
  * sys_set_task_rt_param
  * @pid: Pid of the task which scheduling parameters must be changed