-
-
Notifications
You must be signed in to change notification settings - Fork 32.4k
gh-115103: Implement delayed memory reclamation (QSBR) #115180
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.
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
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
ede08ee
gh-115103: Implement delayed memory reclamation (QSBR)
colesbury a33b739
Fix default build
colesbury 39e3954
Mark function as static
colesbury f1c3740
Fix indentation in qsbr.c
colesbury 35cbc0e
Merge branch 'main' into gh-115103-qsbr
colesbury b03c5ca
Merge branch 'main' into gh-115103-qsbr
colesbury 94a95d5
Fix potential deadlock and other changes from review
colesbury 69d5669
Add comment about QSBR_LT/QSBR_LEQ
colesbury be441dc
Merge branch 'main' into gh-115103-qsbr
colesbury File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
gh-115103: Implement delayed memory reclamation (QSBR)
This adds a safe memory reclamation scheme based on FreeBSD's "GUS" and quiescent state based reclamation (QSBR). The API provides a mechanism for callers to detect when it is safe to free memory that may be concurrently accessed by readers.
- Loading branch information
commit ede08ee0d4f60ed9992f06526cc6ddb433be670f
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
// The QSBR APIs (quiescent state-based reclamation) provide a mechanism for | ||
// the free-threaded build to safely reclaim memory when there may be | ||
// concurrent accesses. | ||
// | ||
// Many operations in the free-threaded build are protected by locks. However, | ||
// in some cases, we want to allow reads to happen concurrently with updates. | ||
// In this case, we need to delay freeing ("reclaiming") any memory that may be | ||
// concurrently accessed by a reader. The QSBR APIs provide a way to do this. | ||
#ifndef Py_INTERNAL_QSBR_H | ||
#define Py_INTERNAL_QSBR_H | ||
|
||
#include <stdbool.h> | ||
#include <stdint.h> | ||
#include "pycore_lock.h" // PyMutex | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
|
||
#ifndef Py_BUILD_CORE | ||
# error "this header requires Py_BUILD_CORE define" | ||
#endif | ||
|
||
struct _qsbr_shared; | ||
struct _PyThreadStateImpl; // forward declare to avoid circular dependency | ||
|
||
// Per-thread state | ||
struct _qsbr_thread_state { | ||
// Last observed write sequence (or 0 if detached) | ||
uint64_t seq; | ||
|
||
// Shared (per-interpreter) QSBR state | ||
struct _qsbr_shared *shared; | ||
|
||
// Thread state (or NULL) | ||
PyThreadState *tstate; | ||
|
||
// Used to defer advancing write sequence a fixed number of times | ||
int deferrals; | ||
|
||
// Is this thread state allocated? | ||
bool allocated; | ||
struct _qsbr_thread_state *freelist_next; | ||
}; | ||
|
||
// Padding to avoid false sharing | ||
struct _qsbr_pad { | ||
struct _qsbr_thread_state qsbr; | ||
char __padding[64 - sizeof(struct _qsbr_thread_state)]; | ||
}; | ||
|
||
// Per-interpreter state | ||
struct _qsbr_shared { | ||
// Write sequence: always odd, incremented by two | ||
uint64_t wr_seq; | ||
|
||
// Minimum observed read sequence of all QSBR thread states | ||
uint64_t rd_seq; | ||
|
||
// Array of QSBR thread states. | ||
struct _qsbr_pad *array; | ||
Py_ssize_t size; | ||
|
||
// Freelist of unused _qsbr_thread_states (protected by mutex) | ||
PyMutex mutex; | ||
struct _qsbr_thread_state *freelist; | ||
}; | ||
|
||
static inline uint64_t | ||
_Py_qsbr_shared_current(struct _qsbr_shared *shared) | ||
{ | ||
return _Py_atomic_load_uint64_acquire(&shared->wr_seq); | ||
} | ||
|
||
// Reports a quiescent state: the caller no longer holds any pointer to shared | ||
// data not protected by locks or reference counts. | ||
static inline void | ||
_Py_qsbr_quiescent_state(struct _qsbr_thread_state *qsbr) | ||
{ | ||
uint64_t seq = _Py_qsbr_shared_current(qsbr->shared); | ||
_Py_atomic_store_uint64_release(&qsbr->seq, seq); | ||
} | ||
|
||
// Advance the write sequence and return the new goal. This should be called | ||
// after data is removed. The returned goal is used with `_Py_qsbr_poll()` to | ||
// determine when it is safe to reclaim (free) the memory. | ||
extern uint64_t | ||
_Py_qsbr_advance(struct _qsbr_shared *shared); | ||
|
||
// Batches requests to advance the write sequence. This advances the write | ||
// sequence every N calls, which reduces overhead but increases time to | ||
// reclamation. Returns the new goal. | ||
extern uint64_t | ||
_Py_qsbr_deferred_advance(struct _qsbr_thread_state *qsbr); | ||
|
||
// Have the read sequences advanced to the given goal? If this returns true, | ||
// it safe to reclaim any memory tagged with the goal (or earlier goal). | ||
extern bool | ||
_Py_qsbr_poll(struct _qsbr_thread_state *qsbr, uint64_t goal); | ||
|
||
// Called when thread attaches to interpreter | ||
extern void | ||
_Py_qsbr_attach(struct _qsbr_thread_state *qsbr); | ||
|
||
// Called when thread detaches from interpreter | ||
extern void | ||
_Py_qsbr_detach(struct _qsbr_thread_state *qsbr); | ||
|
||
// Reserves (allocates) a QSBR state and returns its index. | ||
extern Py_ssize_t | ||
_Py_qsbr_reserve(PyInterpreterState *interp); | ||
|
||
// Associates a PyThreadState with the QSBR state at the given index | ||
extern void | ||
_Py_qsbr_register(struct _PyThreadStateImpl *tstate, | ||
PyInterpreterState *interp, Py_ssize_t index); | ||
|
||
// Disassociates a PyThreadState from the QSBR state and frees the QSBR state. | ||
extern void | ||
_Py_qsbr_unregister(struct _PyThreadStateImpl *tstate); | ||
|
||
extern void | ||
_Py_qsbr_fini(PyInterpreterState *interp); | ||
|
||
extern void | ||
_Py_qsbr_after_fork(struct _PyThreadStateImpl *tstate); | ||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
#endif /* !Py_INTERNAL_QSBR_H */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can these be inited to
QSBR_INITIAL
(it seems like includingpycore_qsbr.h
shouldn't be an issue?)