Avoid Stripe Mutex lock contention for RWW#12794
Avoid Stripe Mutex lock contention for RWW#12794masaori335 wants to merge 3 commits intoapache:masterfrom
Conversation
There was a problem hiding this comment.
Pull request overview
This PR optimizes cache read performance by introducing a dedicated reader-writer lock (ts::bravo::shared_mutex) in the OpenDir class, reducing mutex contention for reader-while-writer (RWW) scenarios. The change allows concurrent read operations on OpenDir without requiring the StripeSM mutex, resulting in a reported 9.9% improvement in maximum requests per second under specific test conditions.
Changes:
- Added
ts::bravo::shared_mutexto OpenDir for fine-grained locking instead of relying on StripeSM mutex - Refactored open_read to work without holding the stripe mutex, enabling lock-free RWW path
- Introduced
new_CacheVC_for_readhelper function to reduce code duplication in Cache.cc - Added
CACHE_EVENT_OPEN_DIR_RETRYevent type for handling retries in the new locking scheme - Made OpenDir members private and reorganized API documentation in StripeSM.h
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| src/iocore/cache/StripeSM.h | Added API grouping comments to clarify OpenDir and PreservationTable methods |
| src/iocore/cache/P_CacheDir.h | Changed OpenDir to class with private members, added _shared_mutex for concurrency control |
| src/iocore/cache/CacheDir.cc | Implemented shared/exclusive locking in open_write, close_write, and open_read; updated signal_readers for new locking model |
| src/iocore/cache/Cache.cc | Refactored open_read to check OpenDir without stripe mutex first, added helper function for CacheVC creation |
| include/iocore/cache/CacheDefs.h | Added CACHE_EVENT_OPEN_DIR_RETRY event type for retry handling |
Comments suppressed due to low confidence (1)
src/iocore/cache/CacheDir.cc:193
- Potential use-after-free race condition: The open_read() method returns a raw pointer to an OpenDirEntry while holding a shared lock, but the lock is released when the function returns (line 183 creates a scoped lock). The caller then uses this pointer without any lock protection. Meanwhile, close_write() can acquire the writer lock and free the OpenDirEntry (line 174: THREAD_FREE). This creates a window where the returned OpenDirEntry pointer could be freed while the caller is still using it, leading to a use-after-free. The old code avoided this because both operations held the stripe mutex. Consider using reference counting for OpenDirEntry or ensuring the caller holds some protection until done with the entry.
OpenDirEntry *
OpenDir::open_read(const CryptoHash *key) const
{
ts::bravo::shared_lock lock(_shared_mutex);
unsigned int h = key->slice32(0);
int b = h % OPEN_DIR_BUCKETS;
for (OpenDirEntry *d = _bucket[b].head; d; d = d->link.next) {
if (d->writers.head->first_key == *key) {
return d;
}
}
return nullptr;
}
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
3a775da to
1812d90
Compare
|
Benchmark of the new commit says almost the same, 58,904 rps vs 65,339 rps. |
|
@masaori335 Is there a guarantee that close_write() can't run between open_read() returning and the caller setting c->od? If the caller and writer are on different EThreads (which they can be for the same stripe), this seems like a valid race. Could open_read() return the entry while still holding the shared lock (e.g., via a lock guard the caller holds)? |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 8 out of 8 changed files in this pull request and generated 7 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
bryancall
left a comment
There was a problem hiding this comment.
Asked a question and waiting for an answer. Marking it as request changes, hoping it will be seen easier.
1812d90 to
e83b1ea
Compare
|
The race of I spawn another benchmark on our tool, I'll reply the result later. |
|
The benchmark result was almost the same as before 58,098.5 vs 65,882.5 req/s. |
I found that if
OpenDirhas own reader-writer lock, it doesn't needStripeSM mutex. This means we can avoid the StripeSM mutex lock contention issue for reader-while-writer cases.Benchmarking RWW is a bit tricky but one of benchmark says max rps is improved 9.9% in below conditions.
Conditions:
Cache-Control: public, max-age=0///< some requests goes RWW pathResult:
part of #12788