X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lib%2Fprio_heap%2Flttng_prio_heap.c;h=66bee9ccbf164f467217b2ccf573b276447fc0ef;hb=refs%2Ftags%2Ffor-upstreaming-review-1;hp=5bbd0793b8a6d5ca2a7a57772a88de9bc5eac934;hpb=a88db0185693b52123f541fb19a79d1d23f563a4;p=lttng-modules.git

diff --git a/lib/prio_heap/lttng_prio_heap.c b/lib/prio_heap/lttng_prio_heap.c
index 5bbd0793..66bee9cc 100644
--- a/lib/prio_heap/lttng_prio_heap.c
+++ b/lib/prio_heap/lttng_prio_heap.c
@@ -1,23 +1,15 @@
-/*
+/* SPDX-License-Identifier: MIT
+ *
  * lttng_prio_heap.c
  *
  * Priority heap containing pointers. Based on CLRS, chapter 6.
  *
  * Copyright 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
  */
 
 #include <linux/slab.h>
-#include "lttng_prio_heap.h"
+#include <lttng/lttng_prio_heap.h>
+#include <linux/mm.h>
 
 #ifdef DEBUG_HEAP
 void lttng_check_heap(const struct lttng_ptr_heap *heap)
@@ -62,12 +54,13 @@ int heap_grow(struct lttng_ptr_heap *heap, size_t new_len)
 		return 0;
 
 	heap->alloc_len = max_t(size_t, new_len, heap->alloc_len << 1);
-	new_ptrs = kmalloc(heap->alloc_len * sizeof(void *), heap->gfpmask);
+	new_ptrs = kvmalloc_node(heap->alloc_len * sizeof(void *), heap->gfpmask,
+				 NUMA_NO_NODE);
 	if (!new_ptrs)
 		return -ENOMEM;
 	if (heap->ptrs)
 		memcpy(new_ptrs, heap->ptrs, heap->len * sizeof(void *));
-	kfree(heap->ptrs);
+	kvfree(heap->ptrs);
 	heap->ptrs = new_ptrs;
 	return 0;
 }
@@ -91,6 +84,7 @@ int lttng_heap_init(struct lttng_ptr_heap *heap, size_t alloc_len,
 	heap->len = 0;
 	heap->alloc_len = 0;
 	heap->gt = gt;
+	heap->gfpmask = gfpmask;
 	/*
 	 * Minimum size allocated is 1 entry to ensure memory allocation
 	 * never fails within heap_replace_max.
@@ -100,7 +94,7 @@ int lttng_heap_init(struct lttng_ptr_heap *heap, size_t alloc_len,
 
 void lttng_heap_free(struct lttng_ptr_heap *heap)
 {
-	kfree(heap->ptrs);
+	kvfree(heap->ptrs);
 }
 
 static void heapify(struct lttng_ptr_heap *heap, size_t i)