From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 18 Nov 2022 21:34:33 +0000 (-0500)
Subject: Drop support for kernels < 4.4 from 'wrapper/page_alloc.h'
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5a90857e90423e5849fafc875ff1eacc6f56d5ac;p=lttng-modules.git

Drop support for kernels < 4.4 from 'wrapper/page_alloc.h'

Change-Id: I1a702b78a5293ce631a7955fe67145fdf7445cb6
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/wrapper/page_alloc.h b/include/wrapper/page_alloc.h
index c74e6d68..6ebc5845 100644
--- a/include/wrapper/page_alloc.h
+++ b/include/wrapper/page_alloc.h
@@ -12,29 +12,20 @@
 #ifndef _LTTNG_WRAPPER_PAGE_ALLOC_H
 #define _LTTNG_WRAPPER_PAGE_ALLOC_H
 
-#include <lttng/kernel-version.h>
+#include <linux/mm_types.h>
 
 /*
  * We need to redefine get_pfnblock_flags_mask to our wrapper, because
  * the get_pageblock_migratetype() macro uses it.
  */
-#if (defined(CONFIG_KALLSYMS) \
-	&& (LTTNG_LINUX_VERSION_CODE >= LTTNG_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)))
+#ifdef CONFIG_KALLSYMS
 
 #define get_pfnblock_flags_mask		wrapper_get_pfnblock_flags_mask
 
-#include <linux/mm_types.h>
-
 int wrapper_get_pfnblock_flags_mask_init(void);
 
 #else
 
-#include <linux/mm_types.h>
-
 static inline
 int wrapper_get_pfnblock_flags_mask_init(void)
 {
@@ -43,36 +34,4 @@ int wrapper_get_pfnblock_flags_mask_init(void)
 
 #endif
 
-/*
- * For a specific range of Ubuntu 3.13 kernels, we need to redefine
- * get_pageblock_flags_mask to our wrapper, because the
- * get_pageblock_migratetype() macro uses it. This function has been
- * introduced into mainline within commit
- * e58469bafd0524e848c3733bc3918d854595e20f, but never actually showed
- * up in a stable kernel version, since it has been changed by commit
- * dc4b0caff24d9b2918e9f27bc65499ee63187eba. Since Ubuntu chose to only
- * backport the former commit but not the latter, we need to do a
- * special case to cover this.
- */
-#if (defined(CONFIG_KALLSYMS) \
-	&& LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,50, 3,14,0,0))
-
-#define get_pageblock_flags_mask	wrapper_get_pageblock_flags_mask
-
-#include <linux/mm_types.h>
-
-int wrapper_get_pageblock_flags_mask_init(void);
-
-#else
-
-#include <linux/mm_types.h>
-
-static inline
-int wrapper_get_pageblock_flags_mask_init(void)
-{
-	return 0;
-}
-
-#endif
-
 #endif /* _LTTNG_WRAPPER_PAGE_ALLOC_H */
diff --git a/src/lttng-events.c b/src/lttng-events.c
index 431da540..9df03392 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -4156,9 +4156,6 @@ static int __init lttng_events_init(void)
 	if (ret)
 		return ret;
 	ret = wrapper_get_pfnblock_flags_mask_init();
-	if (ret)
-		return ret;
-	ret = wrapper_get_pageblock_flags_mask_init();
 	if (ret)
 		return ret;
 	ret = lttng_probes_init();
diff --git a/src/wrapper/page_alloc.c b/src/wrapper/page_alloc.c
index 81835cb2..a03838fa 100644
--- a/src/wrapper/page_alloc.c
+++ b/src/wrapper/page_alloc.c
@@ -9,14 +9,7 @@
  * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <lttng/kernel-version.h>
-
-#if (defined(CONFIG_KALLSYMS) \
-	&& (LTTNG_LINUX_VERSION_CODE >= LTTNG_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)))
+#ifdef CONFIG_KALLSYMS
 
 #include <linux/kallsyms.h>
 #include <linux/mm_types.h>
@@ -78,46 +71,3 @@ unsigned long __canary__get_pfnblock_flags_mask(struct page *page,
 #include <linux/pageblock-flags.h>
 
 #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;
-}
-EXPORT_SYMBOL_GPL(wrapper_get_pfnblock_flags_mask_init);
-
-#else
-
-#include <linux/pageblock-flags.h>
-
-#endif