Fix: vmalloc wrapper on kernel < 2.6.38

[lttng-modules.git] / wrapper / page_alloc.c

diff --git a/wrapper/page_alloc.c b/wrapper/page_alloc.c
index d82d897ef51564decf89df5adcebd84a560addfa..dc1fbed225fd6aefce00661aa1c7581793246e0f 100644 (file)
--- a/wrapper/page_alloc.c
+++ b/wrapper/page_alloc.c
@@ -1,9 +1,10 @@
 /*
  * wrapper/page_alloc.c
  *
- * wrapper around get_pfnblock_flags_mask. Using KALLSYMS to get its address
- * when available, else we need to have a kernel that exports this function to
- * GPL modules.
+ * wrapper around get_pfnblock_flags_mask and Ubuntu
+ * get_pageblock_flags_mask. Using KALLSYMS to get their address when
+ * available, else we need to have a kernel that exports this function
+ * to GPL modules.
  *
  * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
@@ -22,17 +23,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../lttng-kernel-version.h"
+#include <lttng-kernel-version.h>
 
 #if (defined(CONFIG_KALLSYMS) \
-       && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2) \
-               || LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0)))
+       && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)        \
+               || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0)          \
+               || LTTNG_KERNEL_RANGE(3,18,10, 3,19,0)          \
+               || LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0) \
+               || LTTNG_UBUNTU_KERNEL_RANGE(3,16,7,34, 3,17,0,0)))
 
 #include <linux/kallsyms.h>
 #include <linux/mm_types.h>
 #include <linux/module.h>
-#include "kallsyms.h"
-#include "page_alloc.h"
+#include <wrapper/kallsyms.h>
+#include <wrapper/page_alloc.h>
 
 static
 unsigned long (*get_pfnblock_flags_mask_sym)(struct page *page,
@@ -63,8 +67,50 @@ int wrapper_get_pfnblock_flags_mask_init(void)
        return 0;
 }
 
-#else /* #if defined(CONFIG_KALLSYMS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)) */
+#else
 
 #include <linux/pageblock-flags.h>
 
-#endif /* #else #if defined(CONFIG_KALLSYMS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)) */
+#endif
+
+#if (defined(CONFIG_KALLSYMS) \
+       && LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,50, 3,14,0,0))
+
+#include <linux/kallsyms.h>
+#include <linux/mm_types.h>
+#include <linux/module.h>
+#include <wrapper/kallsyms.h>
+#include <wrapper/page_alloc.h>
+
+static
+unsigned long (*get_pageblock_flags_mask_sym)(struct page *page,
+               unsigned long end_bitidx,
+               unsigned long mask);
+
+unsigned long wrapper_get_pageblock_flags_mask(struct page *page,
+               unsigned long end_bitidx,
+               unsigned long mask)
+{
+       WARN_ON_ONCE(!get_pageblock_flags_mask_sym);
+       if (get_pageblock_flags_mask_sym) {
+               return get_pageblock_flags_mask_sym(page, end_bitidx, mask);
+       } else {
+               return -ENOSYS;
+       }
+}
+EXPORT_SYMBOL_GPL(wrapper_get_pageblock_flags_mask);
+
+int wrapper_get_pageblock_flags_mask_init(void)
+{
+       get_pageblock_flags_mask_sym =
+               (void *) kallsyms_lookup_funcptr("get_pageblock_flags_mask");
+       if (!get_pageblock_flags_mask_sym)
+               return -1;
+       return 0;
+}
+
+#else
+
+#include <linux/pageblock-flags.h>
+
+#endif