ggml-opencl: release sub-buffers before parent buffers on teardown - #32
Open
jpgaribotti wants to merge 1 commit into
Open
ggml-opencl: release sub-buffers before parent buffers on teardown#32jpgaribotti wants to merge 1 commit into
jpgaribotti wants to merge 1 commit into
Conversation
The OpenCL buffer context destructor released the parent `buffer` cl_mem objects before deleting the tensor extras whose quant/scale sub-buffers (extra->q / extra->d) are clCreateSubBuffer aliases into those parents. The OpenCL spec defers parent deletion until all sub-buffers are released, but the Adreno/QCOM driver does not reliably honor that ref-counting: tearing down the parent first can free host-side bookkeeping that a later sub-buffer release then touches, corrupting the allocator heap (observed as a Scudo "invalid chunk state" abort in the Q4_0 path on repeated load/unload cycles). Reorder teardown to strict leaf-to-root: images, then extras (sub-buffers), then parent buffers last, so correctness no longer depends on driver sub-buffer ref-counting. Also restore the q4_1 extra cleanup that was dropped from the destructor while the q4_1 alloc/pool paths remained, fixing a leak of the host extras and their sub-buffers on unload.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
The OpenCL buffer context destructor released the parent
buffercl_mem objects before deleting the tensor extras whose quant/scale sub-buffers (extra->q / extra->d) are clCreateSubBuffer aliases into those parents. The OpenCL spec defers parent deletion until all sub-buffers are released, but the Adreno/QCOM driver does not reliably honor that ref-counting: tearing down the parent first can free host-side bookkeeping that a later sub-buffer release then touches, corrupting the allocator heap (observed as a Scudo "invalid chunk state" abort in the Q4_0 path on repeated load/unload cycles).Reorder teardown to strict leaf-to-root: images, then extras (sub-buffers), then parent buffers last, so correctness no longer depends on driver sub-buffer ref-counting.
Also restore the q4_1 extra cleanup that was dropped from the destructor while the q4_1 alloc/pool paths remained, fixing a leak of the host extras and their sub-buffers on unload.