X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-kernel-version.h;h=154ba35d17f9359e718db1fced4bdd1089fcbf5c;hb=9d72c4911cfca9b17905c1a336fc56eeb6bac5bc;hp=806d978ba6debb946af3f47b8703a5b2a9f2f9b2;hpb=919f286898a7782eeb8483cd31a52a77a31562b3;p=lttng-modules.git

diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h
index 806d978b..154ba35d 100644
--- a/lttng-kernel-version.h
+++ b/lttng-kernel-version.h
@@ -40,19 +40,22 @@
  * 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.
+ *
+ * Cast the result to uint64_t to prevent overflowing when we append distro
+ * specific version information.
  */
 #if (LTTNG_LINUX_PATCH >= 256)
 
 #define LTTNG_KERNEL_VERSION(a, b, c) \
-	(((a) << 24) + ((b) << 16) + (c))
+	((((a) << 24) + ((b) << 16) + (c)) * 1ULL)
 
 #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
+#define LTTNG_KERNEL_VERSION(a, b, c) (KERNEL_VERSION(a, b, c) * 1ULL)
+#define LTTNG_LINUX_VERSION_CODE (LINUX_VERSION_CODE * 1ULL)
 
 #endif
 
@@ -67,11 +70,11 @@
 /* Ubuntu */
 
 #define LTTNG_UBUNTU_KERNEL_VERSION(a, b, c, d) \
-	(((LTTNG_KERNEL_VERSION(a, b, c)) << 8) + (d))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) << 16) + (d))
 
 #ifdef UTS_UBUNTU_RELEASE_ABI
 #define LTTNG_UBUNTU_VERSION_CODE \
-	((LTTNG_LINUX_VERSION_CODE << 8) + UTS_UBUNTU_RELEASE_ABI)
+	((LTTNG_LINUX_VERSION_CODE << 16) + UTS_UBUNTU_RELEASE_ABI)
 #else
 #define LTTNG_UBUNTU_VERSION_CODE 	0
 #endif
@@ -103,13 +106,13 @@
 		LTTNG_DEBIAN_KERNEL_VERSION(a_high, b_high, c_high, d_high, e_high, f_high))
 
 #define LTTNG_RHEL_KERNEL_VERSION(a, b, c, d, e, f) \
-	(((LTTNG_KERNEL_VERSION(a, b, c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) * 100000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
 
 /* RHEL */
 
 #ifdef RHEL_API_VERSION
 #define LTTNG_RHEL_VERSION_CODE \
-	((LTTNG_LINUX_VERSION_CODE * 10000000ULL) + RHEL_API_VERSION)
+	((LTTNG_LINUX_VERSION_CODE * 100000000ULL) + RHEL_API_VERSION)
 #else
 #define LTTNG_RHEL_VERSION_CODE		0
 #endif
@@ -123,22 +126,48 @@
 
 /* SUSE Linux enterprise */
 
-#define LTTNG_SLE_KERNEL_VERSION(a, b, c, d, e, f) \
-	(((LTTNG_KERNEL_VERSION(a, b, c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+/*
+ * SLE major version codes may be large, eg. 150400, and require more than
+ * 32 bits to store. Multiplying `a` by `1ULL` avoids compiler warnings, eg:
+ *
+ * `warning: result of ‘150400 << 16’ requires 35 bits to represent, but ‘int’ only has 32 bits`
+ *
+ */
+#define LTTNG_SLE_VERSION(a, b, c) \
+   ((((a * 1ULL) << 16) + (b << 8) + c) * 1ULL)
 
-#ifdef SLE_API_VERSION
+#if defined(SLE_API_VERSION_MAJOR) && defined(SLE_API_VERSION_MINOR) && defined(SLE_API_VERSION_PATCH)
 #define LTTNG_SLE_VERSION_CODE \
-	((LTTNG_LINUX_VERSION_CODE * 10000000ULL) + SLE_API_VERSION)
+	(LTTNG_SLE_VERSION(SLE_API_VERSION_MAJOR, SLE_API_VERSION_MINOR, SLE_API_VERSION_PATCH))
 #else
-#define LTTNG_SLE_VERSION_CODE 	0
+#define LTTNG_SLE_VERSION_CODE	0
 #endif
 
 #define LTTNG_SLE_KERNEL_RANGE(a_low, b_low, c_low, d_low, e_low, f_low, \
 		a_high, b_high, c_high, d_high, e_high, f_high) \
-	(LTTNG_SLE_VERSION_CODE >= \
-		LTTNG_SLE_KERNEL_VERSION(a_low, b_low, c_low, d_low, e_low, f_low) && \
-		LTTNG_SLE_VERSION_CODE < \
-		LTTNG_SLE_KERNEL_VERSION(a_high, b_high, c_high, d_high, e_high, f_high))
+	( \
+		LTTNG_SLE_VERSION_CODE != 0 && \
+		( \
+			/* Linux kernel version code exclusive inside range */ \
+			(LTTNG_LINUX_VERSION_CODE > LTTNG_KERNEL_VERSION(a_low, b_low, c_low) && \
+			LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(a_high, b_high, c_high)) || \
+			\
+			/* Linux kernel version code is at lower and upper limit */ \
+			(LTTNG_LINUX_VERSION_CODE == LTTNG_KERNEL_VERSION(a_low, b_low, c_low) && \
+			LTTNG_LINUX_VERSION_CODE == LTTNG_KERNEL_VERSION(a_high, b_high, c_high) && \
+			LTTNG_SLE_VERSION_CODE >= LTTNG_SLE_VERSION(d_low, e_low, f_low) && \
+			LTTNG_SLE_VERSION_CODE < LTTNG_SLE_VERSION(d_high, e_high, f_high)) || \
+			\
+			/* Linux kernel version code is at lower limit */ \
+			(LTTNG_LINUX_VERSION_CODE == LTTNG_KERNEL_VERSION(a_low, b_low, c_low) && \
+			LTTNG_KERNEL_VERSION(a_low, b_low, c_low) != LTTNG_KERNEL_VERSION(a_high, b_high, c_high) && \
+			LTTNG_SLE_VERSION_CODE >= LTTNG_SLE_VERSION(d_low, e_low, f_low)) || \
+			\
+			/* Linux kernel version code is at upper limit */ \
+			(LTTNG_LINUX_VERSION_CODE == LTTNG_KERNEL_VERSION(a_high, b_high, c_high) && \
+			LTTNG_KERNEL_VERSION(a_low, b_low, c_low) != LTTNG_KERNEL_VERSION(a_high, b_high, c_high) && \
+			LTTNG_SLE_VERSION_CODE < LTTNG_SLE_VERSION(d_high, e_high, f_high)) \
+		))
 
 /* Fedora */
 
@@ -162,11 +191,11 @@
 /* RT patch */
 
 #define LTTNG_RT_KERNEL_VERSION(a, b, c, d) \
-	(((LTTNG_KERNEL_VERSION(a, b, c)) << 8) + (d))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) << 16) + (d))
 
 #ifdef RT_PATCH_VERSION
 #define LTTNG_RT_VERSION_CODE \
-	((LTTNG_LINUX_VERSION_CODE << 8) + RT_PATCH_VERSION)
+	((LTTNG_LINUX_VERSION_CODE << 16) + RT_PATCH_VERSION)
 #else
 #define LTTNG_RT_VERSION_CODE 	0
 #endif