Your message dated Tue, 18 Feb 2025 20:33:56 +0000
with message-id
<23013740d9dacc5c0de054a828107af8db609b97.ca...@adam-barratt.org.uk>
and subject line Re: Bug#1098295: bullseye-pu: package
lttng-modules/2.12.5-1+deb11u2
has caused the Debian Bug report #1098295,
regarding bullseye-pu: package lttng-modules/2.12.5-1+deb11u2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1098295: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1098295
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: bullseye
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:lttng-modules
User: [email protected]
Usertags: pu
[ Reason ]
Fix the dkms build of lttng-modules against the current bullseye kernel
5.10.0-33.
[ Impact ]
I'ts currently impossible to use the lttng kernel tracer with the latest
bullseye kernel.
[ Tests ]
Tested manually on a bullseye virtual machine.
[ Risks ]
Minimal, won't be more broken than it actually is.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
Backport a single patch to adjust and version check in a macro.
diff -Nru lttng-modules-2.12.5/debian/changelog
lttng-modules-2.12.5/debian/changelog
--- lttng-modules-2.12.5/debian/changelog 2023-09-29 04:57:49.000000000
-0400
+++ lttng-modules-2.12.5/debian/changelog 2025-02-18 14:22:05.000000000
-0500
@@ -1,3 +1,10 @@
+lttng-modules (2.12.5-1+deb11u2) bullseye; urgency=medium
+
+ * Fix build on linux 5.10.0-33 (Closes: #1095902)
+ * [c997804] Add patch to fix build on Linux 5.10.220..5.11
+
+ -- Michael Jeanson <[email protected]> Tue, 18 Feb 2025 14:22:05 -0500
+
lttng-modules (2.12.5-1+deb11u1) bullseye; urgency=medium
* Fix build on linux 5.10.0-22 (Closes: #1035364)
@@ -10,10 +17,10 @@
* [25013d7] Add patch to fix build on Linux 5.10.119..5.11
[ Michael Jeanson ]
- * [90a214b] dkms: conditionally include lttng-probe-random.ko
+ * [90a214b] dkms: conditionnaly include lttng-probe-random.ko
* [be2eaa4] Add patch to fix build on Linux 5.10.163..5.11
- -- Andreas Beckmann <[email protected]> Fri, 29 Sep 2023 10:57:49 +0200
+ -- Michael Jeanson <[email protected]> Wed, 03 May 2023 11:13:07 -0400
lttng-modules (2.12.5-1) unstable; urgency=medium
diff -Nru
lttng-modules-2.12.5/debian/patches/fix-file-Rename-fcheck-lookup_fd_rcu-v5.10.220.patch
lttng-modules-2.12.5/debian/patches/fix-file-Rename-fcheck-lookup_fd_rcu-v5.10.220.patch
---
lttng-modules-2.12.5/debian/patches/fix-file-Rename-fcheck-lookup_fd_rcu-v5.10.220.patch
1969-12-31 19:00:00.000000000 -0500
+++
lttng-modules-2.12.5/debian/patches/fix-file-Rename-fcheck-lookup_fd_rcu-v5.10.220.patch
2025-02-18 14:19:09.000000000 -0500
@@ -0,0 +1,49 @@
+From ac28bfe89e197267496520f6b79e6df42f6b196e Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <[email protected]>
+Date: Tue, 25 Jun 2024 14:15:39 -0400
+Subject: [PATCH] fix: file: Rename fcheck lookup_fd_rcu (v5.10.220)
+
+See upstream backported commit:
+
+ commit c4716bb296504cbc64aeefb370df44e821214c44
+ Author: Eric W. Biederman <[email protected]>
+ Date: Fri Nov 20 17:14:27 2020 -0600
+
+ file: Rename fcheck lookup_fd_rcu
+
+ [ Upstream commit 460b4f812a9d473d4b39d87d37844f9fc30a9eb3 ]
+
+ Also remove the confusing comment about checking if a fd exists. I
+ could not find one instance in the entire kernel that still matches
+ the description or the reason for the name fcheck.
+
+ The need for better names became apparent in the last round of
+ discussion of this set of changes[1].
+
+ [1]
https://lkml.kernel.org/r/CAHk-=wj8BQbgJFLa+J0e=iT-1qpmCRTbPAJ8gd6MJQ=kbrp...@mail.gmail.com
+ Link:
https://lkml.kernel.org/r/[email protected]
+
+Change-Id: Ib880bd8feef1c5d75d2a018cd93a1d464485ab7b
+Signed-off-by: Michael Jeanson <[email protected]>
+Signed-off-by: Mathieu Desnoyers <[email protected]>
+---
+ wrapper/fdtable.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/wrapper/fdtable.h b/wrapper/fdtable.h
+index d768c10f..167395a1 100644
+--- a/wrapper/fdtable.h
++++ b/wrapper/fdtable.h
+@@ -12,7 +12,8 @@
+ #include <linux/fdtable.h>
+ #include <linux/sched.h>
+
+-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
++#if ((LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) || \
++ LTTNG_KERNEL_RANGE(5,10,220, 5,11,0))
+ static inline
+ struct file *lttng_lookup_fd_rcu(unsigned int fd)
+ {
+--
+2.47.2
+
diff -Nru lttng-modules-2.12.5/debian/patches/series
lttng-modules-2.12.5/debian/patches/series
--- lttng-modules-2.12.5/debian/patches/series 2023-09-29 04:57:49.000000000
-0400
+++ lttng-modules-2.12.5/debian/patches/series 2025-02-18 14:19:26.000000000
-0500
@@ -2,3 +2,4 @@
fix-adjust-range-v5.10.137-in-block-probe.patch
fix-random-tracepoints-removed-in-stable-kernels.patch
fix-jbd2-use-the-correct-print-format.patch
+fix-file-Rename-fcheck-lookup_fd_rcu-v5.10.220.patch
--- End Message ---
--- Begin Message ---
On Tue, 2025-02-18 at 15:04 -0500, Michael Jeanson wrote:
> Fix the dkms build of lttng-modules against the current bullseye
> kernel 5.10.0-33.
bullseye is no longer handled by the Release Team, but by the LTS Team
(CCed). Please co-ordinate with them about a possible update to the
package in bullseye.
Regards,
Adam
--- End Message ---
