Replace mutexQueuePeek with current_job field for BIO memcheck fix#3256
Merged
Conversation
Signed-off-by: Alina Liu <liusalisa6363@gmail.com>
JimB123
approved these changes
Feb 25, 2026
JimB123
left a comment
Member
There was a problem hiding this comment.
Thanks Alina. This looks like a simpler solution and solves the problem in BIO where the unclean thread termination occurs. It removes the PEEK API from the mutexQueue as "peek" is awkward in MPMC situations.
madolson
approved these changes
Feb 25, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## unstable #3256 +/- ##
================================
================================
🚀 New features to boost your workflow:
|
Contributor
|
LGTM thanks! |
This was referenced Feb 27, 2026
JimB123
pushed a commit
that referenced
this pull request
Feb 28, 2026
Suppress valgrind for BIO jobs valgrind errors: https://github.com/valkey-io/valkey/actions/runs/21969557125/job/63467641572#step:6:8648 ## Changes - Add `allocBioJob()` with `__attribute__((noinline))` as a centralized allocation function for all BIO jobs. The `noinline` attribute ensures it appears as a distinct frame in valgrind stack traces. - Replace all direct `zmalloc` calls in `bioCreate*Job` functions with`allocBioJob()`. - Add a valgrind suppression in `src/valgrind.sup` matching definite leaks with `allocBioJob` in the call stack. - Remove `current_job` introduced in #3256 --------- Signed-off-by: Alina Liu <liusalisa6363@gmail.com>
hpatro
pushed a commit
to hpatro/valkey
that referenced
this pull request
Mar 5, 2026
…alkey-io#3256) ## Problem The peek-then-pop pattern introduced in valkey-io#3178 solved the valgrind false-positive leak report (https://github.com/valkey-io/valkey/actions/runs/21969557125/job/63467641572#step:6:8648) for in-flight BIO jobs, but `peek` is a problematic API on a mutexqueue: multiple readers can peek the same item, and one reader can pop what another peeked. ## Fix Instead, store the in-flight job pointer in `bio_worker_data.current_job` before processing and clear it after freeing. Since `bio_workers[]` is a static array, valgrind can always trace from global memory to the job allocation, even after the worker thread is cancelled. Removed `mutexQueuePeek` from mutexqueue.{c,h} and its test. ## Test Manually run Daily workflow: All four valgrind jobs are green: `test-valgrind-test` passed, `test-valgrind-misc` passed, `test-valgrind-no-malloc-usable-size-test` passed, `test-valgrind-no-malloc-usable-size-misc` passed. Signed-off-by: Alina Liu <liusalisa6363@gmail.com> Signed-off-by: Harkrishn Patro <bunty.hari@gmail.com>
hpatro
pushed a commit
to hpatro/valkey
that referenced
this pull request
Mar 5, 2026
Suppress valgrind for BIO jobs valgrind errors: https://github.com/valkey-io/valkey/actions/runs/21969557125/job/63467641572#step:6:8648 ## Changes - Add `allocBioJob()` with `__attribute__((noinline))` as a centralized allocation function for all BIO jobs. The `noinline` attribute ensures it appears as a distinct frame in valgrind stack traces. - Replace all direct `zmalloc` calls in `bioCreate*Job` functions with`allocBioJob()`. - Add a valgrind suppression in `src/valgrind.sup` matching definite leaks with `allocBioJob` in the call stack. - Remove `current_job` introduced in valkey-io#3256 --------- Signed-off-by: Alina Liu <liusalisa6363@gmail.com> Signed-off-by: Harkrishn Patro <bunty.hari@gmail.com>
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
4 participants
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.
Problem
The peek-then-pop pattern introduced in #3178 solved the valgrind false-positive leak report (https://github.com/valkey-io/valkey/actions/runs/21969557125/job/63467641572#step:6:8648) for in-flight BIO jobs, but
peekis a problematic API on a mutexqueue: multiple readers can peek the same item, and one reader can pop what another peeked.Fix
Instead, store the in-flight job pointer in
bio_worker_data.current_jobbefore processing and clear it after freeing. Sincebio_workers[]is a static array, valgrind can always trace from global memory to the job allocation, even after the worker thread is cancelled.Removed
mutexQueuePeekfrom mutexqueue.{c,h} and its test.Test
Manually run Daily workflow: All four valgrind jobs are green:
test-valgrind-testpassed,test-valgrind-miscpassed,test-valgrind-no-malloc-usable-size-testpassed,test-valgrind-no-malloc-usable-size-miscpassed.