From 18c62d23b260db88b6a22dad88b77a0a15b99e50 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 18 Mar 2023 11:32:01 -0400 Subject: lttng-modules: update to v2.13.9 Bumping lttng-modules to version v2.13.9-4-g12f43cab, which comprises the following commits: da1f5a26 Version 2.13.9 dc2d1294 fix: jbd2: use the correct print format (v5.4.229) d04c1211 fix: jbd2 upper bound for v5.10.163 4b8864fc fix: jbd2: use the correct print format (v5.10.163) 69d3aa79 fix: btrfs: move accessor helpers into accessors.h (v6.2) We drop our previously backported commits as well, since they are part of the release. (From OE-Core rev: 28c844143b6f32313f15a2f1bb31dda4fd680714) Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 79d8e93adde07ff3a4a239d66649ee566a2437d6) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- ...ove-accessor-helpers-into-accessors.h-v6..patch | 45 ---------------- .../fix-jbd2-upper-bound-for-v5.10.163.patch | 52 ------------------ ...d2-use-the-correct-print-format-v5.10.163.patch | 61 ---------------------- meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb | 45 ---------------- meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb | 42 +++++++++++++++ 5 files changed, 42 insertions(+), 203 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb create mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch deleted file mode 100644 index 26ae605b31..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch +++ /dev/null @@ -1,45 +0,0 @@ -From 69d3aa79a641f539cfd5c11b46b2dd9b4df9b0f0 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 16 Jan 2023 15:01:51 -0500 -Subject: [PATCH] fix: btrfs: move accessor helpers into accessors.h (v6.2) - -See upstream commit : - - commit 07e81dc94474eb62705c6f96d9ab1a5a797b8703 - Author: Josef Bacik - Date: Wed Oct 19 10:51:00 2022 -0400 - - btrfs: move accessor helpers into accessors.h - - This is a large patch, but because they're all macros it's impossible to - split up. Simply copy all of the item accessors in ctree.h and paste - them in accessors.h, and then update any files to include the header so - everything compiles. - -Upstream-Status: Backport - -Change-Id: I1f0876dd8b7a8687f6802b60c3e3baabd017cc52 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/btrfs.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h -index 785f16ac..01157107 100644 ---- a/include/instrumentation/events/btrfs.h -+++ b/include/instrumentation/events/btrfs.h -@@ -9,6 +9,10 @@ - #include - #include - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0)) -+#include <../fs/btrfs/accessors.h> -+#endif -+ - #ifndef _TRACE_BTRFS_DEF_ - #define _TRACE_BTRFS_DEF_ - struct btrfs_root; --- -2.34.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch b/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch deleted file mode 100644 index bfc49294b0..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4fd2615b87b3cac0fd5bdc5fc82db05f6fcfdecf Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Tue, 17 Jan 2023 12:16:04 -0500 -Subject: [PATCH] fix: jbd2 upper bound for v5.10.163 - -Use the correct upper bound of 5,11,0. - -Change-Id: I435b44b940c7346ed8c3ef0d445365ed156702d0 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers - -Upstream-Status: Backport -Signed-off-by: Armin Kuster - ---- - include/instrumentation/events/jbd2.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h -index f7993511..9b77ab92 100644 ---- a/include/instrumentation/events/jbd2.h -+++ b/include/instrumentation/events/jbd2.h -@@ -28,7 +28,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint, - ) - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ -- || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ - || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ - || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ - || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) -@@ -97,7 +97,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction, - #endif - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ -- || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ - || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ - || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ - || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) -@@ -140,7 +140,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data, - ) - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ -- || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ - || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ - || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ - || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) --- -2.35.4 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch b/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch deleted file mode 100644 index 8067cffaab..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch +++ /dev/null @@ -1,61 +0,0 @@ -From dd7be14bd04c1de309ba267097b03a308da87dae Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Tue, 17 Jan 2023 11:03:12 -0500 -Subject: [PATCH] fix: jbd2: use the correct print format (v5.10.163) - -See upstream commit : - - commit d87a7b4c77a997d5388566dd511ca8e6b8e8a0a8 - Author: Bixuan Cui - Date: Tue Oct 11 19:33:44 2022 +0800 - - jbd2: use the correct print format - - The print format error was found when using ftrace event: - <...>-1406 [000] .... 23599442.895823: jbd2_end_commit: dev 252,8 transaction -1866216965 sync 0 head -1866217368 - <...>-1406 [000] .... 23599442.896299: jbd2_start_commit: dev 252,8 transaction -1866216964 sync 0 - - Use the correct print format for transaction, head and tid. - -Change-Id: I7601f5cbb86495c2607be7b11e02724c90b3ebf9 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers - -Upstream-Status: Backport -Signed-off-by: Armin Kuster - ---- - include/instrumentation/events/jbd2.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h -index d5d8ea0c..f7993511 100644 ---- a/include/instrumentation/events/jbd2.h -+++ b/include/instrumentation/events/jbd2.h -@@ -28,6 +28,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint, - ) - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ - || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ - || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ - || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) -@@ -96,6 +97,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction, - #endif - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ - || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ - || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ - || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) -@@ -138,6 +140,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data, - ) - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ - || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ - || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ - || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) --- -2.35.4 - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb deleted file mode 100644 index c04796be16..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb +++ /dev/null @@ -1,45 +0,0 @@ -SECTION = "devel" -SUMMARY = "Linux Trace Toolkit KERNEL MODULE" -DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" -HOMEPAGE = "https://lttng.org/" -LICENSE = "LGPL-2.1-only & GPL-2.0-only & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" - -inherit module - -include lttng-platforms.inc - -SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0009-Rename-genhd-wrapper-to-blkdev.patch \ - file://fix-jbd2-use-the-correct-print-format-v5.10.163.patch \ - file://fix-jbd2-upper-bound-for-v5.10.163.patch \ - file://0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch \ - " - -# Use :append here so that the patch is applied also when using devupstream -SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" - -SRC_URI[sha256sum] = "f525d3d48ea3a475cb535339c201666d0e4c75ec8c46d29837bcf381ea02cb19" - -export INSTALL_MOD_DIR="kernel/lttng-modules" - -EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" - -MODULES_MODULE_SYMVERS_LOCATION = "src" - -do_install:append() { - # Delete empty directories to avoid QA failures if no modules were built - if [ -d ${D}/${nonarch_base_libdir} ]; then - find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; - fi -} - -python do_package:prepend() { - if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')): - bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN')) -} - -BBCLASSEXTEND = "devupstream:target" -SRC_URI:class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13" -SRCREV:class-devupstream = "7584cfc04914cb0842a986e9808686858b9c8630" -SRCREV_FORMAT ?= "lttng_git" diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb new file mode 100644 index 0000000000..a08386b053 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb @@ -0,0 +1,42 @@ +SECTION = "devel" +SUMMARY = "Linux Trace Toolkit KERNEL MODULE" +DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" +HOMEPAGE = "https://lttng.org/" +LICENSE = "LGPL-2.1-only & GPL-2.0-only & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" + +inherit module + +include lttng-platforms.inc + +SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://0009-Rename-genhd-wrapper-to-blkdev.patch \ + " + +# Use :append here so that the patch is applied also when using devupstream +SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" + +SRC_URI[sha256sum] = "bf808b113544287cfe837a6382887fa66354ef5cc8216460cebbef3d27dc3581" + +export INSTALL_MOD_DIR="kernel/lttng-modules" + +EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" + +MODULES_MODULE_SYMVERS_LOCATION = "src" + +do_install:append() { + # Delete empty directories to avoid QA failures if no modules were built + if [ -d ${D}/${nonarch_base_libdir} ]; then + find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; + fi +} + +python do_package:prepend() { + if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')): + bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN')) +} + +BBCLASSEXTEND = "devupstream:target" +SRC_URI:class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13" +SRCREV:class-devupstream = "7584cfc04914cb0842a986e9808686858b9c8630" +SRCREV_FORMAT ?= "lttng_git" -- cgit v1.2.3-54-g00ecf