Skip to content

[Runtime] Fix shared resource_mgr double free corruption bug. #286

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 1 commit into from
Jun 30, 2022
Merged

[Runtime] Fix shared resource_mgr double free corruption bug. #286

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
3 changes: 3 additions & 0 deletions tensorflow/core/common_runtime/device.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Device::Device(Env* env, const DeviceAttributes& device_attributes)
CHECK(DeviceNameUtils::ParseFullName(name(), &parsed_name_))
<< "Invalid device name: " << name();
rmgr_ = new ResourceMgr(parsed_name_.job);
owned_rmgr_ = true;
}

Device::Device(Env* env, const DeviceAttributes& device_attributes,
Expand All @@ -41,8 +42,10 @@ Device::Device(Env* env, const DeviceAttributes& device_attributes,
dev_rmgr_map->device_rmgr_map.end()) {
rmgr_ = const_cast<DeviceResourceMgrMap*>(dev_rmgr_map)->device_rmgr_map[name()];
LOG(INFO) << "Device " << name() << " got a shared resource_mgr: " << rmgr_;
owned_rmgr_ = false;
} else {
rmgr_ = new ResourceMgr(parsed_name_.job);
owned_rmgr_ = true;
}
}

Expand Down
5 changes: 4 additions & 1 deletion tensorflow/core/common_runtime/device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,9 @@ class Device : public DeviceBase {

protected:
void DeleteResourceMgr() {
delete rmgr_;
if (owned_rmgr_) {
delete rmgr_;
}
rmgr_ = nullptr;
}

Expand All @@ -204,6 +206,7 @@ class Device : public DeviceBase {

// Resources associated w/ this device. E.g., shared variables, etc.
ResourceMgr* rmgr_ = nullptr;
bool owned_rmgr_ = true;

TF_DISALLOW_COPY_AND_ASSIGN(Device);
};
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/core/common_runtime/direct_session.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ class DirectSessionFactory : public SessionFactory {

DeviceMgr* device_mgr = new DeviceMgr(std::move(devices));

SessionGroup* session_group = new SessionGroup();
SessionGroup* session_group = new SessionGroup(shared_rmgr);
#ifdef TENSORFLOW_USE_NUMA
DirectSession* leader_session =
new DirectSession(options, device_mgr, true, this,
Expand Down
7 changes: 7 additions & 0 deletions tensorflow/core/public/session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ limitations under the License.

namespace tensorflow {
class DeviceMgr;
class ResourceMgr;

namespace thread {

Expand Down Expand Up @@ -270,7 +271,12 @@ class Session {

class SessionGroup {
public:
SessionGroup() : shared_resource_mgr_(nullptr) {}
SessionGroup(ResourceMgr* mgr) : shared_resource_mgr_(mgr) {}
~SessionGroup() {
if (shared_resource_mgr_) {
delete shared_resource_mgr_;
}
}

Status Close() {
Expand Down Expand Up @@ -375,6 +381,7 @@ class SessionGroup {
std::vector<std::unique_ptr<Session>> sessions_;
int32_t session_num_ = 0;
std::atomic<int64_t> serving_index_{0};
ResourceMgr* shared_resource_mgr_ = nullptr;

Status GetServingSessionId(int32_t* serving_id, int32_t hint_id = -1) {
if (session_num_ < 1) {
Expand Down