summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-kernel
diff options
context:
space:
mode:
Diffstat (limited to 'poky/meta/recipes-kernel')
-rw-r--r--poky/meta/recipes-kernel/kmod/kmod_30.bb2
-rw-r--r--poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb6
-rw-r--r--poky/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb6
-rw-r--r--poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb6
-rw-r--r--poky/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb6
-rw-r--r--poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb26
-rw-r--r--poky/meta/recipes-kernel/linux/linux-yocto_6.1.bb26
-rw-r--r--poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-slab_common-drop-kmem_alloc-avoid-dereferenci.patch278
-rw-r--r--poky/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb (renamed from poky/meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb)3
-rw-r--r--poky/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch75
10 files changed, 96 insertions, 338 deletions
diff --git a/poky/meta/recipes-kernel/kmod/kmod_30.bb b/poky/meta/recipes-kernel/kmod/kmod_30.bb
index 8eb83efe6d..ff6e20554b 100644
--- a/poky/meta/recipes-kernel/kmod/kmod_30.bb
+++ b/poky/meta/recipes-kernel/kmod/kmod_30.bb
@@ -26,7 +26,7 @@ S = "${WORKDIR}/git"
EXTRA_OECONF += "--enable-tools"
-PACKAGECONFIG ??= "zlib xz"
+PACKAGECONFIG ??= "zlib xz openssl"
PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
PACKAGECONFIG[logging] = " --enable-logging,--disable-logging"
PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
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 122fc0feac..d4f5b1cb20 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 ?= "e53e73b907707b92b3433de7c9c776aa504b2d0b"
-SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46"
+SRCREV_machine ?= "62705725902924fafa34c7bcb4c18f2e3b7d473c"
+SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5"
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.84"
+LINUX_VERSION ?= "5.15.87"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
index 3f77474ae5..cced203781 100644
--- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "fd78a53858b7f9195ab53fd98c27736d05bbaf7c"
-SRCREV_meta ?= "c56c1ed8bdb0c470069b74090381bfe07341c95a"
+SRCREV_machine ?= "2da2dd7ee0de35291a179566ce8e5b85d6982762"
+SRCREV_meta ?= "142fcf0b8fcf1643d80e39e2c2f9c4a3bb528fcc"
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-6.1;destsuffix=${KMETA}"
-LINUX_VERSION ?= "6.1.3"
+LINUX_VERSION ?= "6.1.5"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
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 f060e22e84..a0af388e73 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.84"
+LINUX_VERSION ?= "5.15.87"
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 ?= "ae2415ee19511e205a983bc8024700c1f794076a"
-SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46"
+SRCREV_machine ?= "6d10c8fe87e2037c751157ca8677588fa6e0f214"
+SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
index 54f0065c73..15ee6abdbc 100644
--- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
@@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "6.1.3"
+LINUX_VERSION ?= "6.1.5"
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 ?= "872afe79c5e568acf5f971952e78caada8424df7"
-SRCREV_meta ?= "c56c1ed8bdb0c470069b74090381bfe07341c95a"
+SRCREV_machine ?= "404168c1ce77179a34bb9959a18b594a9f7105d3"
+SRCREV_meta ?= "142fcf0b8fcf1643d80e39e2c2f9c4a3bb528fcc"
PV = "${LINUX_VERSION}+git${SRCPV}"
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 bb48e158ab..a3895dde78 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 ?= "8c0f02ba7db6a463ca3aef969441906706edb350"
-SRCREV_machine:qemuarm64 ?= "42a14881ba8145b2d1bdfc019c603abe79aeafd4"
-SRCREV_machine:qemumips ?= "1ea321a5c9c66edba818ddffcef2aa9910de552e"
-SRCREV_machine:qemuppc ?= "14da484e7f2fc95e10abb4db96bc5fd6b444cb60"
-SRCREV_machine:qemuriscv64 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6"
-SRCREV_machine:qemuriscv32 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6"
-SRCREV_machine:qemux86 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6"
-SRCREV_machine:qemux86-64 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6"
-SRCREV_machine:qemumips64 ?= "8db5fd5c032f44486ef52f34724d0452aa3a6fea"
-SRCREV_machine ?= "f100c753aa1f9638bfd476da0498b09fdee569d6"
-SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46"
+SRCREV_machine:qemuarm ?= "7463f1ff9674e97fa6bed05983d4828a219994d9"
+SRCREV_machine:qemuarm64 ?= "09ebb2096efb9e23a1e2c47bf1926dbae0e3f051"
+SRCREV_machine:qemumips ?= "a7058de4f88d9a7a3b3253a31bba703eaf6f78ea"
+SRCREV_machine:qemuppc ?= "e43b0b8b142f689bc2e2297a5ca221fb0f802eb5"
+SRCREV_machine:qemuriscv64 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665"
+SRCREV_machine:qemuriscv32 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665"
+SRCREV_machine:qemux86 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665"
+SRCREV_machine:qemux86-64 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665"
+SRCREV_machine:qemumips64 ?= "75a87ddede429ee1070118f54d38183ee4c81b59"
+SRCREV_machine ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665"
+SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5"
# 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 ?= "d68f50bfb00f6288e812be895ea5c77932a4b9dd"
+SRCREV_machine:class-devupstream ?= "d57287729e229188e7d07ef0117fe927664e08cb"
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.84"
+LINUX_VERSION ?= "5.15.87"
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_6.1.bb b/poky/meta/recipes-kernel/linux/linux-yocto_6.1.bb
index f357f43f46..f543240cd8 100644
--- a/poky/meta/recipes-kernel/linux/linux-yocto_6.1.bb
+++ b/poky/meta/recipes-kernel/linux/linux-yocto_6.1.bb
@@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v6.1/standard/base"
KBRANCH:qemux86-64 ?= "v6.1/standard/base"
KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "f3fae08180e0e42fe1d84bc27fadfbe712486e7d"
-SRCREV_machine:qemuarm64 ?= "872afe79c5e568acf5f971952e78caada8424df7"
-SRCREV_machine:qemumips ?= "f33d80dcd64dbdf265f8501370595c9b7672b402"
-SRCREV_machine:qemuppc ?= "872afe79c5e568acf5f971952e78caada8424df7"
-SRCREV_machine:qemuriscv64 ?= "872afe79c5e568acf5f971952e78caada8424df7"
-SRCREV_machine:qemuriscv32 ?= "872afe79c5e568acf5f971952e78caada8424df7"
-SRCREV_machine:qemux86 ?= "872afe79c5e568acf5f971952e78caada8424df7"
-SRCREV_machine:qemux86-64 ?= "872afe79c5e568acf5f971952e78caada8424df7"
-SRCREV_machine:qemumips64 ?= "e01e486b21db695c46c12253b92adc7aa0da6d38"
-SRCREV_machine ?= "872afe79c5e568acf5f971952e78caada8424df7"
-SRCREV_meta ?= "c56c1ed8bdb0c470069b74090381bfe07341c95a"
+SRCREV_machine:qemuarm ?= "45f7cca5081d3cb4ad4fae8e158cd58ea4db6c1f"
+SRCREV_machine:qemuarm64 ?= "404168c1ce77179a34bb9959a18b594a9f7105d3"
+SRCREV_machine:qemumips ?= "eb204027dbb98317d002250cc594de30ecc62b90"
+SRCREV_machine:qemuppc ?= "404168c1ce77179a34bb9959a18b594a9f7105d3"
+SRCREV_machine:qemuriscv64 ?= "404168c1ce77179a34bb9959a18b594a9f7105d3"
+SRCREV_machine:qemuriscv32 ?= "404168c1ce77179a34bb9959a18b594a9f7105d3"
+SRCREV_machine:qemux86 ?= "404168c1ce77179a34bb9959a18b594a9f7105d3"
+SRCREV_machine:qemux86-64 ?= "404168c1ce77179a34bb9959a18b594a9f7105d3"
+SRCREV_machine:qemumips64 ?= "2b51d6b44e4dc0e5a87f820d8ebc5cc49feea14a"
+SRCREV_machine ?= "404168c1ce77179a34bb9959a18b594a9f7105d3"
+SRCREV_meta ?= "142fcf0b8fcf1643d80e39e2c2f9c4a3bb528fcc"
# 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 ?= "4adc0fbe03a69d3189607bf74e82a79c29c08b4a"
+SRCREV_machine:class-devupstream ?= "90ca7a874a9093e500cc6147cecd85ad2e6a2852"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.1/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-6.1;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.1.3"
+LINUX_VERSION ?= "6.1.5"
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-mm-slab_common-drop-kmem_alloc-avoid-dereferenci.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-slab_common-drop-kmem_alloc-avoid-dereferenci.patch
deleted file mode 100644
index 99402ea5e9..0000000000
--- a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-slab_common-drop-kmem_alloc-avoid-dereferenci.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-From b977f96d0a414e76d4c544f65791919dde1bc57e Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 17 Oct 2022 13:49:51 -0400
-Subject: [PATCH] fix: mm/slab_common: drop kmem_alloc & avoid dereferencing
- fields when not using (v6.1)
-
-See uptream commit:
-
- commit 2c1d697fb8ba6d2d44f914d4268ae1ccdf025f1b
- Author: Hyeonggon Yoo <42.hyeyoo@gmail.com>
- Date: Wed Aug 17 19:18:24 2022 +0900
-
- mm/slab_common: drop kmem_alloc & avoid dereferencing fields when not using
-
- Drop kmem_alloc event class, and define kmalloc and kmem_cache_alloc
- using TRACE_EVENT() macro.
-
- And then this patch does:
- - Do not pass pointer to struct kmem_cache to trace_kmalloc.
- gfp flag is enough to know if it's accounted or not.
- - Avoid dereferencing s->object_size and s->size when not using kmem_cache_alloc event.
- - Avoid dereferencing s->name in when not using kmem_cache_free event.
- - Adjust s->size to SLOB_UNITS(s->size) * SLOB_UNIT in SLOB
-
-Upstream-Status: Backport [commit b977f96d0a414e76d4c544f]
-
-Change-Id: Icd7925731ed4a737699c3746cb7bb7760a4e8009
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
----
- include/instrumentation/events/kmem.h | 156 ++++++++++++++++++--------
- 1 file changed, 111 insertions(+), 45 deletions(-)
-
-diff --git a/include/instrumentation/events/kmem.h b/include/instrumentation/events/kmem.h
-index 219533a1..0f5bd8e6 100644
---- a/include/instrumentation/events/kmem.h
-+++ b/include/instrumentation/events/kmem.h
-@@ -10,9 +10,58 @@
- #include <lttng/kernel-version.h>
-
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0))
--
- #include <../../mm/slab.h>
-+#endif
-+
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,1,0))
-+LTTNG_TRACEPOINT_EVENT_MAP(kmalloc,
-+
-+ kmem_kmalloc,
-+
-+ TP_PROTO(unsigned long call_site,
-+ const void *ptr,
-+ size_t bytes_req,
-+ size_t bytes_alloc,
-+ gfp_t gfp_flags,
-+ int node),
-+
-+ TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node),
-+
-+ TP_FIELDS(
-+ ctf_integer_hex(unsigned long, call_site, call_site)
-+ ctf_integer_hex(const void *, ptr, ptr)
-+ ctf_integer(size_t, bytes_req, bytes_req)
-+ ctf_integer(size_t, bytes_alloc, bytes_alloc)
-+ ctf_integer(gfp_t, gfp_flags, gfp_flags)
-+ ctf_integer(int, node, node)
-+ ctf_integer(bool, accounted, (IS_ENABLED(CONFIG_MEMCG_KMEM) &&
-+ (gfp_flags & __GFP_ACCOUNT) ? true : false))
-+ )
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(kmem_cache_alloc,
-+
-+ TP_PROTO(unsigned long call_site,
-+ const void *ptr,
-+ struct kmem_cache *s,
-+ gfp_t gfp_flags,
-+ int node),
-+
-+ TP_ARGS(call_site, ptr, s, gfp_flags, node),
-
-+ TP_FIELDS(
-+ ctf_integer_hex(unsigned long, call_site, call_site)
-+ ctf_integer_hex(const void *, ptr, ptr)
-+ ctf_integer(size_t, bytes_req, s->object_size)
-+ ctf_integer(size_t, bytes_alloc, s->size)
-+ ctf_integer(gfp_t, gfp_flags, gfp_flags)
-+ ctf_integer(int, node, node)
-+ ctf_integer(bool, accounted, IS_ENABLED(CONFIG_MEMCG_KMEM) ?
-+ ((gfp_flags & __GFP_ACCOUNT) ||
-+ (s->flags & SLAB_ACCOUNT)) : false)
-+ )
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0))
- LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc,
-
- TP_PROTO(unsigned long call_site,
-@@ -53,18 +102,16 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc, kmem_cache_alloc,
-
- TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags)
- )
--
--LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc_node,
-+#else
-+LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc,
-
- TP_PROTO(unsigned long call_site,
- const void *ptr,
-- struct kmem_cache *s,
- size_t bytes_req,
- size_t bytes_alloc,
-- gfp_t gfp_flags,
-- int node),
-+ gfp_t gfp_flags),
-
-- TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags, node),
-+ TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags),
-
- TP_FIELDS(
- ctf_integer_hex(unsigned long, call_site, call_site)
-@@ -72,42 +119,40 @@ LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc_node,
- ctf_integer(size_t, bytes_req, bytes_req)
- ctf_integer(size_t, bytes_alloc, bytes_alloc)
- ctf_integer(gfp_t, gfp_flags, gfp_flags)
-- ctf_integer(int, node, node)
-- ctf_integer(bool, accounted, IS_ENABLED(CONFIG_MEMCG_KMEM) ?
-- ((gfp_flags & __GFP_ACCOUNT) ||
-- (s && s->flags & SLAB_ACCOUNT)) : false)
- )
- )
-
--LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc_node, kmalloc_node,
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc, kmalloc,
-
-- kmem_kmalloc_node,
-+ kmem_kmalloc,
-
- TP_PROTO(unsigned long call_site, const void *ptr,
-- struct kmem_cache *s, size_t bytes_req, size_t bytes_alloc,
-- gfp_t gfp_flags, int node),
-+ size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
-
-- TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags, node)
-+ TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags)
- )
-
--LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node,
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc, kmem_cache_alloc,
-
- TP_PROTO(unsigned long call_site, const void *ptr,
-- struct kmem_cache *s, size_t bytes_req, size_t bytes_alloc,
-- gfp_t gfp_flags, int node),
-+ size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
-
-- TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags, node)
-+ TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags)
- )
--#else
--LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc,
-+#endif
-+
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc_node,
-
- TP_PROTO(unsigned long call_site,
- const void *ptr,
-+ struct kmem_cache *s,
- size_t bytes_req,
- size_t bytes_alloc,
-- gfp_t gfp_flags),
-+ gfp_t gfp_flags,
-+ int node),
-
-- TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags),
-+ TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags, node),
-
- TP_FIELDS(
- ctf_integer_hex(unsigned long, call_site, call_site)
-@@ -115,27 +160,33 @@ LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc,
- ctf_integer(size_t, bytes_req, bytes_req)
- ctf_integer(size_t, bytes_alloc, bytes_alloc)
- ctf_integer(gfp_t, gfp_flags, gfp_flags)
-+ ctf_integer(int, node, node)
-+ ctf_integer(bool, accounted, IS_ENABLED(CONFIG_MEMCG_KMEM) ?
-+ ((gfp_flags & __GFP_ACCOUNT) ||
-+ (s && s->flags & SLAB_ACCOUNT)) : false)
- )
- )
-
--LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc, kmalloc,
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc_node, kmalloc_node,
-
-- kmem_kmalloc,
-+ kmem_kmalloc_node,
-
- TP_PROTO(unsigned long call_site, const void *ptr,
-- size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
-+ struct kmem_cache *s, size_t bytes_req, size_t bytes_alloc,
-+ gfp_t gfp_flags, int node),
-
-- TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags)
-+ TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags, node)
- )
-
--LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc, kmem_cache_alloc,
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node,
-
- TP_PROTO(unsigned long call_site, const void *ptr,
-- size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
-+ struct kmem_cache *s, size_t bytes_req, size_t bytes_alloc,
-+ gfp_t gfp_flags, int node),
-
-- TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags)
-+ TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags, node)
- )
--
-+#else
- LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc_node,
-
- TP_PROTO(unsigned long call_site,
-@@ -192,19 +243,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(kfree,
- ctf_integer_hex(const void *, ptr, ptr)
- )
- )
--
--LTTNG_TRACEPOINT_EVENT(kmem_cache_free,
--
-- TP_PROTO(unsigned long call_site, const void *ptr, const char *name),
--
-- TP_ARGS(call_site, ptr, name),
--
-- TP_FIELDS(
-- ctf_integer_hex(unsigned long, call_site, call_site)
-- ctf_integer_hex(const void *, ptr, ptr)
-- ctf_string(name, name)
-- )
--)
- #else
- LTTNG_TRACEPOINT_EVENT_CLASS(kmem_free,
-
-@@ -235,6 +273,34 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_free, kmem_cache_free,
- )
- #endif
-
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,1,0))
-+LTTNG_TRACEPOINT_EVENT(kmem_cache_free,
-+
-+ TP_PROTO(unsigned long call_site, const void *ptr, const struct kmem_cache *s),
-+
-+ TP_ARGS(call_site, ptr, s),
-+
-+ TP_FIELDS(
-+ ctf_integer_hex(unsigned long, call_site, call_site)
-+ ctf_integer_hex(const void *, ptr, ptr)
-+ ctf_string(name, s->name)
-+ )
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0))
-+LTTNG_TRACEPOINT_EVENT(kmem_cache_free,
-+
-+ TP_PROTO(unsigned long call_site, const void *ptr, const char *name),
-+
-+ TP_ARGS(call_site, ptr, name),
-+
-+ TP_FIELDS(
-+ ctf_integer_hex(unsigned long, call_site, call_site)
-+ ctf_integer_hex(const void *, ptr, ptr)
-+ ctf_string(name, name)
-+ )
-+)
-+#endif
-+
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,3,0))
- LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free, kmem_mm_page_free,
- #else
---
-2.19.1
-
diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb
index d444f9ab0c..542f42ae19 100644
--- a/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb
+++ b/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb
@@ -11,13 +11,12 @@ include lttng-platforms.inc
SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0009-Rename-genhd-wrapper-to-blkdev.patch \
- file://0001-fix-mm-slab_common-drop-kmem_alloc-avoid-dereferenci.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] = "5a99679df7903160cbde3918fee5af90ffafc90fc96ccdefaa57cf230492b234"
+SRC_URI[sha256sum] = "f525d3d48ea3a475cb535339c201666d0e4c75ec8c46d29837bcf381ea02cb19"
export INSTALL_MOD_DIR="kernel/lttng-modules"
diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch
index e3d421f730..ef81703bc3 100644
--- a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch
+++ b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch
@@ -1,35 +1,72 @@
-From cc3e1abaa1e7ad85c6a299fe30a36e0cb732e1c8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 15 Dec 2022 14:51:20 -0800
-Subject: [PATCH] compat: Define off64_t as off_t on linux
+From 74b3844737b03492756b4f896c938b504b069f14 Mon Sep 17 00:00:00 2001
+From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+Date: Tue, 17 Jan 2023 16:57:35 -0500
+Subject: [PATCH] compat: off64_t is not defined by musl
-This helps compile with latest musl, where off64_t is not defined
-unless _LARGEFILE64_SOURCE is defined, on glibc _LARGEFILE64_SOURCE is
-defined if _GNU_SOURCE is defined, so the problem is only seen with musl
+This helps compile with latest musl, where off64_t is not defined unless
+_LARGEFILE64_SOURCE is defined. On glibc, _LARGEFILE64_SOURCE is defined
+if _GNU_SOURCE is defined, so the problem is only seen with musl.
-Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/164]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Since the project uses AC_SYS_LARGEFILE, which from the autoconf doc:
+"arrange for 64-bit file offsets, known as large-file support."
+
+As such, it is safe to assume off_t is 64-bit wide. This is checked by a
+static_assert to catch any platform where autoconf would let a 32-bit
+off_t slip.
+
+Upstream-Status: Submitted [https://review.lttng.org/c/lttng-tools/+/9268]
+Reported-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8
---
- src/common/compat/fcntl.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.h
-index 5e566e50..d19a6ece 100644
+--- a/src/common/compat/compat-fcntl.c
++++ b/src/common/compat/compat-fcntl.c
+@@ -13,7 +13,7 @@
+ #ifdef __linux__
+
+ LTTNG_HIDDEN
+-int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
++int compat_sync_file_range(int fd, off_t offset, off_t nbytes,
+ unsigned int flags)
+ {
+ #ifdef HAVE_SYNC_FILE_RANGE
--- a/src/common/compat/fcntl.h
+++ b/src/common/compat/fcntl.h
-@@ -7,7 +7,6 @@
-
+@@ -8,21 +8,21 @@
#ifndef _COMPAT_FCNTL_H
#define _COMPAT_FCNTL_H
--
+
++#include <assert.h>
#include <fcntl.h>
#include <sys/types.h>
-@@ -22,6 +21,7 @@ typedef off64_t loff_t;
+ #include <common/compat/errno.h>
+
+-#if (defined(__CYGWIN__))
+-typedef long long off64_t;
+-#endif
++static_assert(sizeof(off_t) == sizeof(int64_t),
++ "Build system is misconfigured, off_t must be 64-bit wide");
+
+ #if (defined(__FreeBSD__) || defined(__sun__))
+ typedef off64_t loff_t;
#endif
#ifdef __linux__
-+typedef off_t off64_t;
- extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
+-extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
++extern int compat_sync_file_range(int fd, off_t offset, off_t nbytes,
unsigned int flags);
#define lttng_sync_file_range(fd, offset, nbytes, flags) \
+ compat_sync_file_range(fd, offset, nbytes, flags)
+@@ -37,8 +37,8 @@ extern int compat_sync_file_range(int fd
+ #define SYNC_FILE_RANGE_WAIT_BEFORE 0
+ #define SYNC_FILE_RANGE_WRITE 0
+
+-static inline int lttng_sync_file_range(int fd, off64_t offset,
+- off64_t nbytes, unsigned int flags)
++static inline int lttng_sync_file_range(int fd, off_t offset,
++ off_t nbytes, unsigned int flags)
+ {
+ return -ENOSYS;
+ }
generated by cgit v1.2.3 (git 2.39.0) at 2024-07-06 15:38:23 +0300