summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2023-01-28 01:10:19 +0300
committerAndrew Geissler <geissonator@yahoo.com>2023-01-28 01:19:05 +0300
commitc5535c91408e2c3f8231c10f6b00eaaee7c88717 (patch)
tree9ec42908f2cb40cc01d8a1b17487da2b106e6946 /poky/meta/recipes-kernel/lttng
parentea144b037776e892b9e05c4d22be842901e2138c (diff)
downloadopenbmc-c5535c91408e2c3f8231c10f6b00eaaee7c88717.tar.xz
subtree updates:openembedded:poky: Jan 27 2023
poky: 0ce159991d..5e249ec855: Alex Kiernan (2): rust: Upgrade 1.66.0 -> 1.66.1 rust: Remove CARGO_VERSION Alexander Kanavin (7): selftest/virgl: use pkg-config from the host ethtool: upgrade 6.0 -> 6.1 man-pages: upgrade 6.01 -> 6.02 mesa: update 22.2.3 -> 22.3.3 webkitgtk: submit a patch upstream python3-sphinxcontrib-applehelp: update 1.0.2 -> 1.0.3 vulkan-samples: branch rename master -> main Benoît Mauduit (1): lib/oe/reproducible: Use git log without gpg signature Bruce Ashfield (6): linux-yocto/6.1: edgerouter: Replace OCTEON_USB with USB_OCTEON_HCD linux-yocto/6.1: qemuriscv32: Enable CONFIG_NONPORTABLE linux-yocto/6.1: update to v6.1.5 linux-yocto/5.15: update to v5.15.87 conf/qemu: bump preferred kernel version to 6.1 poky/poky-tiny: bump preferred version to 6.1 Changqing Li (1): cmake-native: use internal cmcurl library Chen Qi (2): file: export MAGIC in SDK rpm: do not export MAGIC in SDK Chuck Wolber (1): scripts/oe-setup-layers: Make efficiently idempotent Fabio Estevam (2): u-boot: Upgrade to 2023.01 u-boot: Update Upstream-Status He Zhe (1): lttng-modules: update 2.13.7 -> 2.13.8 Jan Luebbe (1): p11-kit: add native to BBCLASSEXTEND Jermain Horsman (1): cve-check: write the cve manifest to IMGDEPLOYDIR Kevin Hao (1): meta-yocto-bsp: Update the default kernel to 6.1 Khem Raj (31): createrepo-c: Include missing rpm/rpmstring.h libglu: Remove deprecated register in C++17 cpio: Do not use _Noreturn in gnulib groff: Drop use of `register` storage class vulkan-samples: Update to the tip of trunk unfs3: Fix implicit function declarations of fix_dir_times() gperf: Make the code C++17 compliant libxcb: Fixed c2x standard undefined behaviour dbus: Use Alignof when using C11 or newer standard m4: Define alignof_slot using _Alignof when using C11 or newer opkg: Define alignof using _Alignof when using C11 or newer cpio: Fix gnulib alignof implementation on clang python3-numpy: Define _ALIGN using _Alignof when using C11 or newer vulkan-samples: Drop using u8string_view musl-obstack: Update to 1.2.3 mdadm: Define alignof using _Alignof when using C11 or newer lttng-tools: Switch to alternative upstream submitted patch libtirpc: Check if file exists before operating on it ruby: Use C11 _Alignof to define ALIGN_OF when possible libusb1: Link with latomic only if compiler has no atomic builtins libusb1: Strip trailing whitespaces elfutils: Fix build with libcurl >= 7.87 stress-ng: Robustify test-float test harfbuzz: Add missing <cstdio> and <cstdlib> includes apt: add missing <cstdint> for uint16_t vulkan-samples: Include missing header cstdint for uint32_t ruby: Update the patch status systemd: Add another fix for using XSI strerror_r elfutils: Remove funcretval test from run-native-test.sh for now binutils: Upgrade to 2.40 release binutils: Package libsframe Lee Chee Yang (1): migration-guides: add release-notes for 4.1.2 Luca Boccassi (1): systemd: add PACKAGECONFIG to select default compression format Luca Ceresoli (1): manuals: fix typo in the MLPREFIX description Markus Volk (3): gptfdisk: add follow-up patch to fix with current popt gtk+3: add PACKAGECONFIG for libcloudservice and tracker; fix cups backend gtk4: add PACKAGECONFIG for cloudproviders Martin Jansa (1): mesa: update submitted patch with backported version Michael Opdenacker (3): rust-bin.bbclass: remove unused class meta/classes-global: remove package_tar.bbclass ref-manual: initial documentation for go and go-mod classes Mikko Rapeli (1): kmod: enable openssl support by default Niko Mauno (1): Fix missing leading whitespace with ':append' Ovidiu Panait (1): webkitgtk: fix perl-native dependency Paulo Neves (1): bitbake: bitbake-getvar: Add a quiet command line argument Pavel Zhukov (3): bitbake: fetch2: kill parameters in uri_find_decoded bitbake: fetch2/tests: Add test for Mercurial bitbake: fetch2/tests: Add parameter to recipe_uri Pawel Zalewski (1): classes/fs-uuid: Fix command output decoding issue Peter Kjellerstedt (2): librsvg: Only enable the Vala bindings if GObject Introspection is enabled cargo-update-recipe-crates.bbclass: Mark the update_crates task as nostamp Peter Marko (1): iproute2: separate routel and add python dependency Quentin Schulz (1): packagegroup-core-boot: make init-ifupdown package a recommendation Randy MacLeod (1): vim: upgrade 9.0.0947 -> 9.0.1211 Richard Purdie (23): bitbake: server/process: Improve lockfile handling at exit pseudo: Update to pull in linux-libc-headers race fix pseudo: Switch back to the master branch insane: Improve patch warning/error handling poky: Set INIT_MANAGER by a separate variable bitbake: server/process: Fix lockfile contents check bug bitbake: cooker: Fix siggen recipe cache race issue bitbake: cache: Only write files if we have data bitbake: cooker: Fix parsing race around cache handling bitbake: data: Add support for new BB_HASH_CODEPARSER_VALS for cache optimisation bitbake: data_smart: Small optimisation to _findVar() native: Drop special variable handling bitbake.conf: Add BB_HASH_CODEPARSER_VALS pseudo: Update to include logic fix bitbake.conf: Add METADATA_REVISION to BB_HASH_CODEPARSER_VALS native: Implement BBCLASSEXTEND PACKAGES_DYNAMIC handling conf/sdk/x86-64: Set march specifically bitbake: cache/codeparser: Switch to a new BB_CACHEDIR variable for cache location oeqa/selftest/devtool: Fix for linux 6.1 versions onwards wic/efi-bootdisk.wks: Fix for 6.1 kernel versions kernel/linux-kernel-base: Fix kernel build artefact determinism issues build-appliance-image: Update to master head revision build-appliance: Fix merge error Ross Burton (12): python3-pyproject-hooks: add new recipe python3-build: add 0.10.0 python_pep517: use python3-build, not picobuild python3-picobuild: remove cve-update-db-native: show IP on failure quilt: rewrite ptest glue quilt: fix intermittent failure in faildiff.test spirv-headers/spirv-tools: set correct branch name quilt: use upstreamed faildiff.test fix ppp: backport fix for CVE-2022-4603 bitbake: bb/utils: include SSL certificate paths in export_proxies buildtools-tarball: set pkg-config search path Thomas Roos (1): devtool: fix devtool finish when gitmodules file is empty Tim Orling (3): bitbake: bitbake: fix deprecated threading.Thread.setDaemon python3-cryptography{-vectors}: 38.0.4 -> 39.0.0 bitbake: toaster: update fixtures Tom Hochstein (1): gstreamer1.0-plugins-good: Fix libsoup runtime dependency Vincent Davis Jr (1): mesa: allow mesa (gbm) to compile without backend Wang Mingyu (20): btrfs-tools: upgrade 6.1 -> 6.1.2 libpcap: upgrade 1.10.2 -> 1.10.3 libwebp: upgrade 1.2.4 -> 1.3.0 man-db: upgrade 2.11.1 -> 2.11.2 dpkg: upgrade 1.21.17 -> 1.21.18 ed: upgrade 1.18 -> 1.19 gi-docgen: upgrade 2022.2 -> 2023.1 python3-alabaster: upgrade 0.7.12 -> 0.7.13 python3-setuptools: upgrade 65.6.3 -> 65.7.0 patchelf: upgrade 0.17.0 -> 0.17.2 python3-cython: upgrade 0.29.32 -> 0.29.33 python3-dbusmock: upgrade 0.28.6 -> 0.28.7 python3-hatchling: upgrade 1.12.1 -> 1.12.2 python3-hypothesis: upgrade 6.61.0 -> 6.62.0 python3-importlib-metadata: upgrade 5.2.0 -> 6.0.0 python3-packaging: upgrade 22.0 -> 23.0 python3-pbr: upgrade 5.11.0 -> 5.11.1 python3-pygments: upgrade 2.13.0 -> 2.14.0 stress-ng: upgrade 0.15.01 -> 0.15.02 xz: upgrade 5.4.0 -> 5.4.1 Xiangyu Chen (4): numactl: skip test case when target platform doesn't have 2 CPU node qemuboot.bbclass: add QB_NFSROOTFS_EXTRA_OPT for nfs rootfs extra option runqemu: add process of option QB_NFSROOTFS_EXTRA_OPT qemuppc64: set the qemuppc64 nfs r/wsize mount options to 524288 Yoann Congal (2): bitbake: persist_data: Handle sqlite error when cachefile path is too long sanity: Fix small typos meta-openembedded: cd13881611..2ab113e8be: Alejandro Enedino Hernandez Samaniego (1): weechat: Update 3.4.1 -> 3.8 Alex Kiernan (4): dnsmasq: Merge .inc into .bb dnsmasq: Expand configuration options ntpsec: Upgrade 1.2.1 -> 1.2.2 keyutils: Upgrade 1.6.1 -> 1.6.3 Archana Polampalli (1): Nodejs: Upgrade to 18.12.1 Bartosz Golaszewski (1): libgpiod: fix python bindings build Chee Yang Lee (5): opencv: fix reproducible builds xerces-c: upgrade to 3.2.4 zsh: Fix CVE-2021-45444 redis: Upgrade to 7.0.8 redis: Upgrade to 6.2.9 Dmitry Baryshkov (1): edid-decode: an utility to parse EDID information Etienne Cordonnier (1): uutils-coreutils: upgrade 0.0.16 -> 0.0.17 Fabio Estevam (1): lvgl-demo-fb: Add recipe Gianfranco Costamagna (1): boinc-client: Update boinc from 7.20.4 to 7.20.5 Hermes Zhang (1): kernel_add_regdb: Change the task order Jan Luebbe (3): pcsc-lite: fix native build pcsc-lite: fix homepage URL opensc: fix homepage URL Kai Kang (2): mozjs: fix compile error for arm crda: 3.18 -> 4.15 Khem Raj (65): packagegroup-meta-oe: Remove boost-url from comments trace-cmd: Update to upstream submitted patches packagegroup-meta-oe: Update to reflect latest recipes freeglut: Add packageconfigs for x11/wayland/gles xdg-desktop-portal-wlr: Add wayland to REQUIRED_DISTRO_FEATURES ipmitool: Remove unneeded patch dibbler: Fix build with c++17 and newer std libtevent: Package cmocka tests into ptest package netkit-telnet: Drop using register storage class keyword libxml-libxml-perl: Fix function pointer types fatcat: Fix build with std=c++17 ncmpc: Upgrade to 0.47 python3-matplotlib: Upgrade to 3.6.3 python3-matplotlib: Fix build with c++17 python3-greenlet: Drop using register keyword libmodplug: Fix build with c++17 xmlrpc-c: Upgrade to 1.54.06 satyr: Fix build with musl p8platform: Fix build with c++17 clang freerdp: Fix incompatible function pointer type libtorrent: Update to tip of trunk gnuchess: Fix build with c++17 ippool: Use unsigned int type for 1-bit integer bitfield audiofile: Stick to c++14 std ssiapi: Use c++14 standard log4cpp: Keep using std=c++14 gengetopt: Use std=c++14 libmimetic: Pin to using -std=c++14 ace: Upgrade to 6.5.19 pipewire-media-session: Use PW_ENABLE_DEPRECATED rtorrent: Update to latest tip of trunk nspr: Fix build with clang16 net-snmp: Fix build with clang16 xmlstarlet: Fix build with clang16 libol: Drop recipe hplip: Update to 3.22.10 espeak: Drop using 'register' keyword for storage classifier uw-imap: Fix build with clang 16 xmlsec1: Include xmlsec/parser.h for xmlSecParserSetDefaultOptions() exiv2: Upgrade to 0.27.6 packagegroup-meta-oe: Remove mongodb for upsupported arches rtorrent: Add missing dependency on autoconf-archive thrift: Fix c++ and system header include order problem libcereal: Use -idirafter instead of -isystem poppler: cmake: Do not use -isystem uftreace: Fix a build race sdbus-c++: Disable ccache libcamera: Fix build with gcc-13 mariadb: Fix build with gcc-13 vulkan-cts,opengl-es-cts: Fix build with gcc-13 rocksdb: Fix build with gcc13 rocksdb: Upgrade to 7.9.2 redis-plus-plus: Upgrade to 1.3.7 redis-plus-plus: Fix build with gcc13 rdfind: Upgrade to 1.5.0 release rdfind: Fix build with gcc13 libiodbc: Fix SRC_URI to not use gitlab archives opensaf: Fix build with gcc13 crossguid: Fix build with gcc13 dbus-cxx: Fix build with gcc13 dbus-cxx: Upgrade to 2.3.1 msktutil: Upgrade to 1.2.1 hiredis: Enable SSL/TLS support by default redis-plus-plus: Enable SSL/TLS by default rocksdb: Fix build with clang compiler Lei Maohui (2): biodbc: Added a new recipe. trace-cmd: Fix QA Issue of do_package when enable multilib: Leon Anavi (14): python3-traitlets: Upgrade 5.8.0 -> 5.8.1 python3-prettytable: Upgrade 3.4.1 -> 3.6.0 python3-cantools: Upgrade 38.0.0 -> 38.0.1 python3-imageio: Upgrade 2.23.0 -> 2.24.0 python3-astroid: Upgrade 2.12.13 -> 2.13.2 python3-alembic: Upgrade 1.9.1 -> 1.9.2 python3-autobahn: Upgrade 22.12.1 -> 23.1.1 python3-eventlet: Upgrade 0.33.2 -> 0.33.3 python3-configobj: Upgrade 5.0.6 -> 5.0.8 python3-nocaselist: Upgrade 1.0.6 -> 1.1.0 python3-nocasedict: Upgrade 1.0.4 -> 1.1.0 python3-email-validator: Upgrade 1.3.0 -> 1.3.1 python3-imageio: Upgrade 2.24.0 -> 2.25.0 python3-cachetools: Upgrade 5.2.1 -> 5.3.0 Markus Volk (8): webp-pixbuf-loader: add recipe freerdp: build the rdp server nv-codec-headers: add recipe gnome-chess: import recipe gnome-shell: update 43.1 -> 43.2 pipewire: update 0.3.63 -> 0.3.64 cups-filters: build with dbus support cups-pk-helper: add recipe Martin Jansa (3): s-nail: fix Upstream-Status format smartmontools: fix Upstream-Status format htop: fix Upstream-Status format Niko Mauno (2): Fix missing leading whitespace with ':append' nftables: Fix missing leading whitespace with ':append' Peter Bašista (1): Make tvheadend recipe compatible with the latest tvheadend version Quentin Schulz (1): python3-reedsolo: Add recipe Randy MacLeod (2): librelp: update to 1.11.0 rsyslog: update to 8.2212.0 Richard Hughes (1): fwupd: Upgrade to 1.8.9 Robert Yang (1): tftpy: Add it for python tftp server and client Ross Burton (3): khronos-cts: fix build when python3-build-native is present python3-pytest-forked: update for move from picobuild to build mbedtls: add option to use PSA for X.509/TLS operations Stefan Ghinea (1): mbedtls: upgrade to 2.28.2 to fix CVE-2022-46392, CVE-2022-46393 Trevor Woerner (1): psqlodbc: fix HOMEPAGE Wang Mingyu (62): ctags: upgrade 6.0.20230101.0 -> 6.0.20230108.0 flatbuffers: upgrade 22.12.06 -> 23.1.4 libadwaita: upgrade 1.2.0 -> 1.2.1 hwdata: upgrade 0.365 -> 0.366 libmoo-perl: upgrade 2.005004 -> 2.005005 evolution-data-server-native: upgrade 3.46.2 -> 3.46.3 cli11: upgrade 2.3.1 -> 2.3.2 imapfilter: upgrade 2.7.6 -> 2.8.1 libcgi-perl: upgrade 4.54 -> 4.55 hidapi: upgrade 0.12.0 -> 0.13.0 python3-lazy-object-proxy: upgrade 1.8.0 -> 1.9.0 xfsprogs: upgrade 6.0.0 -> 6.1.0 tbb: upgrade 2021.7.0 -> 2021.8.0 python3-networkx: upgrade 2.8.8 -> 3.0 python3-sqlalchemy: upgrade 1.4.45 -> 1.4.46 python3-aiohue: upgrade 4.5.0 -> 4.6.1 python3-cachetools: upgrade 5.2.0 -> 5.2.1 python3-google-api-python-client: upgrade 2.70.0 -> 2.71.0 python3-flask-migrate: upgrade 4.0.0 -> 4.0.1 python3-coverage: upgrade 7.0.3 -> 7.0.4 python3-googleapis-common-protos: upgrade 1.57.0 -> 1.58.0 python3-ipython: upgrade 8.7.0 -> 8.8.0 python3-redis: upgrade 4.4.0 -> 4.4.1 python3-robotframework: upgrade 6.0.1 -> 6.0.2 python3-uefi-firmware: upgrade 1.9 -> 1.10 python3-ujson: upgrade 5.6.0 -> 5.7.0 python3-xlsxwriter: upgrade 3.0.5 -> 3.0.6 xfsprogs: upgrade 6.1.0 -> 6.1.1 xfstests: upgrade 2022.12.18 -> 2023.01.01 eog: upgrade 43.1 -> 43.2 gvfs: upgrade 1.50.2 -> 1.50.3 libnma: upgrade 1.10.4 -> 1.10.6 nautilus: upgrade 43.1 -> 43.2 nbdkit: upgrade 1.33.4 -> 1.33.7 networkmanager: upgrade 1.40.0 -> 1.40.10 tcpdump: upgrade 4.99.2 -> 4.99.3 unbound: upgrade 1.17.0 -> 1.17.1 ctags: upgrade 6.0.20230108.0 -> 6.0.20230115.0 dnfdragora: upgrade 2.1.3 -> 2.1.4 gensio: upgrade 2.6.1 -> 2.6.2 hidapi: upgrade 0.13.0 -> 0.13.1 librelp: upgrade 1.10.0 -> 1.11.0 libtraceevent: upgrade 1.7.0 -> 1.7.1 libtracefs: upgrade 1.6.3 -> 1.6.4 uftrace: upgrade 0.12 -> 0.13 xterm: upgrade 377 -> 378 python3-absl: upgrade 1.3.0 -> 1.4.0 python3-coverage: upgrade 7.0.4 -> 7.0.5 python3-dateparser: upgrade 1.1.5 -> 1.1.6 python3-decouple: upgrade 3.6 -> 3.7 python3-dnspython: upgrade 2.2.1 -> 2.3.0 python3-flask-wtf: upgrade 1.0.1 -> 1.1.0 python3-future: upgrade 0.18.2 -> 0.18.3 python3-google-api-python-client: upgrade 2.71.0 -> 2.72.0 python3-google-auth: upgrade 2.15.0 -> 2.16.0 python3-mock: upgrade 5.0.0 -> 5.0.1 python3-pymodbus: upgrade 3.0.2 -> 3.1.0 python3-pyzmq: upgrade 24.0.1 -> 25.0.0 python3-redis: upgrade 4.4.1 -> 4.4.2 python3-sentry-sdk: upgrade 1.12.1 -> 1.13.0 python3-txaio: upgrade 22.2.1 -> 23.1.1 python3-xlsxwriter: upgrade 3.0.6 -> 3.0.7 Yi Zhao (2): freeradius: upgrade 3.0.21 -> 3.0.26 strongswan: upgrade 5.9.8 -> 5.9.9 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I625cfaa0bd5052cd72a121f010db3ecd2f274caf
Diffstat (limited to 'poky/meta/recipes-kernel/lttng')
-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
3 files changed, 57 insertions, 299 deletions
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;
+ }