diff options
Diffstat (limited to 'poky/meta/recipes-kernel')
32 files changed, 373 insertions, 1084 deletions
diff --git a/poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch b/poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch deleted file mode 100644 index ea0570af2b..0000000000 --- a/poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch +++ /dev/null @@ -1,172 +0,0 @@ -From f50e2d67575ac5f256fb853ca9d29aeac92d9a57 Mon Sep 17 00:00:00 2001 -From: Saul Wold <saul.wold@windriver.com> -Date: Thu, 31 Mar 2022 14:56:28 -0700 -Subject: [PATCH] depmod: Add support for excluding a directory - -This adds support to depmod to enable a new exclude directive in -the depmod.d/*.conf configuration file. Currently depmod -already excludes directories named source or build. This change -will allow additional directories like .debug to be excluded also -via a new exclude directive. - -depmod.d/exclude.conf example: -exclude .debug - -Upstream-Status: Accepted - -Signed-off-by: Saul Wold <saul.wold@windriver.com> -[ Fix warnings and make should_exclude_dir() return bool ] -Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> ---- - man/depmod.d.xml | 14 ++++++++++ - tools/depmod.c | 66 +++++++++++++++++++++++++++++++++++++++++++++--- - 2 files changed, 76 insertions(+), 4 deletions(-) - -diff --git a/man/depmod.d.xml b/man/depmod.d.xml -index b315e93..76548e9 100644 ---- a/man/depmod.d.xml -+++ b/man/depmod.d.xml -@@ -131,6 +131,20 @@ - </para> - </listitem> - </varlistentry> -+ <varlistentry> -+ <term>exclude <replaceable>excludedir</replaceable> -+ </term> -+ <listitem> -+ <para> -+ This specifies the trailing directories that will be excluded -+ during the search for kernel modules. -+ </para> -+ <para> -+ The <replaceable>excludedir</replaceable> is the trailing directory -+ to exclude -+ </para> -+ </listitem> -+ </varlistentry> - </variablelist> - </refsect1> - -diff --git a/tools/depmod.c b/tools/depmod.c -index 07a35ba..4117dd1 100644 ---- a/tools/depmod.c -+++ b/tools/depmod.c -@@ -458,6 +458,11 @@ struct cfg_external { - char path[]; - }; - -+struct cfg_exclude { -+ struct cfg_exclude *next; -+ char exclude_dir[]; -+}; -+ - struct cfg { - const char *kversion; - char dirname[PATH_MAX]; -@@ -469,6 +474,7 @@ struct cfg { - struct cfg_override *overrides; - struct cfg_search *searches; - struct cfg_external *externals; -+ struct cfg_exclude *excludes; - }; - - static enum search_type cfg_define_search_type(const char *path) -@@ -580,6 +586,30 @@ static void cfg_external_free(struct cfg_external *ext) - free(ext); - } - -+static int cfg_exclude_add(struct cfg *cfg, const char *path) -+{ -+ struct cfg_exclude *exc; -+ size_t len = strlen(path); -+ -+ exc = malloc(sizeof(struct cfg_exclude) + len + 1); -+ if (exc == NULL) { -+ ERR("exclude add: out of memory\n"); -+ return -ENOMEM; -+ } -+ memcpy(exc->exclude_dir, path, len + 1); -+ -+ DBG("exclude add: %s\n", path); -+ -+ exc->next = cfg->excludes; -+ cfg->excludes = exc; -+ return 0; -+} -+ -+static void cfg_exclude_free(struct cfg_exclude *exc) -+{ -+ free(exc); -+} -+ - static int cfg_kernel_matches(const struct cfg *cfg, const char *pattern) - { - regex_t re; -@@ -657,6 +687,11 @@ static int cfg_file_parse(struct cfg *cfg, const char *filename) - } - - cfg_external_add(cfg, dir); -+ } else if (streq(cmd, "exclude")) { -+ const char *sp; -+ while ((sp = strtok_r(NULL, "\t ", &saveptr)) != NULL) { -+ cfg_exclude_add(cfg, sp); -+ } - } else if (streq(cmd, "include") - || streq(cmd, "make_map_files")) { - INF("%s:%u: command %s not implemented yet\n", -@@ -857,6 +892,12 @@ static void cfg_free(struct cfg *cfg) - cfg->externals = cfg->externals->next; - cfg_external_free(tmp); - } -+ -+ while (cfg->excludes) { -+ struct cfg_exclude *tmp = cfg->excludes; -+ cfg->excludes = cfg->excludes->next; -+ cfg_exclude_free(tmp); -+ } - } - - -@@ -1229,6 +1270,25 @@ add: - return 0; - } - -+static bool should_exclude_dir(const struct cfg *cfg, const char *name) -+{ -+ struct cfg_exclude *exc; -+ -+ if (name[0] == '.' && (name[1] == '\0' || -+ (name[1] == '.' && name[2] == '\0'))) -+ return true; -+ -+ if (streq(name, "build") || streq(name, "source")) -+ return true; -+ -+ for (exc = cfg->excludes; exc != NULL; exc = exc->next) { -+ if (streq(name, exc->exclude_dir)) -+ return true; -+ } -+ -+ return false; -+} -+ - static int depmod_modules_search_dir(struct depmod *depmod, DIR *d, size_t baselen, struct scratchbuf *s_path) - { - struct dirent *de; -@@ -1240,11 +1300,9 @@ static int depmod_modules_search_dir(struct depmod *depmod, DIR *d, size_t basel - size_t namelen; - uint8_t is_dir; - -- if (name[0] == '.' && (name[1] == '\0' || -- (name[1] == '.' && name[2] == '\0'))) -- continue; -- if (streq(name, "build") || streq(name, "source")) -+ if (should_exclude_dir(depmod->cfg, name)) - continue; -+ - namelen = strlen(name); - if (scratchbuf_alloc(s_path, baselen + namelen + 2) < 0) { - err = -ENOMEM; --- -2.31.1 - diff --git a/poky/meta/recipes-kernel/kmod/kmod_29.bb b/poky/meta/recipes-kernel/kmod/kmod_30.bb index 32dc49c126..8eb83efe6d 100644 --- a/poky/meta/recipes-kernel/kmod/kmod_29.bb +++ b/poky/meta/recipes-kernel/kmod/kmod_30.bb @@ -15,12 +15,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " inherit autotools bash-completion gtk-doc pkgconfig manpages update-alternatives -SRCREV = "b6ecfc916a17eab8f93be5b09f4e4f845aabd3d1" +SRCREV = "5d46434a63ae0160150a0efdde1914873697e273" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master \ file://depmod-search.conf \ file://avoid_parallel_tests.patch \ - file://0001-depmod-Add-support-for-excluding-a-directory.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-kernel/linux-firmware/files/0001-Makefile-replace-mkdir-by-install.patch b/poky/meta/recipes-kernel/linux-firmware/files/0001-Makefile-replace-mkdir-by-install.patch deleted file mode 100644 index b1ac5a16ab..0000000000 --- a/poky/meta/recipes-kernel/linux-firmware/files/0001-Makefile-replace-mkdir-by-install.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 71514e74f35f2b51ca24062573d6d913525b30db Mon Sep 17 00:00:00 2001 -From: Konrad Weihmann <kweihmann@outlook.com> -Date: Mon, 9 May 2022 12:57:57 +0200 -Subject: [PATCH] Makefile: replace mkdir by install - -mkdir -p creates paths that are bound to user's settings and therefore -can lead to different file mode bits of the base paths accross different -machines. -Use install instead, as this tool is not prone to such behavior. - -Signed-off-by: Konrad Weihmann <kweihmann@outlook.com> -Upstream-Status: Submitted [https://lore.kernel.org/linux-firmware/PR2PR09MB310088EA719E6D7CA5C268F1A8C69@PR2PR09MB3100.eurprd09.prod.outlook.com/] ---- - Makefile | 2 +- - carl9170fw/toolchain/Makefile | 4 ++-- - copy-firmware.sh | 6 +++--- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index e1c362f..83a0ec6 100644 ---- a/Makefile -+++ b/Makefile -@@ -9,5 +9,5 @@ check: - @./check_whence.py - - install: -- mkdir -p $(DESTDIR)$(FIRMWAREDIR) -+ install -d $(DESTDIR)$(FIRMWAREDIR) - ./copy-firmware.sh $(DESTDIR)$(FIRMWAREDIR) -diff --git a/carl9170fw/toolchain/Makefile b/carl9170fw/toolchain/Makefile -index 2b25ffe..aaea8e8 100644 ---- a/carl9170fw/toolchain/Makefile -+++ b/carl9170fw/toolchain/Makefile -@@ -46,14 +46,14 @@ src/gcc-$(GCC_VER): src/$(GCC_TAR) src/newlib-$(NEWLIB_VER) - ln -s $(BASEDIR)/src/newlib-$(NEWLIB_VER)/libgloss $@ - - binutils: src/binutils-$(BINUTILS_VER) -- mkdir -p build/binutils -+ install -d build/binutils - cd build/binutils; \ - $(BASEDIR)/$</configure --target=sh-elf --prefix=$(BASEDIR)/inst; \ - $(MAKE) -j3; \ - $(MAKE) install - - gcc: src/gcc-$(GCC_VER) binutils -- mkdir -p build/gcc -+ install -d build/gcc - cd build/gcc; \ - $(BASEDIR)/$</configure --target=sh-elf --prefix=$(BASEDIR)/inst -enable-languages=c --without-pkgversion --with-newlib; \ - $(MAKE) -j3; \ -diff --git a/copy-firmware.sh b/copy-firmware.sh -index 9b46b63..bbacb92 100755 ---- a/copy-firmware.sh -+++ b/copy-firmware.sh -@@ -34,7 +34,7 @@ done - grep '^File:' WHENCE | sed -e's/^File: *//g' -e's/"//g' | while read f; do - test -f "$f" || continue - $verbose "copying file $f" -- mkdir -p $destdir/$(dirname "$f") -+ install -d $destdir/$(dirname "$f") - cp -d "$f" $destdir/"$f" - done - -@@ -42,7 +42,7 @@ grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; d - if test -L "$f"; then - test -f "$destdir/$f" && continue - $verbose "copying link $f" -- mkdir -p $destdir/$(dirname "$f") -+ install -d $destdir/$(dirname "$f") - cp -d "$f" $destdir/"$f" - - if test "x$d" != "x"; then -@@ -63,7 +63,7 @@ grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; d - fi - else - $verbose "creating link $f -> $d" -- mkdir -p $destdir/$(dirname "$f") -+ install -d $destdir/$(dirname "$f") - ln -sf "$d" "$destdir/$f" - fi - done --- -2.25.1 - diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20220610.bb index 10a7036a19..78b38df461 100644 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb +++ b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20220610.bb @@ -69,7 +69,7 @@ LICENSE = "\ & WHENCE \ " -WHENCE_CHKSUM = "d3eb82686904888f8bbbe8d865371404" +WHENCE_CHKSUM = "385947b278a6646ae4c3d39ba8c9b1bb" LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ @@ -206,7 +206,6 @@ PE = "1" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz \ - file://0001-Makefile-replace-mkdir-by-install.patch \ " BBCLASSEXTEND = "devupstream:target" @@ -214,7 +213,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "376e0b3d7b4f8aaa2abf7f5ab74803dcf14b06b94e3d841b1467cd9a2848255e" +SRC_URI[sha256sum] = "faf3aedf89530e61f4fa1e8c7303dead9127cc24416945647797d079feb12837" inherit allarch diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index 47f09952de..71778bb4e3 100644 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -103,7 +103,7 @@ do_install_armmultilib () { BBCLASSEXTEND = "nativesdk" -RDEPENDS:${PN}-dev = "" +DEV_PKG_DEPENDENCY = "" RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" INHIBIT_DEFAULT_DEPS = "1" diff --git a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb index 9654488a54..f8f717199c 100644 --- a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -128,8 +128,12 @@ do_install() { # breaks workflows. cp -a --parents include/generated/autoconf.h $kerneldir/build 2>/dev/null || : - if [ -e $kerneldir/include/generated/.vdso-offsets.h.cmd ]; then - rm $kerneldir/include/generated/.vdso-offsets.h.cmd + if [ -e $kerneldir/include/generated/.vdso-offsets.h.cmd ] || + [ -e $kerneldir/build/include/generated/.vdso-offsets.h.cmd ] || + [ -e $kerneldir/build/include/generated/.vdso32-offsets.h.cmd ] ; then + rm -f $kerneldir/include/generated/.vdso-offsets.h.cmd + rm -f $kerneldir/build/include/generated/.vdso-offsets.h.cmd + rm -f $kerneldir/build/include/generated/.vdso32-offsets.h.cmd fi ) diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index d35632071b..5a420b7fb2 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -16,7 +16,7 @@ inherit pkgconfig # provide this .inc to set specific revisions include recipes-kernel/linux/linux-yocto-dev-revisions.inc -KBRANCH = "v5.18/standard/base" +KBRANCH = "v5.19/standard/base" KMETA = "kernel-meta" SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \ @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "5.18+" +LINUX_VERSION ?= "5.19+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index ce903a7372..53ccd41033 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "5629d552de7759e4bb9821e210f3673c14900dd0" -SRCREV_meta ?= "2f6fa8da5f84c343e6ea57c76829eaca1cc6a840" +SRCREV_machine ?= "63771123b1eea439bea2cf80f9f5682667528d9f" +SRCREV_meta ?= "96ea2660bb97e15f48f4885b9e436f24c3606bd9" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.119" +LINUX_VERSION ?= "5.10.130" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index b052db8a15..b6e443d4da 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "83bec9a458bfdfb46c5dc62342bafae2806043d4" -SRCREV_meta ?= "947149960e1426ace478e4b52c28a28ef8d6e74b" +SRCREV_machine ?= "0222cbb8d40318cf5377875017e32eebefa59ab8" +SRCREV_meta ?= "0e3a81a5aefbea03388b1235fbcc3dec278425d0" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.44" +LINUX_VERSION ?= "5.15.54" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 625cdfd085..7b3aaa7fa0 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.119" +LINUX_VERSION ?= "5.10.130" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine:qemuarm ?= "50342ca6fc7dd66bfde9dfd1d6c336f99c55e0ab" -SRCREV_machine ?= "d2cfd8b4499710877d54129a9137351a9de166fb" -SRCREV_meta ?= "2f6fa8da5f84c343e6ea57c76829eaca1cc6a840" +SRCREV_machine:qemuarm ?= "bff12aa9748d83efc518e524858913c028f0707a" +SRCREV_machine ?= "5bdf36bd73803640ee495fc6f36b0207993bf62a" +SRCREV_meta ?= "96ea2660bb97e15f48f4885b9e436f24c3606bd9" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index f6110354a0..aadf014463 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.44" +LINUX_VERSION ?= "5.15.54" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "768cd295dfc0a311d2e53c1b05e19a246e184d0e" -SRCREV_meta ?= "947149960e1426ace478e4b52c28a28ef8d6e74b" +SRCREV_machine ?= "9b1d0e5eb8b08323577f5e2b21cbb2065aba0aa1" +SRCREV_meta ?= "0e3a81a5aefbea03388b1235fbcc3dec278425d0" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb index fcb7b83cec..d5bf2c9496 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,23 +13,23 @@ KBRANCH:qemux86 ?= "v5.10/standard/base" KBRANCH:qemux86-64 ?= "v5.10/standard/base" KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "68264cfbddebea663543a7c4ad5131c6cf63d3d2" -SRCREV_machine:qemuarm64 ?= "b95be3e8c15d939ce402775de98ab80eda493b11" -SRCREV_machine:qemumips ?= "c6a8eaf00384dcce14bb9e28f2d68b5004e8c6f3" -SRCREV_machine:qemuppc ?= "6c1e46f34c6b9ababf8c6fcb4c01274099bb034f" -SRCREV_machine:qemuriscv64 ?= "f844c3765c3270321f0b3347992565cfdb938c99" -SRCREV_machine:qemuriscv32 ?= "f844c3765c3270321f0b3347992565cfdb938c99" -SRCREV_machine:qemux86 ?= "f844c3765c3270321f0b3347992565cfdb938c99" -SRCREV_machine:qemux86-64 ?= "f844c3765c3270321f0b3347992565cfdb938c99" -SRCREV_machine:qemumips64 ?= "8d66b3ad7fbc8554ba2248cfbe755f8d24cb5a1a" -SRCREV_machine ?= "f844c3765c3270321f0b3347992565cfdb938c99" -SRCREV_meta ?= "2f6fa8da5f84c343e6ea57c76829eaca1cc6a840" +SRCREV_machine:qemuarm ?= "8d513bf2294b60cbfa7bfbfab43f7ec458e88de0" +SRCREV_machine:qemuarm64 ?= "f86e70ec0a39fa6cfd5b19a013703345cf9e8d4c" +SRCREV_machine:qemumips ?= "a5c1977699a2733ed4ddd08f1bcc1cbcc1fa8862" +SRCREV_machine:qemuppc ?= "2e52a4c55beaea77e6b99720de58624c416e7569" +SRCREV_machine:qemuriscv64 ?= "2883e69e202dc7948c99a7828e192b2b42c2d90a" +SRCREV_machine:qemuriscv32 ?= "2883e69e202dc7948c99a7828e192b2b42c2d90a" +SRCREV_machine:qemux86 ?= "2883e69e202dc7948c99a7828e192b2b42c2d90a" +SRCREV_machine:qemux86-64 ?= "2883e69e202dc7948c99a7828e192b2b42c2d90a" +SRCREV_machine:qemumips64 ?= "37c7c3e8979a2b0eb75bf8ceab7f2b7f12565ceb" +SRCREV_machine ?= "2883e69e202dc7948c99a7828e192b2b42c2d90a" +SRCREV_meta ?= "96ea2660bb97e15f48f4885b9e436f24c3606bd9" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.119" +LINUX_VERSION ?= "5.10.130" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 3cb5f93a21..4c1d163a1e 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "1585df4dbb1e353cc1472748186504a377de5dce" -SRCREV_machine:qemuarm64 ?= "363482e730cbf7f772430c99c83f60ddc01d7518" -SRCREV_machine:qemumips ?= "f534cfa2119dc7cf07d546d9fed2b822af1bc838" -SRCREV_machine:qemuppc ?= "c019857d9af595336bb272c981150952b87d2639" -SRCREV_machine:qemuriscv64 ?= "eb3df10e3f3146911fc3235c458c8ef1660ae9df" -SRCREV_machine:qemuriscv32 ?= "eb3df10e3f3146911fc3235c458c8ef1660ae9df" -SRCREV_machine:qemux86 ?= "eb3df10e3f3146911fc3235c458c8ef1660ae9df" -SRCREV_machine:qemux86-64 ?= "eb3df10e3f3146911fc3235c458c8ef1660ae9df" -SRCREV_machine:qemumips64 ?= "a26ad766d7372a98d4d1f11d50953c45782f3a37" -SRCREV_machine ?= "eb3df10e3f3146911fc3235c458c8ef1660ae9df" -SRCREV_meta ?= "947149960e1426ace478e4b52c28a28ef8d6e74b" +SRCREV_machine:qemuarm ?= "c284142affccb534122ad93bdcd4774af161d767" +SRCREV_machine:qemuarm64 ?= "c4c194a34c568c17389120608b2ee8a7a988150a" +SRCREV_machine:qemumips ?= "7b446965d9659d312952ef4dedf5b50a493e60c2" +SRCREV_machine:qemuppc ?= "0c2a4ad856c8f0c1b3ca8a38c17e1194f47e4643" +SRCREV_machine:qemuriscv64 ?= "a40d2daf2795d89e3ef8af0413b25190558831ec" +SRCREV_machine:qemuriscv32 ?= "a40d2daf2795d89e3ef8af0413b25190558831ec" +SRCREV_machine:qemux86 ?= "a40d2daf2795d89e3ef8af0413b25190558831ec" +SRCREV_machine:qemux86-64 ?= "a40d2daf2795d89e3ef8af0413b25190558831ec" +SRCREV_machine:qemumips64 ?= "9a8d4e00df67daf224ae62b238c151a3f3f70ae7" +SRCREV_machine ?= "a40d2daf2795d89e3ef8af0413b25190558831ec" +SRCREV_meta ?= "0e3a81a5aefbea03388b1235fbcc3dec278425d0" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "4e67be407725b1d8b829ed2075987037abec98ec" +SRCREV_machine:class-devupstream ?= "843dae1756d9bddee21a96827784791fd97d484e" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.44" +LINUX_VERSION ?= "5.15.54" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-compaction-migratepages-event-name.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-compaction-migratepages-event-name.patch deleted file mode 100644 index e988f7a3d5..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-compaction-migratepages-event-name.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c312bda00d2dc10ce5f6c1189acbefee5c6c8c6c Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Tue, 29 Mar 2022 16:34:07 -0400 -Subject: [PATCH 01/10] Fix: compaction migratepages event name - -The commit "fix: mm: compaction: fix the migration stats in trace_mm_compaction_migratepages() (v5.17)" - -Triggers this warning: - - LTTng: event provider mismatch: The event name needs to start with provider name + _ + one or more letter, provider: compaction, event name: mm_compaction_migratepages - -Upstream-Status: Backport - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Change-Id: I01c7485af765084dafb33bf33ae392e60bfbf1e7 ---- - include/instrumentation/events/compaction.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/instrumentation/events/compaction.h b/include/instrumentation/events/compaction.h -index 340e41f5..15964537 100644 ---- a/include/instrumentation/events/compaction.h -+++ b/include/instrumentation/events/compaction.h -@@ -98,7 +98,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template, - #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) --LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, -+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, -+ -+ compaction_migratepages, - - TP_PROTO(unsigned long nr_all, - unsigned int nr_succeeded), --- -2.19.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch new file mode 100644 index 0000000000..62376806c8 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch @@ -0,0 +1,106 @@ +From 8d5da4d2a3d7d9173208f4e8dc7a709f0bfc9820 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Wed, 8 Jun 2022 12:56:36 -0400 +Subject: [PATCH 1/3] fix: mm/page_alloc: fix tracepoint + mm_page_alloc_zone_locked() (v5.19) + +See upstream commit : + + commit 10e0f7530205799e7e971aba699a7cb3a47456de + Author: Wonhyuk Yang <vvghjk1234@gmail.com> + Date: Thu May 19 14:08:54 2022 -0700 + + mm/page_alloc: fix tracepoint mm_page_alloc_zone_locked() + + Currently, trace point mm_page_alloc_zone_locked() doesn't show correct + information. + + First, when alloc_flag has ALLOC_HARDER/ALLOC_CMA, page can be allocated + from MIGRATE_HIGHATOMIC/MIGRATE_CMA. Nevertheless, tracepoint use + requested migration type not MIGRATE_HIGHATOMIC and MIGRATE_CMA. + + Second, after commit 44042b4498728 ("mm/page_alloc: allow high-order pages + to be stored on the per-cpu lists") percpu-list can store high order + pages. But trace point determine whether it is a refiil of percpu-list by + comparing requested order and 0. + + To handle these problems, make mm_page_alloc_zone_locked() only be called + by __rmqueue_smallest with correct migration type. With a new argument + called percpu_refill, it can show roughly whether it is a refill of + percpu-list. + +Upstream-Status: Backport + +Change-Id: I2e4a57393757f12b9c5a4566c4d1102ee2474a09 +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + include/instrumentation/events/kmem.h | 45 +++++++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +diff --git a/include/instrumentation/events/kmem.h b/include/instrumentation/events/kmem.h +index 29c0fb7f..8c19e962 100644 +--- a/include/instrumentation/events/kmem.h ++++ b/include/instrumentation/events/kmem.h +@@ -218,6 +218,50 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc, + ) + ) + ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) ++LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, ++ ++ TP_PROTO(struct page *page, unsigned int order, int migratetype, ++ int percpu_refill), ++ ++ TP_ARGS(page, order, migratetype, percpu_refill), ++ ++ TP_FIELDS( ++ ctf_integer_hex(struct page *, page, page) ++ ctf_integer(unsigned long, pfn, ++ page ? page_to_pfn(page) : -1UL) ++ ctf_integer(unsigned int, order, order) ++ ctf_integer(int, migratetype, migratetype) ++ ctf_integer(int, percpu_refill, percpu_refill) ++ ) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_alloc_zone_locked, ++ ++ kmem_mm_page_alloc_zone_locked, ++ ++ TP_PROTO(struct page *page, unsigned int order, int migratetype, ++ int percpu_refill), ++ ++ TP_ARGS(page, order, migratetype, percpu_refill) ++) ++ ++LTTNG_TRACEPOINT_EVENT_MAP(mm_page_pcpu_drain, ++ ++ kmem_mm_page_pcpu_drain, ++ ++ TP_PROTO(struct page *page, unsigned int order, int migratetype), ++ ++ TP_ARGS(page, order, migratetype), ++ ++ TP_FIELDS( ++ ctf_integer(unsigned long, pfn, ++ page ? page_to_pfn(page) : -1UL) ++ ctf_integer(unsigned int, order, order) ++ ctf_integer(int, migratetype, migratetype) ++ ) ++) ++#else + LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, + + TP_PROTO(struct page *page, unsigned int order, int migratetype), +@@ -250,6 +294,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_pcpu_drain, + + TP_ARGS(page, order, migratetype) + ) ++#endif + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,2) \ + || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \ +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch deleted file mode 100644 index d27cbc314f..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 13e4c978d45237b8780f1de6d404812b3af26a49 Mon Sep 17 00:00:00 2001 -From: He Zhe <zhe.he@windriver.com> -Date: Thu, 2 Jun 2022 06:36:08 +0000 -Subject: [PATCH] fix: random: remove unused tracepoints (v5.10, v5.15) - -The following kernel commit has been back ported to v5.10.119 and v5.15.44. - -commit 14c174633f349cb41ea90c2c0aaddac157012f74 -Author: Jason A. Donenfeld <Jason@zx2c4.com> -Date: Thu Feb 10 16:40:44 2022 +0100 - - random: remove unused tracepoints - - These explicit tracepoints aren't really used and show sign of aging. - It's work to keep these up to date, and before I attempted to keep them - up to date, they weren't up to date, which indicates that they're not - really used. These days there are better ways of introspecting anyway. - -Upstream-Status: Pending - -Signed-off-by: He Zhe <zhe.he@windriver.com> ---- - src/probes/Kbuild | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/probes/Kbuild b/src/probes/Kbuild -index 5478447..31e0ee8 100644 ---- a/src/probes/Kbuild -+++ b/src/probes/Kbuild -@@ -204,7 +204,10 @@ endif - - # Introduced in v3.6, remove in v5.18 - obj-$(CONFIG_LTTNG) += $(shell \ -- if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \ -+ if [ \( ! \( $(VERSION) -ge 6 \ -+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \ -+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 15 -a $(SUBLEVEL) -ge 44 \) \ -+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 10 -a $(SUBLEVEL) -ge 119 \) \) \) \ - -a \ - $(VERSION) -ge 4 \ - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ --- -2.32.0 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch deleted file mode 100644 index b41053b6bc..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9c5b8de32b5745f3ff31079c02da64595e101bee Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Tue, 17 May 2022 11:46:29 -0400 -Subject: [PATCH] fix: sched/tracing: Append prev_state to tp args instead - (v5.18) - -See upstream commit : - - commit 9c2136be0878c88c53dea26943ce40bb03ad8d8d - Author: Delyan Kratunov <delyank@fb.com> - Date: Wed May 11 18:28:36 2022 +0000 - - sched/tracing: Append prev_state to tp args instead - - Commit fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting - sched_switch event, 2022-01-20) added a new prev_state argument to the - sched_switch tracepoint, before the prev task_struct pointer. - - This reordering of arguments broke BPF programs that use the raw - tracepoint (e.g. tp_btf programs). The type of the second argument has - changed and existing programs that assume a task_struct* argument - (e.g. for bpf_task_storage access) will now fail to verify. - - If we instead append the new argument to the end, all existing programs - would continue to work and can conditionally extract the prev_state - argument on supported kernel versions. - - -Upstream-Status: Backport - -Change-Id: Ife2ec88a8bea2743562590cbd357068d7773863f -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - include/instrumentation/events/sched.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h -index 339bec94..c1c3df15 100644 ---- a/include/instrumentation/events/sched.h -+++ b/include/instrumentation/events/sched.h -@@ -356,11 +356,11 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new, - LTTNG_TRACEPOINT_EVENT(sched_switch, - - TP_PROTO(bool preempt, -- unsigned int prev_state, - struct task_struct *prev, -- struct task_struct *next), -+ struct task_struct *next, -+ unsigned int prev_state), - -- TP_ARGS(preempt, prev_state, prev, next), -+ TP_ARGS(preempt, prev, next, prev_state), - - TP_FIELDS( - ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) --- -2.19.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch deleted file mode 100644 index 00367eebf8..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a7eb2e3d0a4beb1ee80b132927641dd05ef2d542 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Mon, 4 Apr 2022 15:49:32 -0400 -Subject: [PATCH 02/10] Fix: tracepoint event: allow same provider and event - name - -Using the same name for the provider (TRACE_SYSTEM) and event name -causes a compilation error because the same identifiers are emitted -twice. - -Fix this by prefixing the provider identifier with -"__provider_event_desc___". - -Upstream-Status: Backport - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Change-Id: I8cdf8f859e35b8bd5c19737860d12f1ed546dfc2 ---- - include/lttng/tracepoint-event-impl.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h -index 38b1dc43..dcb22247 100644 ---- a/include/lttng/tracepoint-event-impl.h -+++ b/include/lttng/tracepoint-event-impl.h -@@ -1255,7 +1255,7 @@ static const struct lttng_kernel_event_desc __event_desc___##_map = { \ - #define TP_ID1(_token, _system) _token##_system - #define TP_ID(_token, _system) TP_ID1(_token, _system) - --static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE_SYSTEM)[] = { -+static const struct lttng_kernel_event_desc * const TP_ID(__provider_event_desc___, TRACE_SYSTEM)[] = { - #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) - }; - -@@ -1274,8 +1274,8 @@ static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE - /* non-const because list head will be modified when registered. */ - static __used struct lttng_kernel_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { - .provider_name = __stringify(TRACE_SYSTEM), -- .event_desc = TP_ID(__event_desc___, TRACE_SYSTEM), -- .nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)), -+ .event_desc = TP_ID(__provider_event_desc___, TRACE_SYSTEM), -+ .nr_events = ARRAY_SIZE(TP_ID(__provider_event_desc___, TRACE_SYSTEM)), - .head = { NULL, NULL }, - .lazy_init_head = { NULL, NULL }, - .lazy = 0, --- -2.19.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch new file mode 100644 index 0000000000..84c97d5f90 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch @@ -0,0 +1,76 @@ +From b5d1c38665cd69d7d1c94231fe0609da5c8afbc3 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Wed, 8 Jun 2022 13:07:59 -0400 +Subject: [PATCH 2/3] fix: fs: Remove flags parameter from aops->write_begin + (v5.19) + +See upstream commit : + + commit 9d6b0cd7579844761ed68926eb3073bab1dca87b + Author: Matthew Wilcox (Oracle) <willy@infradead.org> + Date: Tue Feb 22 14:31:43 2022 -0500 + + fs: Remove flags parameter from aops->write_begin + + There are no more aop flags left, so remove the parameter. + +Upstream-Status: Backport + +Change-Id: I82725b93e13d749f52a631b2ac60df81a5e839f8 +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + include/instrumentation/events/ext4.h | 30 +++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h +index 513762c0..222416ec 100644 +--- a/include/instrumentation/events/ext4.h ++++ b/include/instrumentation/events/ext4.h +@@ -122,6 +122,35 @@ LTTNG_TRACEPOINT_EVENT(ext4_begin_ordered_truncate, + ) + ) + ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) ++LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin, ++ ++ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), ++ ++ TP_ARGS(inode, pos, len), ++ ++ TP_FIELDS( ++ ctf_integer(dev_t, dev, inode->i_sb->s_dev) ++ ctf_integer(ino_t, ino, inode->i_ino) ++ ctf_integer(loff_t, pos, pos) ++ ctf_integer(unsigned int, len, len) ++ ) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_write_begin, ++ ++ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), ++ ++ TP_ARGS(inode, pos, len) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin, ++ ++ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), ++ ++ TP_ARGS(inode, pos, len) ++) ++#else + LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin, + + TP_PROTO(struct inode *inode, loff_t pos, unsigned int len, +@@ -153,6 +182,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin, + + TP_ARGS(inode, pos, len, flags) + ) ++#endif + + LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_end, + TP_PROTO(struct inode *inode, loff_t pos, unsigned int len, +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch deleted file mode 100644 index afe514de82..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 8e52fd71e693619f7a58de2692e59f0c826e9988 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Mon, 4 Apr 2022 13:52:57 -0400 -Subject: [PATCH 03/10] fix: sched/tracing: Don't re-read p->state when - emitting sched_switch event (v5.18) - -See upstream commit : - - commit fa2c3254d7cfff5f7a916ab928a562d1165f17bb - Author: Valentin Schneider <valentin.schneider@arm.com> - Date: Thu Jan 20 16:25:19 2022 +0000 - - sched/tracing: Don't re-read p->state when emitting sched_switch event - - As of commit - - c6e7bd7afaeb ("sched/core: Optimize ttwu() spinning on p->on_cpu") - - the following sequence becomes possible: - - p->__state = TASK_INTERRUPTIBLE; - __schedule() - deactivate_task(p); - ttwu() - READ !p->on_rq - p->__state=TASK_WAKING - trace_sched_switch() - __trace_sched_switch_state() - task_state_index() - return 0; - - TASK_WAKING isn't in TASK_REPORT, so the task appears as TASK_RUNNING in - the trace event. - - Prevent this by pushing the value read from __schedule() down the trace - event. - -Upstream-Status: Backport - -Change-Id: I46743cd006be4b4d573cae2d77df7d6d16744d04 -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - include/instrumentation/events/sched.h | 88 +++++++++++++++++++++++--- - 1 file changed, 78 insertions(+), 10 deletions(-) - -diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h -index 91953a6f..339bec94 100644 ---- a/include/instrumentation/events/sched.h -+++ b/include/instrumentation/events/sched.h -@@ -20,7 +20,37 @@ - #ifndef _TRACE_SCHED_DEF_ - #define _TRACE_SCHED_DEF_ - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+ -+static inline long __trace_sched_switch_state(bool preempt, -+ unsigned int prev_state, -+ struct task_struct *p) -+{ -+ unsigned int state; -+ -+#ifdef CONFIG_SCHED_DEBUG -+ BUG_ON(p != current); -+#endif /* CONFIG_SCHED_DEBUG */ -+ -+ /* -+ * Preemption ignores task state, therefore preempted tasks are always -+ * RUNNING (we will not have dequeued if state != RUNNING). -+ */ -+ if (preempt) -+ return TASK_REPORT_MAX; -+ -+ /* -+ * task_state_index() uses fls() and returns a value from 0-8 range. -+ * Decrement it by 1 (except TASK_RUNNING state i.e 0) before using -+ * it for left shift operation to get the correct task->state -+ * mapping. -+ */ -+ state = __task_state_index(prev_state, p->exit_state); -+ -+ return state ? (1 << (state - 1)) : state; -+} -+ -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0)) - - static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p) - { -@@ -321,43 +351,81 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new, - /* - * Tracepoint for task switches, performed by the scheduler: - */ -+ -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) - LTTNG_TRACEPOINT_EVENT(sched_switch, - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) - TP_PROTO(bool preempt, -- struct task_struct *prev, -- struct task_struct *next), -+ unsigned int prev_state, -+ struct task_struct *prev, -+ struct task_struct *next), - -- TP_ARGS(preempt, prev, next), -+ TP_ARGS(preempt, prev_state, prev, next), -+ -+ TP_FIELDS( -+ ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) -+ ctf_integer(pid_t, prev_tid, prev->pid) -+ ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) -+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM -+ ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev)) - #else -- TP_PROTO(struct task_struct *prev, -+ ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev)) -+#endif -+ ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN) -+ ctf_integer(pid_t, next_tid, next->pid) -+ ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO) -+ ) -+) -+ -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) -+ -+LTTNG_TRACEPOINT_EVENT(sched_switch, -+ -+ TP_PROTO(bool preempt, -+ struct task_struct *prev, - struct task_struct *next), - -- TP_ARGS(prev, next), --#endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) */ -+ TP_ARGS(preempt, prev, next), - - TP_FIELDS( - ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) - ctf_integer(pid_t, prev_tid, prev->pid) - ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) - #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM - ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev)) - #else - ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev)) - #endif -+ ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN) -+ ctf_integer(pid_t, next_tid, next->pid) -+ ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO) -+ ) -+) -+ - #else -+ -+LTTNG_TRACEPOINT_EVENT(sched_switch, -+ -+ TP_PROTO(struct task_struct *prev, -+ struct task_struct *next), -+ -+ TP_ARGS(prev, next), -+ -+ TP_FIELDS( -+ ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) -+ ctf_integer(pid_t, prev_tid, prev->pid) -+ ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) - #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM - ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(prev)) - #else - ctf_integer(long, prev_state, __trace_sched_switch_state(prev)) --#endif - #endif - ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN) - ctf_integer(pid_t, next_tid, next->pid) - ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO) - ) - ) -+#endif - - /* - * Tracepoint for a task being migrated: --- -2.19.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch new file mode 100644 index 0000000000..63f9c40d92 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch @@ -0,0 +1,124 @@ +From 526f13c844cd29f89bd3e924867d9ddfe3c40ade Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Wed, 15 Jun 2022 12:07:16 -0400 +Subject: [PATCH 3/3] fix: workqueue: Fix type of cpu in trace event (v5.19) + +See upstream commit : + + commit 873a400938b31a1e443c4d94b560b78300787540 + Author: Wonhyuk Yang <vvghjk1234@gmail.com> + Date: Wed May 4 11:32:03 2022 +0900 + + workqueue: Fix type of cpu in trace event + + The trace event "workqueue_queue_work" use unsigned int type for + req_cpu, cpu. This casue confusing cpu number like below log. + + $ cat /sys/kernel/debug/tracing/trace + cat-317 [001] ...: workqueue_queue_work: ... req_cpu=8192 cpu=4294967295 + + So, change unsigned type to signed type in the trace event. After + applying this patch, cpu number will be printed as -1 instead of + 4294967295 as folllows. + + $ cat /sys/kernel/debug/tracing/trace + cat-1338 [002] ...: workqueue_queue_work: ... req_cpu=8192 cpu=-1 + +Upstream-Status: Backport + +Change-Id: I478083c350b6ec314d87e9159dc5b342b96daed7 +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + include/instrumentation/events/workqueue.h | 49 ++++++++++++++++++++-- + 1 file changed, 46 insertions(+), 3 deletions(-) + +diff --git a/include/instrumentation/events/workqueue.h b/include/instrumentation/events/workqueue.h +index 023b65a8..5693cf89 100644 +--- a/include/instrumentation/events/workqueue.h ++++ b/include/instrumentation/events/workqueue.h +@@ -28,10 +28,35 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, + ) + ) + ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) + /** + * workqueue_queue_work - called when a work gets queued + * @req_cpu: the requested cpu +- * @cwq: pointer to struct cpu_workqueue_struct ++ * @pwq: pointer to struct pool_workqueue ++ * @work: pointer to struct work_struct ++ * ++ * This event occurs when a work is queued immediately or once a ++ * delayed work is actually queued on a workqueue (ie: once the delay ++ * has been reached). ++ */ ++LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, ++ ++ TP_PROTO(int req_cpu, struct pool_workqueue *pwq, ++ struct work_struct *work), ++ ++ TP_ARGS(req_cpu, pwq, work), ++ ++ TP_FIELDS( ++ ctf_integer_hex(void *, work, work) ++ ctf_integer_hex(void *, function, work->func) ++ ctf_integer(int, req_cpu, req_cpu) ++ ) ++) ++#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0)) ++/** ++ * workqueue_queue_work - called when a work gets queued ++ * @req_cpu: the requested cpu ++ * @pwq: pointer to struct pool_workqueue + * @work: pointer to struct work_struct + * + * This event occurs when a work is queued immediately or once a +@@ -40,17 +65,34 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, + */ + LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, + +-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0)) + TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq, + struct work_struct *work), + + TP_ARGS(req_cpu, pwq, work), ++ ++ TP_FIELDS( ++ ctf_integer_hex(void *, work, work) ++ ctf_integer_hex(void *, function, work->func) ++ ctf_integer(unsigned int, req_cpu, req_cpu) ++ ) ++) + #else ++/** ++ * workqueue_queue_work - called when a work gets queued ++ * @req_cpu: the requested cpu ++ * @cwq: pointer to struct cpu_workqueue_struct ++ * @work: pointer to struct work_struct ++ * ++ * This event occurs when a work is queued immediately or once a ++ * delayed work is actually queued on a workqueue (ie: once the delay ++ * has been reached). ++ */ ++LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, ++ + TP_PROTO(unsigned int req_cpu, struct cpu_workqueue_struct *cwq, + struct work_struct *work), + + TP_ARGS(req_cpu, cwq, work), +-#endif + + TP_FIELDS( + ctf_integer_hex(void *, work, work) +@@ -58,6 +100,7 @@ LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, + ctf_integer(unsigned int, req_cpu, req_cpu) + ) + ) ++#endif + + /** + * workqueue_activate_work - called when a work gets activated +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch deleted file mode 100644 index 9248ffe4ff..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 868e0b6db59159197c2cec3550fa4ad5e6572bc5 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Mon, 4 Apr 2022 13:54:59 -0400 -Subject: [PATCH 04/10] fix: block: remove genhd.h (v5.18) - -See upstream commit : - - commit 322cbb50de711814c42fb088f6d31901502c711a - Author: Christoph Hellwig <hch@lst.de> - Date: Mon Jan 24 10:39:13 2022 +0100 - - block: remove genhd.h - - There is no good reason to keep genhd.h separate from the main blkdev.h - header that includes it. So fold the contents of genhd.h into blkdev.h - and remove genhd.h entirely. - -Upstream-Status: Backport - -Change-Id: I7cf2aaa3a4c133320b95f2edde49f790f9515dbd -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - include/wrapper/genhd.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/wrapper/genhd.h b/include/wrapper/genhd.h -index 3c6dbcbe..4a59b68e 100644 ---- a/include/wrapper/genhd.h -+++ b/include/wrapper/genhd.h -@@ -12,7 +12,11 @@ - #ifndef _LTTNG_WRAPPER_GENHD_H - #define _LTTNG_WRAPPER_GENHD_H - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+#include <linux/blkdev.h> -+#else - #include <linux/genhd.h> -+#endif - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) - #define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN --- -2.19.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch deleted file mode 100644 index 0751827613..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 2bc7cb7193124d20aa4e1b5dbad0410bfb97a470 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Mon, 4 Apr 2022 14:12:13 -0400 -Subject: [PATCH 05/10] fix: scsi: block: Remove REQ_OP_WRITE_SAME support - (v5.18) - -See upstream commit : - - commit 73bd66d9c834220579c881a3eb020fd8917075d8 - Author: Christoph Hellwig <hch@lst.de> - Date: Wed Feb 9 09:28:28 2022 +0100 - - scsi: block: Remove REQ_OP_WRITE_SAME support - - No more users of REQ_OP_WRITE_SAME or drivers implementing it are left, - so remove the infrastructure. - -Upstream-Status: Backport - -Change-Id: Ifbff71f79f8b590436fc7cb79f82d90c6e033d84 -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - include/instrumentation/events/block.h | 32 ++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h -index 3e1104d7..050a59a2 100644 ---- a/include/instrumentation/events/block.h -+++ b/include/instrumentation/events/block.h -@@ -66,6 +66,37 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type, - #define lttng_bio_op(bio) bio_op(bio) - #define lttng_bio_rw(bio) ((bio)->bi_opf) - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM -+#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ -+ ctf_enum(block_rq_type, type, rwbs, \ -+ ( (op) == REQ_OP_WRITE ? RWBS_FLAG_WRITE : \ -+ ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \ -+ ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \ -+ ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \ -+ ( (op) == REQ_OP_READ ? RWBS_FLAG_READ : \ -+ ( 0 )))))) \ -+ | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \ -+ | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \ -+ | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \ -+ | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \ -+ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) -+#else -+#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ -+ ctf_integer(type, rwbs, \ -+ ( (op) == REQ_OP_WRITE ? RWBS_FLAG_WRITE : \ -+ ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \ -+ ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \ -+ ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \ -+ ( (op) == REQ_OP_READ ? RWBS_FLAG_READ : \ -+ ( 0 )))))) \ -+ | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \ -+ | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \ -+ | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \ -+ | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \ -+ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) -+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */ -+#else - #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM - #define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ - ctf_enum(block_rq_type, type, rwbs, \ -@@ -95,6 +126,7 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type, - | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \ - | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) - #endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */ -+#endif - - #elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0)) - --- -2.19.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0006-fix-random-remove-unused-tracepoints-v5.18.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0006-fix-random-remove-unused-tracepoints-v5.18.patch deleted file mode 100644 index 9c2f70d4af..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0006-fix-random-remove-unused-tracepoints-v5.18.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 369d82bb1746447514c877088d7c5fd0f39140f8 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Mon, 4 Apr 2022 14:33:42 -0400 -Subject: [PATCH 06/10] fix: random: remove unused tracepoints (v5.18) - -See upstream commit : - - commit 14c174633f349cb41ea90c2c0aaddac157012f74 - Author: Jason A. Donenfeld <Jason@zx2c4.com> - Date: Thu Feb 10 16:40:44 2022 +0100 - - random: remove unused tracepoints - - These explicit tracepoints aren't really used and show sign of aging. - It's work to keep these up to date, and before I attempted to keep them - up to date, they weren't up to date, which indicates that they're not - really used. These days there are better ways of introspecting anyway. - -Upstream-Status: Backport - -Change-Id: I3b8c3e2732e7efdd76ce63204ac53a48784d0df6 -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - src/probes/Kbuild | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/probes/Kbuild b/src/probes/Kbuild -index e26b4359..8d6ff0f2 100644 ---- a/src/probes/Kbuild -+++ b/src/probes/Kbuild -@@ -187,8 +187,11 @@ ifneq ($(CONFIG_FRAME_WARN),0) - CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200 - endif - -+# Introduced in v3.6, remove in v5.18 - obj-$(CONFIG_LTTNG) += $(shell \ -- if [ $(VERSION) -ge 4 \ -+ if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \ -+ -a \ -+ $(VERSION) -ge 4 \ - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \ - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \ --- -2.19.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch deleted file mode 100644 index effd37ffe1..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3c46ddc134621dba65030263aa321dd6bdae3ba3 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Mon, 4 Apr 2022 15:02:10 -0400 -Subject: [PATCH 07/10] fix: kprobes: Use rethook for kretprobe if possible - (v5.18) - -See upstream commit : - - commit 73f9b911faa74ac5107879de05c9489c419f41bb - Author: Masami Hiramatsu <mhiramat@kernel.org> - Date: Sat Mar 26 11:27:05 2022 +0900 - - kprobes: Use rethook for kretprobe if possible - - Use rethook for kretprobe function return hooking if the arch sets - CONFIG_HAVE_RETHOOK=y. In this case, CONFIG_KRETPROBE_ON_RETHOOK is - set to 'y' automatically, and the kretprobe internal data fields - switches to use rethook. If not, it continues to use kretprobe - specific function return hooks. - -Upstream-Status: Backport - -Change-Id: I2b7670dc04e4769c1e3c372582ad2f555f6d7a66 -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - include/wrapper/kprobes.h | 17 +++++++++++++++++ - src/probes/lttng-kretprobes.c | 2 +- - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/include/wrapper/kprobes.h b/include/wrapper/kprobes.h -index b546d615..51d32b7c 100644 ---- a/include/wrapper/kprobes.h -+++ b/include/wrapper/kprobes.h -@@ -29,4 +29,21 @@ struct kretprobe *lttng_get_kretprobe(struct kretprobe_instance *ri) - - #endif /* LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) */ - -+ -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+static inline -+unsigned long lttng_get_kretprobe_retaddr(struct kretprobe_instance *ri) -+{ -+ return get_kretprobe_retaddr(ri); -+} -+ -+#else -+ -+static inline -+unsigned long lttng_get_kretprobe_retaddr(struct kretprobe_instance *ri) -+{ -+ return (unsigned long) ri->ret_addr; -+} -+#endif -+ - #endif /* _LTTNG_WRAPPER_KPROBES_H */ -diff --git a/src/probes/lttng-kretprobes.c b/src/probes/lttng-kretprobes.c -index 5cb2e953..565df739 100644 ---- a/src/probes/lttng-kretprobes.c -+++ b/src/probes/lttng-kretprobes.c -@@ -81,7 +81,7 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi, - int ret; - - payload.ip = (unsigned long) lttng_get_kretprobe(krpi)->kp.addr; -- payload.parent_ip = (unsigned long) krpi->ret_addr; -+ payload.parent_ip = lttng_get_kretprobe_retaddr(krpi); - - lib_ring_buffer_ctx_init(&ctx, event_recorder, sizeof(payload), - lttng_alignof(payload), <tng_probe_ctx); --- -2.19.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch deleted file mode 100644 index 13c504b859..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e8d2f286b5b208ac8870d0a9c167b170e96169b3 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Mon, 4 Apr 2022 15:08:48 -0400 -Subject: [PATCH 08/10] fix: scsi: core: Remove <scsi/scsi_request.h> (v5.18) - -See upstream commit : - - commit 26440303310591e29121964ede0048583cb3126d - Author: Christoph Hellwig <hch@lst.de> - Date: Thu Feb 24 18:55:52 2022 +0100 - - scsi: core: Remove <scsi/scsi_request.h> - - This header is empty now except for an include of <linux/blk-mq.h>, so - remove it. - -Upstream-Status: Backport - -Change-Id: Ic8ee3352f1e8bddfcd44c31be9b788db82f183aa -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - include/instrumentation/events/block.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h -index 050a59a2..882e6e08 100644 ---- a/include/instrumentation/events/block.h -+++ b/include/instrumentation/events/block.h -@@ -11,9 +11,9 @@ - #include <linux/trace_seq.h> - #include <lttng/kernel-version.h> - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) -+#if LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) - #include <scsi/scsi_request.h> --#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */ -+#endif /* LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) */ - - #ifndef _TRACE_BLOCK_DEF_ - #define _TRACE_BLOCK_DEF_ --- -2.19.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch deleted file mode 100644 index 892d3f0d23..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch +++ /dev/null @@ -1,106 +0,0 @@ -From f9208dc00756dfa0a2f191799722030bdf3f793d Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Mon, 4 Apr 2022 15:14:01 -0400 -Subject: [PATCH 10/10] fix: mm: compaction: cleanup the compaction trace - events (v5.18) - -See upstream commit : - - commit abd4349ff9b8d242376b67711254221f64f447c7 - Author: Baolin Wang <baolin.wang@linux.alibaba.com> - Date: Tue Mar 22 14:45:56 2022 -0700 - - mm: compaction: cleanup the compaction trace events - - As Steven suggested [1], we should access the pointers from the trace - event to avoid dereferencing them to the tracepoint function when the - tracepoint is disabled. - - [1] https://lkml.org/lkml/2021/11/3/409 - -Upstream-Status: Backport - -Change-Id: I6c08250df8596e8dbc76780ae5d95c899c12e6fe -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - include/instrumentation/events/compaction.h | 17 ++++++++++++++++- - src/probes/Kbuild | 17 ++++++++++++++++- - src/probes/lttng-probe-compaction.c | 5 +++++ - 3 files changed, 37 insertions(+), 2 deletions(-) - -diff --git a/include/instrumentation/events/compaction.h b/include/instrumentation/events/compaction.h -index 15964537..ecae39a8 100644 ---- a/include/instrumentation/events/compaction.h -+++ b/include/instrumentation/events/compaction.h -@@ -97,7 +97,22 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template, - - #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, -+ -+ compaction_migratepages, -+ -+ TP_PROTO(struct compact_control *cc, -+ unsigned int nr_succeeded), -+ -+ TP_ARGS(cc, nr_succeeded), -+ -+ TP_FIELDS( -+ ctf_integer(unsigned long, nr_migrated, nr_succeeded) -+ ctf_integer(unsigned long, nr_failed, cc->nr_migratepages - nr_succeeded) -+ ) -+) -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) - LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, - - compaction_migratepages, -diff --git a/src/probes/Kbuild b/src/probes/Kbuild -index 8d6ff0f2..54784477 100644 ---- a/src/probes/Kbuild -+++ b/src/probes/Kbuild -@@ -167,7 +167,22 @@ ifneq ($(CONFIG_BTRFS_FS),) - endif # $(wildcard $(btrfs_dep)) - endif # CONFIG_BTRFS_FS - --obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o -+# A dependency on internal header 'mm/internal.h' was introduced in v5.18 -+compaction_dep = $(srctree)/mm/internal.h -+compaction_dep_wildcard = $(wildcard $(compaction_dep)) -+compaction_dep_check = $(shell \ -+if [ \( $(VERSION) -ge 6 \ -+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \ -+ -z "$(compaction_dep_wildcard)" ] ; then \ -+ echo "warn" ; \ -+else \ -+ echo "ok" ; \ -+fi ;) -+ifeq ($(compaction_dep_check),ok) -+ obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o -+else -+ $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.) -+endif # $(wildcard $(compaction_dep)) - - ifneq ($(CONFIG_EXT4_FS),) - ext4_dep = $(srctree)/fs/ext4/*.h -diff --git a/src/probes/lttng-probe-compaction.c b/src/probes/lttng-probe-compaction.c -index f8ddf384..ffaf45f0 100644 ---- a/src/probes/lttng-probe-compaction.c -+++ b/src/probes/lttng-probe-compaction.c -@@ -10,6 +10,11 @@ - - #include <linux/module.h> - #include <lttng/tracer.h> -+#include <lttng/kernel-version.h> -+ -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+#include "../mm/internal.h" -+#endif - - /* - * Create the tracepoint static inlines from the kernel to validate that our --- -2.19.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb index e049bdc6d2..ea2ec3c380 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb @@ -10,24 +10,16 @@ inherit module include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Fix-compaction-migratepages-event-name.patch \ - file://0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch \ - file://0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch \ - file://0004-fix-block-remove-genhd.h-v5.18.patch \ - file://0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch \ - file://0006-fix-random-remove-unused-tracepoints-v5.18.patch \ - file://0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch \ - file://0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch \ file://0009-Rename-genhd-wrapper-to-blkdev.patch \ - file://0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch \ - file://0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch \ - file://0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch \ - " + file://0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch \ + file://0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch \ + file://0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.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] = "7cf1acbb50b84116acc9b4281b81dcc2643d6018bbd1e8514ad1270239896c4b" +SRC_URI[sha256sum] = "6159d00e4e1d59546eec8d4a67e1aa39c1084ceb5e5afeb666eab4b8a5b5a9ee" export INSTALL_MOD_DIR="kernel/lttng-modules" diff --git a/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb index 0e420a25d9..9afd6714f0 100644 --- a/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +++ b/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}" do_configure[depends] += "virtual/kernel:do_shared_workdir openssl-native:do_populate_sysroot" do_compile[depends] += "virtual/kernel:do_compile_kernelmodules" -RDEPENDS:${PN}-dev = "" +DEV_PKG_DEPENDENCY = "" DEPENDS += "bc-native bison-native" DEPENDS += "gmp-native" diff --git a/poky/meta/recipes-kernel/perf/perf.bb b/poky/meta/recipes-kernel/perf/perf.bb index adefc44eaa..603d3f9eee 100644 --- a/poky/meta/recipes-kernel/perf/perf.bb +++ b/poky/meta/recipes-kernel/perf/perf.bb @@ -228,6 +228,12 @@ do_configure:prepend () { sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(PYTHON_AUTO)),$(notdir $(call get-executable-or-default\,PYTHON\,$(PYTHON_AUTO))),g' \ ${S}/tools/perf/Makefile.config + # likewise with this substitution. Kernels with commit 18f2967418d031a39 + # [perf tools: Use Python devtools for version autodetection rather than runtime] + # need this substitution for reproducibility. + sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(subst -config\,\,$(PYTHON_AUTO))),$(notdir $(call get-executable-or-default\,PYTHON\,$(subst -config\,\,$(PYTHON_AUTO)))),g' \ + ${S}/tools/perf/Makefile.config + # The following line: # srcdir_SQ = $(patsubst %tools/perf,tools/perf,$(subst ','\'',$(srcdir))), # Captures the full src path of perf, which of course makes it not diff --git a/poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py b/poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py index 09ba3328a7..0362f2d8fa 100755 --- a/poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py +++ b/poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py @@ -62,7 +62,10 @@ for struct in re.findall( struct_block_regex, data ): #print( " name found: %s" % name.group(1) ) entry_dict[struct[2]]['fields'][name.group(1)] = entry - if not entry_dict[struct[2]]['fields']: + # unmatched entries are most likely array terminators and + # should end up as the last element in the sorted list, which + # is achieved by using '0' as the key + if not cpuid and not name: entry_dict[struct[2]]['fields']['0'] = entry # created ordered dictionaries from the captured values. These are ordered by diff --git a/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb b/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb index cd42039680..2eba4f873b 100644 --- a/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb +++ b/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "884ba2e3c1e8b98762b6dc25ff60b5ec75c8d33a39e019b3ed4aa615491460d3" +SRC_URI[sha256sum] = "ac00f97efecce5046ed069d1d93f3365fdf994c7c7854a8fc50831e959537230" inherit bin_package allarch |