Skip to content

[lldb][Process/FreeBSDKernelCore] Defer actual core loading to DoLoadCore() #186626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mchoo7 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −6
Open

[lldb][Process/FreeBSDKernelCore] Defer actual core loading to DoLoadCore() #186626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ProcessFreeBSDKernelCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ static PluginProperties &GetGlobalPluginProperties() {

ProcessFreeBSDKernelCore::ProcessFreeBSDKernelCore(lldb::TargetSP target_sp,
ListenerSP listener_sp,
kvm_t *kvm,
const FileSpec &core_file)
: PostMortemProcess(target_sp, listener_sp, core_file), m_kvm(kvm) {}
: PostMortemProcess(target_sp, listener_sp, core_file) {}

ProcessFreeBSDKernelCore::~ProcessFreeBSDKernelCore() {
if (m_kvm)
Expand All @@ -79,9 +78,11 @@ lldb::ProcessSP ProcessFreeBSDKernelCore::CreateInstance(
kvm_t *kvm =
kvm_open2(executable->GetFileSpec().GetPath().c_str(),
crash_file->GetPath().c_str(), O_RDONLY, nullptr, nullptr);
if (kvm)
if (kvm) {
kvm_close(kvm);
return std::make_shared<ProcessFreeBSDKernelCore>(target_sp, listener_sp,
kvm, *crash_file);
*crash_file);
}
}
return nullptr;
}
Expand Down Expand Up @@ -113,7 +114,21 @@ bool ProcessFreeBSDKernelCore::CanDebug(lldb::TargetSP target_sp,
}

Status ProcessFreeBSDKernelCore::DoLoadCore() {
// The core is already loaded by CreateInstance().
ModuleSP executable = GetTarget().GetExecutableModule();
if (!executable)
return Status::FromErrorString(
"ProcessFreeBSDKernelCore: no executable module set on target");

m_kvm = kvm_open2(executable->GetFileSpec().GetPath().c_str(),
GetCoreFile().GetPath().c_str(), O_RDWR, nullptr, nullptr);

if (!m_kvm)
return Status::FromErrorStringWithFormat(
"ProcessFreeBSDKernelCore: kvm_open2 failed for core '%s' "
"with kernel '%s'",
GetCoreFile().GetPath().c_str(),
executable->GetFileSpec().GetPath().c_str());

SetKernelDisplacement();

return Status();
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ProcessFreeBSDKernelCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
class ProcessFreeBSDKernelCore : public lldb_private::PostMortemProcess {
public:
ProcessFreeBSDKernelCore(lldb::TargetSP target_sp, lldb::ListenerSP listener,
kvm_t *kvm, const lldb_private::FileSpec &core_file);
const lldb_private::FileSpec &core_file);

~ProcessFreeBSDKernelCore();

Expand Down