Fix: adjust SLE version ranges to build with SP2 and SP3
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 Fix: adjust SLE version ranges to build with SP2 and SP3
The early kernel versions of SuSE 12 SP3 overlap with the range from the later SP2 kernels but are from a different source trees. This patch adds specific ranges for the SP3 kernels that overlap and allows compatibility with both SP2 and SP3 kernels.
--- instrumentation/events/lttng-module/block.h | 8 ++- instrumentation/events/lttng-module/btrfs.h | 65 ++++++++++++++++++--- instrumentation/events/lttng-module/kvm.h | 17 +++++- 3 files changed, 80 insertions(+), 10 deletions(-)
instrumentation/events/lttng-module/block.h +7 -1
@@ -34,7 +34,13 @@ enum {#endif /* _TRACE_BLOCK_DEF_ */ #if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,8 ,0 ) || \ -LTTNG_SLE_KERNEL_RANGE (4 ,4 ,73 ,5 ,0 ,0 ,4 ,4 ,103 ,92 ,0 ,0 )) +LTTNG_SLE_KERNEL_RANGE (4 ,4 ,73 ,5 ,0 ,0 ,4 ,4 ,73 ,6 ,0 ,0 ) || \ +LTTNG_SLE_KERNEL_RANGE (4 ,4 ,82 ,6 ,0 ,0 ,4 ,4 ,82 ,7 ,0 ,0 ) || \ +LTTNG_SLE_KERNEL_RANGE (4 ,4 ,92 ,6 ,0 ,0 ,4 ,4 ,92 ,7 ,0 ,0 ) || \ +LTTNG_SLE_KERNEL_RANGE (4 ,4 ,103 ,6 ,0 ,0 ,4 ,4 ,103 ,7 ,0 ,0 ) || \ +LTTNG_SLE_KERNEL_RANGE (4 ,4 ,114 ,94 ,0 ,0 ,4 ,4 ,114 ,95 ,0 ,0 ) || \ +LTTNG_SLE_KERNEL_RANGE (4 ,4 ,120 ,94 ,0 ,0 ,4 ,4 ,120 ,95 ,0 ,0 ) || \ +LTTNG_SLE_KERNEL_RANGE (4 ,4 ,126 ,94 ,0 ,0 ,4 ,5 ,0 ,0 ,0 ,0 ))#define lttng_req_op (rq) req_op(rq)#define lttng_req_rw (rq) ((rq)->cmd_flags)
instrumentation/events/lttng-module/btrfs.h +57 -8
155 lines not on this page · raw message
instrumentation/events/lttng-module/kvm.h +16 -1
@@ -84,7 +84,22 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq, { KVM_TRACE_MMIO_READ, "read" }, \ { KVM_TRACE_MMIO_WRITE, "write" } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \ + +#if (LTTNG_SLE_KERNEL_RANGE (4 ,4 ,131 ,94 ,0 ,0 ,4 ,5 ,0 ,0 ,0 ,0 )) + +LTTNG_TRACEPOINT_EVENT (kvm_mmio, + TP_PROTO(int type, int len, u64 gpa, u64 val), +TP_ARGS (type, len, gpa, val), + +TP_FIELDS ( + ctf_integer(u32, type, type) + ctf_integer(u32, len, len) + ctf_integer(u64, gpa, gpa) +ctf_integer (u64, val, val) + ) +) + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \ ||LTTNG_KERNEL_RANGE (4 ,14 ,14 ,4 ,15 ,0 ) \ ||LTTNG_DEBIAN_KERNEL_RANGE (4 ,14 ,13 ,0 ,1 ,0 ,4 ,15 ,0 ,0 ,0 ,0 ) \ || LTTNG_KERNEL_RANGE(4,9,77, 4,10,0) \
Signature · 6 lines
2.17.1 _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Re: [PATCH lttng-modules stable-2.x 1/2] Fix: Allow alphanumeric characters in SLE version
In reply to a message not in the archiveBoth merged into 2.9, 2.10, thanks!
Mathieu
Quoted 27 lines · ----- On Aug 9, 2018, at 11:56 AM, Michael Jeanson [email protected] wrote:
Allow alphanumeric characters in the long version string before extracting specific version numbers. This prevents failure in detecting a SuSE kernel when the version string was customized by the end user.
Signed-off-by Michael Jeanson <[email protected]>---
abi-sle-version.sh| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)abi-sle-version.sh +0
-0@@ -22,7 +22,7 @@ if [ ! -f "${KPATH}/include/generated/utsrelease.h" ]; then exit 0fi
-SLE_RELEASE="$(sed -rn 's/^#define
UTS_RELEASE"(.*)-([0-9\.]+)-(.*)"/\2/p' "${KPATH}/include/generated/utsrelease.h")"
+SLE_RELEASE="$(sed -rn 's/^#defineUTS_RELEASE"(.*)-([0-9a-zA-Z\.]+)-(.*)"/\2/p' "${KPATH}/include/generated/utsrelease.h")"SLE_RELEASE_MAJOR="$(echo "${SLE_RELEASE}" | sed -rn 's/^([0-9]+)(.*)$/\1/p')" SLE_RELEASE_MINOR="$(echo "${SLE_RELEASE}" | sed -rn 's/^([0-9]+)\.([0-9]+)(.*)$/\2/p')"
--
2.17.1
Signature · 7 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev