Skip to content

Fix segfault when re-loading an EP library #24539

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
adrianlizarraga merged 2 commits into from
Apr 25, 2025
Merged

Fix segfault when re-loading an EP library #24539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eedf5a7
Fix segfault when re-loading an EP library
adrianlizarraga Apr 24, 2025
ca2734a
Merge branch 'main' into adrianl/fix-crash-unload-eps
adrianlizarraga Apr 24, 2025
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
1 change: 1 addition & 0 deletions onnxruntime/core/session/provider_bridge_ort.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1794,6 +1794,7 @@ void ProviderLibrary::Unload() {
}
}

initialized_ = false;
handle_ = nullptr;
provider_ = nullptr;
}
Expand Down
33 changes: 33 additions & 0 deletions onnxruntime/test/providers/qnn/qnn_basic_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ using namespace onnxruntime::logging;

// in test_main.cc
extern std::unique_ptr<Ort::Env> ort_env;
extern "C" void ortenv_setup();
extern "C" void ortenv_teardown();

namespace onnxruntime {
namespace test {
Expand Down Expand Up @@ -1232,6 +1234,37 @@ TEST_F(QnnHTPBackendTests, UseHtpSharedMemoryAllocatorForInputs) {
}
#endif // BUILD_QNN_EP_STATIC_LIB

#if !BUILD_QNN_EP_STATIC_LIB
// Tests that loading and unloading of an EP library in the same process does not cause a segfault.
TEST_F(QnnHTPBackendTests, LoadingAndUnloadingOfQnnLibrary_FixSegFault) {
const ORTCHAR_T* ort_model_path = ORT_MODEL_FOLDER "nhwc_resize_sizes_opset18.quant.onnx";

onnxruntime::ProviderOptions options;
options["backend_type"] = "htp";
options["offload_graph_io_quantization"] = "0";

// This first session will load the QNN EP library for the first time.
{
Ort::SessionOptions so;
so.AppendExecutionProvider("QNN", options);

EXPECT_NO_THROW(Ort::Session session(*ort_env, ort_model_path, so));
}

{
ortenv_teardown(); // Destroy Env to force unloading of EP libraries.
ortenv_setup();

// This next session will reload the QNN EP library.
// Should not get a segfault.
Ort::SessionOptions so;
so.AppendExecutionProvider("QNN", options);

EXPECT_NO_THROW(Ort::Session session(*ort_env, ort_model_path, so));
}
}
#endif // !BUILD_QNN_EP_STATIC_LIB

#endif // defined(__aarch64__) || defined(_M_ARM64) || defined(__linux__)
#endif // !defined(ORT_MINIMAL_BUILD)

Expand Down
Loading