maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[openmp][amdgpu] Tear down amdgpu plugin accurately 

Moves DeviceInfo global to heap to accurately control lifetime.
Moves calls from libomptarget to deinit_plugin later, plugins need to stay
alive until very shortly before libomptarget is destructed.

Leaving the deinit_plugin calls where initially inserted hits use after
free from the dynamic_module.c offloading test (verified with valgrind
 that the new location is sound with respect to this)

Reviewed By: tianshilei1992

Differential Revision: https://reviews.llvm.org/D130714
This commit is contained in:
Jon Chesterfield 2022-07-28 20:00:01 +01:00
parent e74197bc12
commit ed0f218115
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
View File

@ -1113,10 +1113,21 @@ public:
pthread_mutex_t SignalPoolT::mutex = PTHREAD_MUTEX_INITIALIZER;
// Putting accesses to DeviceInfo global behind a function call prior
// to changing to use init_plugin/deinit_plugin calls
static RTLDeviceInfoTy DeviceInfoState;
static RTLDeviceInfoTy& DeviceInfo() { return DeviceInfoState; }
static RTLDeviceInfoTy *DeviceInfoState = nullptr;
static RTLDeviceInfoTy &DeviceInfo() { return *DeviceInfoState; }
int32_t __tgt_rtl_init_plugin() {
DeviceInfoState = new RTLDeviceInfoTy;
return (DeviceInfoState && DeviceInfoState->ConstructionSucceeded)
? OFFLOAD_SUCCESS
: OFFLOAD_FAIL;
}
int32_t __tgt_rtl_deinit_plugin() {
if (DeviceInfoState)
delete DeviceInfoState;
return OFFLOAD_SUCCESS;
}
namespace {
@ -2051,9 +2062,6 @@ int32_t __tgt_rtl_is_valid_binary_info(__tgt_device_image *image,
return true;
}
int32_t __tgt_rtl_init_plugin() { return OFFLOAD_SUCCESS; }
int32_t __tgt_rtl_deinit_plugin() { return OFFLOAD_SUCCESS; }
int __tgt_rtl_number_of_devices() {
// If the construction failed, no methods are safe to call
if (DeviceInfo().ConstructionSucceeded) {

24
openmp/libomptarget/src/rtl.cpp
View File

@ -67,6 +67,23 @@ __attribute__((constructor(101))) void init() {
__attribute__((destructor(101))) void deinit() {
DP("Deinit target library!\n");
for (auto *R : PM->RTLs.UsedRTLs) {
// Plugins can either destroy their local state using global variables
// or attribute(destructor) functions or by implementing deinit_plugin
// The hazard with plugin local destructors is they may be called before
// or after this destructor. If the plugin is destroyed using global
// state before this library finishes calling into it the plugin is
// likely to crash. If good fortune means the plugin outlives this
// library then there may be no crash.
// Using deinit_plugin and no global destructors from the plugin works.
if (R->deinit_plugin) {
if (R->deinit_plugin() != OFFLOAD_SUCCESS) {
DP("Failure deinitializing RTL %s!\n", R->RTLName.c_str());
}
}
}
delete PM;
#ifdef OMPTARGET_PROFILE_ENABLED
@ -567,13 +584,6 @@ void RTLsTy::unregisterLib(__tgt_bin_desc *Desc) {
PM->TblMapMtx.unlock();
// TODO: Write some RTL->unload_image(...) function?
for (auto *R : UsedRTLs) {
if (R->deinit_plugin) {
if (R->deinit_plugin() != OFFLOAD_SUCCESS) {
DP("Failure deinitializing RTL %s!\n", R->RTLName.c_str());
}
}
}
DP("Done unregistering library!\n");
}