Hash :
507f67cc
Author :
Date :
2023-07-14T15:23:48
Fix cfi issue with Angle invoking worker pool Mark the function as ignoring cfi-icall because of broken upstream builds. https://ci.chromium.org/ui/p/chromium/builders/ci/Linux%20CFI/25615/overview Bug: angleproject:8256 Change-Id: I63b5fee27bc0565dc6881bd83fd284abc7a9f1f0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4685324 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313
//
// Copyright 2016 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// WorkerThread:
// Task running thread for ANGLE, similar to a TaskRunner in Chromium.
// Might be implemented differently depending on platform.
//
#include "common/WorkerThread.h"
#include "common/angleutils.h"
// Controls if our threading code uses std::async or falls back to single-threaded operations.
// Note that we can't easily use std::async in UWPs due to UWP threading restrictions.
#if !defined(ANGLE_STD_ASYNC_WORKERS) && !defined(ANGLE_ENABLE_WINDOWS_UWP)
# define ANGLE_STD_ASYNC_WORKERS 1
#endif // !defined(ANGLE_STD_ASYNC_WORKERS) && & !defined(ANGLE_ENABLE_WINDOWS_UWP)
#if ANGLE_DELEGATE_WORKERS || ANGLE_STD_ASYNC_WORKERS
# include <condition_variable>
# include <future>
# include <mutex>
# include <queue>
# include <thread>
#endif // ANGLE_DELEGATE_WORKERS || ANGLE_STD_ASYNC_WORKERS
namespace angle
{
WaitableEvent::WaitableEvent() = default;
WaitableEvent::~WaitableEvent() = default;
void WaitableEventDone::wait() {}
bool WaitableEventDone::isReady()
{
return true;
}
// A waitable event that can be completed asynchronously
class AsyncWaitableEvent final : public WaitableEvent
{
public:
AsyncWaitableEvent() = default;
~AsyncWaitableEvent() override = default;
void wait() override;
bool isReady() override;
void markAsReady();
private:
// To protect the concurrent accesses from both main thread and background
// threads to the member fields.
std::mutex mMutex;
bool mIsReady = false;
std::condition_variable mCondition;
};
void AsyncWaitableEvent::markAsReady()
{
std::lock_guard<std::mutex> lock(mMutex);
mIsReady = true;
mCondition.notify_all();
}
void AsyncWaitableEvent::wait()
{
std::unique_lock<std::mutex> lock(mMutex);
mCondition.wait(lock, [this] { return mIsReady; });
}
bool AsyncWaitableEvent::isReady()
{
std::lock_guard<std::mutex> lock(mMutex);
return mIsReady;
}
WorkerThreadPool::WorkerThreadPool() = default;
WorkerThreadPool::~WorkerThreadPool() = default;
class SingleThreadedWorkerPool final : public WorkerThreadPool
{
public:
std::shared_ptr<WaitableEvent> postWorkerTask(std::shared_ptr<Closure> task) override;
bool isAsync() override;
};
// SingleThreadedWorkerPool implementation.
std::shared_ptr<WaitableEvent> SingleThreadedWorkerPool::postWorkerTask(
std::shared_ptr<Closure> task)
{
// Thread safety: This function is thread-safe because the task is run on the calling thread
// itself.
(*task)();
return std::make_shared<WaitableEventDone>();
}
bool SingleThreadedWorkerPool::isAsync()
{
return false;
}
#if ANGLE_STD_ASYNC_WORKERS
class AsyncWorkerPool final : public WorkerThreadPool
{
public:
AsyncWorkerPool(size_t numThreads);
~AsyncWorkerPool() override;
std::shared_ptr<WaitableEvent> postWorkerTask(std::shared_ptr<Closure> task) override;
bool isAsync() override;
private:
void createThreads();
using Task = std::pair<std::shared_ptr<AsyncWaitableEvent>, std::shared_ptr<Closure>>;
// Thread's main loop
void threadLoop();
bool mTerminated = false;
std::mutex mMutex; // Protects access to the fields in this class
std::condition_variable mCondVar; // Signals when work is available in the queue
std::queue<Task> mTaskQueue;
std::deque<std::thread> mThreads;
size_t mDesiredThreadCount;
};
// AsyncWorkerPool implementation.
AsyncWorkerPool::AsyncWorkerPool(size_t numThreads) : mDesiredThreadCount(numThreads)
{
ASSERT(numThreads != 0);
}
AsyncWorkerPool::~AsyncWorkerPool()
{
{
std::unique_lock<std::mutex> lock(mMutex);
mTerminated = true;
}
mCondVar.notify_all();
for (auto &thread : mThreads)
{
ASSERT(thread.get_id() != std::this_thread::get_id());
thread.join();
}
}
void AsyncWorkerPool::createThreads()
{
if (mDesiredThreadCount == mThreads.size())
{
return;
}
ASSERT(mThreads.empty());
for (size_t i = 0; i < mDesiredThreadCount; ++i)
{
mThreads.emplace_back(&AsyncWorkerPool::threadLoop, this);
}
}
std::shared_ptr<WaitableEvent> AsyncWorkerPool::postWorkerTask(std::shared_ptr<Closure> task)
{
// Thread safety: This function is thread-safe because access to |mTaskQueue| is protected by
// |mMutex|.
auto waitable = std::make_shared<AsyncWaitableEvent>();
{
std::lock_guard<std::mutex> lock(mMutex);
// Lazily create the threads on first task
createThreads();
mTaskQueue.push(std::make_pair(waitable, task));
}
mCondVar.notify_one();
return waitable;
}
void AsyncWorkerPool::threadLoop()
{
while (true)
{
Task task;
{
std::unique_lock<std::mutex> lock(mMutex);
mCondVar.wait(lock, [this] { return !mTaskQueue.empty() || mTerminated; });
if (mTerminated)
{
return;
}
task = mTaskQueue.front();
mTaskQueue.pop();
}
auto &waitable = task.first;
auto &closure = task.second;
// Note: always add an ANGLE_TRACE_EVENT* macro in the closure. Then the job will show up
// in traces.
(*closure)();
waitable->markAsReady();
}
}
bool AsyncWorkerPool::isAsync()
{
return true;
}
#endif // ANGLE_STD_ASYNC_WORKERS
#if ANGLE_DELEGATE_WORKERS
class DelegateWorkerPool final : public WorkerThreadPool
{
public:
DelegateWorkerPool(PlatformMethods *platform) : mPlatform(platform) {}
~DelegateWorkerPool() override = default;
std::shared_ptr<WaitableEvent> postWorkerTask(std::shared_ptr<Closure> task) override;
bool isAsync() override;
private:
PlatformMethods *mPlatform;
};
// A function wrapper to execute the closure and to notify the waitable
// event after the execution.
class DelegateWorkerTask
{
public:
DelegateWorkerTask(std::shared_ptr<Closure> task, std::shared_ptr<AsyncWaitableEvent> waitable)
: mTask(task), mWaitable(waitable)
{}
DelegateWorkerTask() = delete;
DelegateWorkerTask(DelegateWorkerTask &) = delete;
static void RunTask(void *userData)
{
DelegateWorkerTask *workerTask = static_cast<DelegateWorkerTask *>(userData);
(*workerTask->mTask)();
workerTask->mWaitable->markAsReady();
// Delete the task after its execution.
delete workerTask;
}
private:
~DelegateWorkerTask() = default;
std::shared_ptr<Closure> mTask;
std::shared_ptr<AsyncWaitableEvent> mWaitable;
};
ANGLE_NO_SANITIZE_CFI_ICALL
std::shared_ptr<WaitableEvent> DelegateWorkerPool::postWorkerTask(std::shared_ptr<Closure> task)
{
// Thread safety: This function is thread-safe because the |postWorkerTask| platform method is
// expected to be thread safe. For Chromium, that forwards the call to the |TaskTracker| class
// in base/task/thread_pool/task_tracker.h which is thread-safe.
auto waitable = std::make_shared<AsyncWaitableEvent>();
// The task will be deleted by DelegateWorkerTask::RunTask(...) after its execution.
DelegateWorkerTask *workerTask = new DelegateWorkerTask(task, waitable);
mPlatform->postWorkerTask(mPlatform, DelegateWorkerTask::RunTask, workerTask);
return waitable;
}
bool DelegateWorkerPool::isAsync()
{
return true;
}
#endif
// static
std::shared_ptr<WorkerThreadPool> WorkerThreadPool::Create(size_t numThreads,
PlatformMethods *platform)
{
const bool multithreaded = numThreads != 1;
std::shared_ptr<WorkerThreadPool> pool(nullptr);
#if ANGLE_DELEGATE_WORKERS
const bool hasPostWorkerTaskImpl = platform->postWorkerTask != nullptr;
if (hasPostWorkerTaskImpl && multithreaded)
{
pool = std::shared_ptr<WorkerThreadPool>(new DelegateWorkerPool(platform));
}
#endif
#if ANGLE_STD_ASYNC_WORKERS
if (!pool && multithreaded)
{
pool = std::shared_ptr<WorkerThreadPool>(new AsyncWorkerPool(
numThreads == 0 ? std::thread::hardware_concurrency() : numThreads));
}
#endif
if (!pool)
{
return std::shared_ptr<WorkerThreadPool>(new SingleThreadedWorkerPool());
}
return pool;
}
} // namespace angle