Fix device var uninit when ctx not owned

CHIP-SPV · Oct 26, 2024 · 1a303f5 · 1a303f5
1 parent a9aaccc
commit 1a303f5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/CHIPBackend.cc b/src/CHIPBackend.cc
@@ -430,11 +430,16 @@ void chipstar::Module::invalidateDeviceVariablesNoLock() {
 
 void chipstar::Module::deallocateDeviceVariablesNoLock(
     chipstar::Device *Device) {
+  if (!DeviceVariablesAllocated_)
+    return;
   invalidateDeviceVariablesNoLock();
   for (auto *Var : ChipVars_) {
-    auto Err = Device->getContext()->free(Var->getDevAddr());
-    (void)Err;
+    if (!::Backend->getReinitializeFlag()) {
+      auto Err = Device->getContext()->free(Var->getDevAddr());
+      (void)Err;
+    }
     Var->setDevAddr(nullptr);
+    Var->setChipContext(nullptr);
   }
   DeviceVariablesAllocated_ = false;
 }

diff --git a/src/CHIPBackend.hh b/src/CHIPBackend.hh
@@ -1825,6 +1825,7 @@ public:
  */
 class Backend {
 protected:
+  bool ReinitializeFlag_ = false;
   chipstar::EventMonitor *EventMonitor_ = nullptr;
 
   int MinQueuePriority_;
@@ -1838,6 +1839,8 @@ protected:
   std::shared_ptr<spdlog::logger> Logger;
 
 public:
+  void setReinitializeFlag(bool Flag) { ReinitializeFlag_ = Flag; }
+  bool getReinitializeFlag() const { return ReinitializeFlag_; }
   chipstar::Context *PrimaryContext = nullptr;
   std::stack<chipstar::Context *> ChipCtxStack;
 

diff --git a/src/CHIPDriver.cc b/src/CHIPDriver.cc
@@ -185,6 +185,7 @@ extern hipError_t CHIPReinitialize(const uintptr_t *NativeHandles,
 
   Backend->initializeFromNative(NativeHandles, NumHandles);
   Backend->getActiveDevice()->addFromModuleState(ModuleState);
+  Backend->setReinitializeFlag(true);
 
   return hipSuccess;
 }