blob: a0b870486f0970e2ffb91769d3f170d30512d718 [file] [log] [blame]
From f419315f28a1da656c4faa8a852a2928ce38c72d Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Thu, 14 May 2020 14:27:17 +0300
Subject: [PATCH 4/4] Update: Use vmalloc_sync_mappings for stable kernels
Starting from v5.4.28/v5.2.37/v4.19.113/v4.14.175/v4.9.218/v4.4.218, stable
kernel branches backported v5.6 upstream commit [1], causing the following
warnings:
...
[ 483.242037] LTTng: vmalloc_sync_all symbol lookup failed.
[ 483.257056] Page fault handler and NMI tracing might trigger faults.
...
Extend check for vmalloc_sync_mappings for stable kernels as well.
[1] https://github.com/torvalds/linux/commit/763802b53a427ed3cbd419dbba255c414fdd9e7c
[ Edit: minor coding style fix by Mathieu Desnoyers. ]
Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/5939591f87dc291bc858caf72decfb8569d802e3]
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
wrapper/vmalloc.h | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/wrapper/vmalloc.h b/wrapper/vmalloc.h
index d905f60..c7538ae 100644
--- a/wrapper/vmalloc.h
+++ b/wrapper/vmalloc.h
@@ -20,8 +20,15 @@
#include <linux/kallsyms.h>
#include <wrapper/kallsyms.h>
+#include <lttng-kernel-version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) \
+ || LTTNG_KERNEL_RANGE(5,4,28, 5,5,0) \
+ || LTTNG_KERNEL_RANGE(5,2,37, 5,3,0) \
+ || LTTNG_KERNEL_RANGE(4,19,113, 4,20,0) \
+ || LTTNG_KERNEL_RANGE(4,14,175, 4,15,0) \
+ || LTTNG_KERNEL_RANGE(4,9,218, 4,10,0) \
+ || LTTNG_KERNEL_RANGE(4,4,218, 4,5,0))
static inline
void wrapper_vmalloc_sync_mappings(void)
@@ -72,7 +79,13 @@ void wrapper_vmalloc_sync_mappings(void)
#else
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) \
+ || LTTNG_KERNEL_RANGE(5,4,28, 5,5,0) \
+ || LTTNG_KERNEL_RANGE(5,2,37, 5,3,0) \
+ || LTTNG_KERNEL_RANGE(4,19,113, 4,20,0) \
+ || LTTNG_KERNEL_RANGE(4,14,175, 4,15,0) \
+ || LTTNG_KERNEL_RANGE(4,9,218, 4,10,0) \
+ || LTTNG_KERNEL_RANGE(4,4,218, 4,5,0))
static inline
void wrapper_vmalloc_sync_mappings(void)
--
2.17.1