* 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
/* 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
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
/* 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 */
/* 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