[lldb][debugserver] Check if Rosetta debugserver exists #110943
Merged
Conversation
This file contains hidden or 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
If lldb tries to attach to a process that is marked 'Translated' with debugserver, it will exec the Rosetta debugserver to handle the debug session without checking if it is present. If there is a configuration that is somehow missing this, it will fail poorly. rdar://135641680
|
@llvm/pr-subscribers-lldb Author: Jason Molenda (jasonmolenda) ChangesIf lldb tries to attach to a process that is marked 'Translated' with debugserver, it will exec the Rosetta debugserver to handle the debug session without checking if it is present. If there is a configuration that is somehow missing this, it will fail poorly. rdar://135641680 Full diff: https://github.com/llvm/llvm-project/pull/110943.diff 1 Files Affected:
diff --git a/lldb/tools/debugserver/source/DNB.cpp b/lldb/tools/debugserver/source/DNB.cpp
index 1ac9a8040c6163..3e213a1f8b9bc0 100644
--- a/lldb/tools/debugserver/source/DNB.cpp
+++ b/lldb/tools/debugserver/source/DNB.cpp
@@ -480,6 +480,14 @@ nub_process_t DNBProcessAttach(nub_process_t attach_pid,
exit(1);
}
+ struct stat st;
+ if (::stat(translated_debugserver, &st) != 0) {
+ DNBLogError("Translated inferior process but Rosetta debugserver not "
+ "found at %s",
+ translated_debugserver);
+ return INVALID_NUB_PROCESS_ARCH;
+ }
+
snprintf(fdstr, sizeof(fdstr), "--fd=%d", communication_fd);
snprintf(pidstr, sizeof(pidstr), "--attach=%d", attach_pid);
execl(translated_debugserver, translated_debugserver, "--native-regs",
|
jimingham
approved these changes
Oct 3, 2024
There was a problem hiding this comment.
This looks good to me. In fact, it looks WAY better than the error handling just above it where instead of logging something that we could find later in the system logs, we fprintf to stderr - which in most cases won't get seen, and exit (but w/o an error?).
OTOH, that wasn't part of your patch, so...
message and then return attach failed.
jasonmolenda
added a commit
to jasonmolenda/llvm-project
that referenced
this pull request
Oct 3, 2024
If lldb tries to attach to a process that is marked 'Translated' with debugserver, it will exec the Rosetta debugserver to handle the debug session without checking if it is present. If there is a configuration that is somehow missing this, it will fail poorly. rdar://135641680 (cherry picked from commit c20b90a)
jasonmolenda
added a commit
to jasonmolenda/llvm-project
that referenced
this pull request
Oct 3, 2024
If lldb tries to attach to a process that is marked 'Translated' with debugserver, it will exec the Rosetta debugserver to handle the debug session without checking if it is present. If there is a configuration that is somehow missing this, it will fail poorly. rdar://135641680 (cherry picked from commit c20b90a)
jasonmolenda
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Oct 3, 2024
…error-out-if-cannot-find-rosetta-debugserver-20240723 [lldb][debugserver] Check if Rosetta debugserver exists (llvm#110943)
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/18/builds/4894 Here is the relevant piece of the build log for the reference |
There's something flaky about this test, I've seen it failing on unrelated patches a few times. We'll look into it. |
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.
If lldb tries to attach to a process that is marked 'Translated' with debugserver, it will exec the Rosetta debugserver to handle the debug session without checking if it is present. If there is a configuration that is somehow missing this, it will fail poorly.
rdar://135641680