fix: sublevel version overflow in LINUX_VERSION_CODE

The 4.4.256 and 4.9.256 stable release overflow the 8bits allocated to
the sublevel in LINUX_VERSION_CODE which ends means they report
themselves as 4.5.0 and 4.10.0 respectively. The next releases in these
stables branches will have sublevel clamped at 255 and will thus report
themselves as 4.4.255 and 4.9.255 for all subsequent releases.

We need a way to way to properly detect these release since I doubt they
will stop breaking tracepoints declarations. As a workaround, extract
the version information from the Makefile in the kernel headers and use
this information to generate a version code when the sublevel is equal
or greater than 256.

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

diff --git a/Makefile.ABI.workarounds b/Makefile.ABI.workarounds
index f84e4ed022d1403d86ef0aed1adc2980eb7cadcf..6a0a61fd1716c088acd8abab5e89ba4f152a003c 100644 (file)
--- a/Makefile.ABI.workarounds
+++ b/Makefile.ABI.workarounds
@@ -1,3 +1,7 @@
+ccflags-y += -DLTTNG_LINUX_MAJOR=$(VERSION)
+ccflags-y += -DLTTNG_LINUX_MINOR=$(PATCHLEVEL)
+ccflags-y += -DLTTNG_LINUX_PATCH=$(SUBLEVEL)
+
 # Work-around for distro-specific public modules ABI breakages.
 # Some distributions break the public module instrumentation ABI
 # compared to upstream stable kernels without providing other mean than

diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h
index 9e02cc6dd4deec73b6ca4f31db2bcd561f786b0f..e7fffe606a288bdf1dd4203abd01162ef94fbbc9 100644 (file)
--- a/lttng-kernel-version.h
+++ b/lttng-kernel-version.h
@@ -25,9 +25,49 @@
 
 #include <linux/version.h>
 
+/*
+ * The following defines are extracted from the toplevel Linux Makefile and
+ * passed on the command line -with '-D'.
+ */
+
+#ifndef LTTNG_LINUX_MAJOR
+#define LTTNG_LINUX_MAJOR 0
+#endif
+
+#ifndef LTTNG_LINUX_MINOR
+#define LTTNG_LINUX_MINOR 0
+#endif
+
+#ifndef LTTNG_LINUX_PATCH
+#define LTTNG_LINUX_PATCH 0
+#endif
+
+/*
+ * Some stable releases have overflowed the 8bits allocated to the sublevel in
+ * the version code. To determine if the current kernel is affected, use the
+ * sublevel version from the Makefile. This is currently true for the 4.4.256
+ * and 4.9.256 stable releases.
+ *
+ * When the sublevel has overflowed, use the values from the Makefile instead
+ * of LINUX_VERSION_CODE from the kernel headers and allocate 16bits.
+ * Otherwise, keep using the version code from the headers to minimise the
+ * behavior change and avoid regressions.
+ */
+#if (LTTNG_LINUX_PATCH >= 256)
+
+#define LTTNG_KERNEL_VERSION(a, b, c) \
+       (((a) << 24) + ((b) << 16) + (c))
+
+#define LTTNG_LINUX_VERSION_CODE \
+       LTTNG_KERNEL_VERSION(LTTNG_LINUX_MAJOR, LTTNG_LINUX_MINOR, LTTNG_LINUX_PATCH)
+
+#else
+
 #define LTTNG_KERNEL_VERSION(a, b, c) KERNEL_VERSION(a, b, c)
 #define LTTNG_LINUX_VERSION_CODE LINUX_VERSION_CODE
 
+#endif
+
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,33))
 #include <generated/utsrelease.h>
 #else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,33)) */