** Description changed: [Impact] noble patchset 2024-09-30 ( https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2083196 ) caused conflicts and compilation failures with PREEMPT_RT. [Fix] One conflict was caused by 2fd5ad3f310de22836cdacae919dd99d758a1f1b ("perf: Fix event leak upon exit"). This was fixed by removing the v3 version of the "perf/sigtrap" patchset from PREEMPT_RT 6.8.2-rt11 and applying final v5 version of the patchset that made it into 6.11. - The patches from PREEMPT_RT 6.8.2-rt11 that should be removed are: + The patches from PREEMPT_RT 6.8.2-rt11 that should be reverted are: - perf: Move irq_work_queue() where the event is prepared. - perf: Enqueue SIGTRAP always via task_work. - perf: Remove perf_swevent_get_recursion_context() from perf_pending_task(). - perf: Split __perf_pending_irq() out of perf_pending_irq() + 45667971314188e26e5c92bb82a12c448719eed6 perf: Split __perf_pending_irq() out of perf_pending_irq() + 8c9b7a74011e890c56d9d7db2091cf9db62f4d84 perf: Remove perf_swevent_get_recursion_context() from perf_pending_task(). + d27dbf7b379654f6f07e1e3e26e62f41b7b5b131 perf: Enqueue SIGTRAP always via task_work. + 45667971314188e26e5c92bb82a12c448719eed6 perf: Move irq_work_queue() where the event is prepared. + + The pre-requisites pulled in from 6.10.y (that came with noble patchset + 2024-09-30) are: + + 3d7a63352a93bdb8a1cdf29606bf617d3ac1c22a perf: Fix event leak upon exit + f34d8307a73a18de5320fcc6f40403146d061891 perf: Fix event leak upon exec and file release This final "perf/sigtrap" patchset from mainline 6.11 included the following commits, which applied cleanly: 058244c683111d44a5de16ac74f19a1754dd7a0c perf: Move irq_work_queue() where the event is prepared. 466e4d801cd438a1ab2c8a2cce1bef6b65c31bbb task_work: Add TWA_NMI_CURRENT as an additional notify mode. c5d93d23a26012a98b77f9e354ab9b3afd420059 perf: Enqueue SIGTRAP always via task_work. 5af42f928f3ac555c228740fb4a92d05b19fdd49 perf: Shrink the size of the recursion counter. 0d40a6d83e3e6751f1107ba33587262d937c969f perf: Move swevent_htable::recursion into task_struct. 16b9569df9d2ab07eeee075cb7895e9d3e08e8f0 perf: Don't disable preemption in perf_pending_task(). 2b84def990d388bed4afe4f21ae383a01991046c perf: Split __perf_pending_irq() out of perf_pending_irq() The other issue was a compilation failure due to f70405afc99b1 ("locking: Add rwsem_assert_held() and rwsem_assert_held_write()"). This - was fixed by the fix commit from 6.9, which applied cleanly: + was fixed by the fix commit from 6.9, "locking: Make + rwsem_assert_held_write_nolockdep() build with PREEMPT_RT=y" + + The pre-requisite pulled in from 6.9.y (that came with noble patchset + 2024-09-30) is: + + f70405afc99b1e5a3a1e60b6c05456fde2dbe622 locking: Add + rwsem_assert_held() and rwsem_assert_held_write() + + Then the additional patch was required to fix PREEMPT_RT: fa1f51162338b3e2f520d4bfedc42b3b2e00da6d locking: Make rwsem_assert_held_write_nolockdep() build with PREEMPT_RT=y [Test Case] Compile and boot test. [Where things could go wrong] If there are patches these depend on that are missed, it could cause performance/latency regressions.
-- You received this bug notification because you are a member of Kernel Packages, which is subscribed to linux-realtime in Ubuntu. https://bugs.launchpad.net/bugs/2089700 Title: Fix PREEMPT_RT conflicts caused by 2024-09-30 noble patchset Status in ubuntu-realtime: In Progress Status in linux-realtime package in Ubuntu: In Progress Status in linux-realtime source package in Noble: In Progress Bug description: [Impact] noble patchset 2024-09-30 ( https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2083196 ) caused conflicts and compilation failures with PREEMPT_RT. [Fix] One conflict was caused by 2fd5ad3f310de22836cdacae919dd99d758a1f1b ("perf: Fix event leak upon exit"). This was fixed by removing the v3 version of the "perf/sigtrap" patchset from PREEMPT_RT 6.8.2-rt11 and applying final v5 version of the patchset that made it into 6.11. The patches from PREEMPT_RT 6.8.2-rt11 that should be reverted are: 45667971314188e26e5c92bb82a12c448719eed6 perf: Split __perf_pending_irq() out of perf_pending_irq() 8c9b7a74011e890c56d9d7db2091cf9db62f4d84 perf: Remove perf_swevent_get_recursion_context() from perf_pending_task(). d27dbf7b379654f6f07e1e3e26e62f41b7b5b131 perf: Enqueue SIGTRAP always via task_work. 45667971314188e26e5c92bb82a12c448719eed6 perf: Move irq_work_queue() where the event is prepared. The pre-requisites pulled in from 6.10.y (that came with noble patchset 2024-09-30) are: 3d7a63352a93bdb8a1cdf29606bf617d3ac1c22a perf: Fix event leak upon exit f34d8307a73a18de5320fcc6f40403146d061891 perf: Fix event leak upon exec and file release This final "perf/sigtrap" patchset from mainline 6.11 included the following commits, which applied cleanly: 058244c683111d44a5de16ac74f19a1754dd7a0c perf: Move irq_work_queue() where the event is prepared. 466e4d801cd438a1ab2c8a2cce1bef6b65c31bbb task_work: Add TWA_NMI_CURRENT as an additional notify mode. c5d93d23a26012a98b77f9e354ab9b3afd420059 perf: Enqueue SIGTRAP always via task_work. 5af42f928f3ac555c228740fb4a92d05b19fdd49 perf: Shrink the size of the recursion counter. 0d40a6d83e3e6751f1107ba33587262d937c969f perf: Move swevent_htable::recursion into task_struct. 16b9569df9d2ab07eeee075cb7895e9d3e08e8f0 perf: Don't disable preemption in perf_pending_task(). 2b84def990d388bed4afe4f21ae383a01991046c perf: Split __perf_pending_irq() out of perf_pending_irq() The other issue was a compilation failure due to f70405afc99b1 ("locking: Add rwsem_assert_held() and rwsem_assert_held_write()"). This was fixed by the fix commit from 6.9, "locking: Make rwsem_assert_held_write_nolockdep() build with PREEMPT_RT=y" The pre-requisite pulled in from 6.9.y (that came with noble patchset 2024-09-30) is: f70405afc99b1e5a3a1e60b6c05456fde2dbe622 locking: Add rwsem_assert_held() and rwsem_assert_held_write() Then the additional patch was required to fix PREEMPT_RT: fa1f51162338b3e2f520d4bfedc42b3b2e00da6d locking: Make rwsem_assert_held_write_nolockdep() build with PREEMPT_RT=y [Test Case] Compile and boot test. [Where things could go wrong] If there are patches these depend on that are missed, it could cause performance/latency regressions. To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu-realtime/+bug/2089700/+subscriptions -- Mailing list: https://launchpad.net/~kernel-packages Post to : kernel-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~kernel-packages More help : https://help.launchpad.net/ListHelp
