kernel-6.1: cherry-pick fix for creating kprobes using unqualified names #3699
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Commit b022f0c7e404 ("tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols")
in the upstream kernel introduced a regression where kprobes cannot be
created on functions residing in loadable modules if the probe location
is identified by an unqualified function name.
The faulty commit was backported e.g. to kernel 6.1.60. The backported
fix is on track to be released in kernel 6.1.71. Cherry-pick the fix
until 6.1.71 is released and our upstream catches up to it.
While the faulty commit was backported to the 5.15 series as well, the
backport has not hit our upstream yet. There is nothing to be done for
our other kernel packages (but to be vigilant about not picking up a
release with the faulty backport in the near future).
Signed-off-by: Markus Boehme <markubo@amazon.com>
foersleo
approved these changes
Jan 5, 2024
bcressey
approved these changes
Jan 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue number:
Closes #3691
Description of changes: Commit b022f0c7e404 ("tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols") in the upstream kernel introduced a regression where kprobes cannot be created on functions residing in loadable modules if the probe location is identified by an unqualified function name.
The faulty commit was backported e.g. to kernel 6.1.60. The backported fix is on track to be released in kernel 6.1.71. Cherry-pick the fix until 6.1.71 is released and our upstream catches up to it.
While the faulty commit was backported to the 5.15 series as well, the backport has not hit our upstream yet. There is nothing to be done for our other kernel packages (but to be vigilant about not picking up a release with the faulty backport in the near future).
Testing done: On the host:
The probe has been successfully created even though the name is unqualified and the probed function resides in a loadable module. Creating the kprobe (line 2) previously failed during symbol lookup (see #3691).
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.