X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fwrapper%2Fvmalloc.h;h=bbc900d1ad677fce4ecf360c577703f1f822a3c5;hb=0aebcd682f2b7dc028e635297c504b39439551da;hp=902c65557c3aa979046f2701599e87cbfa27b008;hpb=fd094ddf7daceaeb467b612c2fe5446fcc2c4aa9;p=lttng-modules.git

diff --git a/include/wrapper/vmalloc.h b/include/wrapper/vmalloc.h
index 902c6555..bbc900d1 100644
--- a/include/wrapper/vmalloc.h
+++ b/include/wrapper/vmalloc.h
@@ -59,7 +59,7 @@ void wrapper_vmalloc_sync_mappings(void)
 		 * trigger recursive page faults.
 		 */
 		printk_once(KERN_WARNING "LTTng: vmalloc_sync_mappings symbol lookup failed.\n");
-		printk_once(KERN_WARNING "Page fault handler and NMI tracing might trigger faults.\n");
+		printk_once(KERN_WARNING "LTTng: Page fault handler and NMI tracing might trigger faults.\n");
 #endif
 	}
 }
@@ -97,7 +97,7 @@ void wrapper_vmalloc_sync_mappings(void)
 		 * trigger recursive page faults.
 		 */
 		printk_once(KERN_WARNING "LTTng: vmalloc_sync_all symbol lookup failed.\n");
-		printk_once(KERN_WARNING "Page fault handler and NMI tracing might trigger faults.\n");
+		printk_once(KERN_WARNING "LTTng: Page fault handler and NMI tracing might trigger faults.\n");
 #endif
 	}
 }
@@ -208,8 +208,8 @@ static inline
 void print_vmalloc_node_range_warning(void)
 {
 	printk_once(KERN_WARNING "LTTng: __vmalloc_node_range symbol lookup failed.\n");
-	printk_once(KERN_WARNING "Tracer performance will be degraded on NUMA systems.\n");
-	printk_once(KERN_WARNING "Please rebuild your kernel with CONFIG_KALLSYMS enabled.\n");
+	printk_once(KERN_WARNING "LTTng: Tracer performance will be degraded on NUMA systems.\n");
+	printk_once(KERN_WARNING "LTTng: Please rebuild your kernel with CONFIG_KALLSYMS enabled.\n");
 }
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0))
@@ -262,7 +262,7 @@ void *__canary____lttng_vmalloc_node_range(unsigned long size, unsigned long ali
 			vm_flags, node, caller);
 }
 
-#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)) */
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
 
 /*
  * kallsyms wrapper of __vmalloc_node with a fallback to kmalloc_node.
@@ -310,6 +310,54 @@ void *__canary____lttng_vmalloc_node_range(unsigned long size, unsigned long ali
 			node, caller);
 }
 
+#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) */
+
+/*
+ * kallsyms wrapper of __vmalloc_node with a fallback to kmalloc_node.
+ */
+static inline
+void *__lttng_vmalloc_node_range(unsigned long size, unsigned long align,
+			unsigned long start, unsigned long end, gfp_t gfp_mask,
+			pgprot_t prot, unsigned long vm_flags, int node,
+			void *caller)
+{
+#ifdef CONFIG_KALLSYMS
+	/*
+	 * If we have KALLSYMS, get * __vmalloc_node_range which is not exported.
+	 */
+	void *(*lttng__vmalloc_node_range)(unsigned long size, unsigned long align,
+			unsigned long start, unsigned long end, gfp_t gfp_mask,
+			pgprot_t prot, int node, void *caller);
+
+	lttng__vmalloc_node_range = (void *) kallsyms_lookup_funcptr("__vmalloc_node_range");
+	if (lttng__vmalloc_node_range)
+		return lttng__vmalloc_node_range(size, align, start, end, gfp_mask, prot,
+				node, caller);
+#endif
+	if (node != NUMA_NO_NODE)
+		print_vmalloc_node_range_warning();
+	return __vmalloc(size, gfp_mask, prot);
+}
+
+/*
+ * Canary function to check for '__vmalloc_node_range()' at compile time.
+ *
+ * From 'include/linux/vmalloc.h':
+ *
+ *   extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
+ *                           unsigned long start, unsigned long end, gfp_t gfp_mask,
+ *                           pgprot_t prot, unsigned long vm_flags, int node,
+ *                           void *caller);
+ */
+static inline
+void *__canary____lttng_vmalloc_node_range(unsigned long size, unsigned long align,
+			unsigned long start, unsigned long end, gfp_t gfp_mask,
+			pgprot_t prot, int node, void *caller)
+{
+	return __vmalloc_node_range(size, align, start, end, gfp_mask, prot,
+			node, caller);
+}
+
 #endif
 
 /**