Skip to content

[DevAsan] Add an option to enable/disable leak detection #2250

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

Merged
merged 5 commits into from
Dec 3, 2024
Merged

[DevAsan] Add an option to enable/disable leak detection #2250

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a61fe8e
add option
yingcong-wu Oct 28, 2024
cacc769
fix
yingcong-wu Oct 28, 2024
8309920
add comment
yingcong-wu Oct 28, 2024
0e6a7d3
Merge remote-tracking branch 'origin/main' into yc-PR/1028-leak-check…
yingcong-wu Nov 12, 2024
2284149
Merge remote-tracking branch 'origin/main' into yc-PR/1028-leak-check…
yingcong-wu Nov 25, 2024
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
16 changes: 9 additions & 7 deletions source/loader/layers/sanitizer/asan_interceptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,13 +837,15 @@ ContextInfo::~ContextInfo() {
getContext()->urDdiTable.Context.pfnRelease(Handle);
assert(Result == UR_RESULT_SUCCESS);

// check memory leaks
std::vector<AllocationIterator> AllocInfos =
getContext()->interceptor->findAllocInfoByContext(Handle);
for (const auto &It : AllocInfos) {
const auto &[_, AI] = *It;
if (!AI->IsReleased) {
ReportMemoryLeak(AI);
if (getContext()->interceptor->getOptions().DetectLeaks) {
// check memory leaks
std::vector<AllocationIterator> AllocInfos =
getContext()->interceptor->findAllocInfoByContext(Handle);
for (const auto &It : AllocInfos) {
const auto &[_, AI] = *It;
if (!AI->IsReleased) {
ReportMemoryLeak(AI);
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions source/loader/layers/sanitizer/asan_interceptor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@ class SanitizerInterceptor {
std::shared_ptr<DeviceInfo> &DeviceInfo);

private:
// m_Options may be used in other places, place it at the top
AsanOptions m_Options;
Copy link
Contributor

@AllanZyne AllanZyne Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unnecessary changes

Copy link
Contributor Author

@yingcong-wu yingcong-wu Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a needed change because we need to make sure AsanOptions destucts after ContextInfo so that we can use it in the ~ContextInfo().

std::unordered_map<ur_context_handle_t, std::shared_ptr<ContextInfo>>
m_ContextMap;
ur_shared_mutex m_ContextMapMutex;
Expand All @@ -316,8 +318,6 @@ class SanitizerInterceptor {

std::unique_ptr<Quarantine> m_Quarantine;

AsanOptions m_Options;

std::unordered_set<ur_adapter_handle_t> m_Adapters;
ur_shared_mutex m_AdaptersMutex;
};
Expand Down
1 change: 1 addition & 0 deletions source/loader/layers/sanitizer/asan_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ AsanOptions::AsanOptions() {
SetBoolOption("detect_locals", DetectLocals);
SetBoolOption("detect_privates", DetectPrivates);
SetBoolOption("print_stats", PrintStats);
SetBoolOption("detect_leaks", DetectLeaks);

auto KV = OptionsEnvMap->find("quarantine_size_mb");
if (KV != OptionsEnvMap->end()) {
Expand Down
1 change: 1 addition & 0 deletions source/loader/layers/sanitizer/asan_options.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ struct AsanOptions {
bool DetectPrivates = true;
bool PrintStats = false;
bool DetectKernelArguments = true;
bool DetectLeaks = true;

explicit AsanOptions();
};
Expand Down
Loading