Skip to content

Commit 38b1a53

Browse files
committed
sbitmap: remove redundant check in __sbitmap_queue_get_batch
jira LE-4034 Rebuild_History Non-Buildable kernel-4.18.0-553.72.1.el8_10 commit-author Kemeng Shi <shikemeng@huaweicloud.com> commit 903e86f Commit fbb564a ("lib/sbitmap: Fix invalid loop in __sbitmap_queue_get_batch()") mentioned that "Checking free bits when setting the target bits. Otherwise, it may reuse the busying bits." This commit add check to make sure all masked bits in word before cmpxchg is zero. Then the existing check after cmpxchg to check any zero bit is existing in masked bits in word is redundant. Actually, old value of word before cmpxchg is stored in val and we will filter out busy bits in val by "(get_mask & ~val)" after cmpxchg. So we will not reuse busy bits methioned in commit fbb564a ("lib/sbitmap: Fix invalid loop in __sbitmap_queue_get_batch()"). Revert new-added check to remove redundant check. Fixes: fbb564a ("lib/sbitmap: Fix invalid loop in __sbitmap_queue_get_batch()") Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> Link: https://lore.kernel.org/r/20230116205059.3821738-3-shikemeng@huaweicloud.com Signed-off-by: Jens Axboe <axboe@kernel.dk> (cherry picked from commit 903e86f) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 6f1201e commit 38b1a53

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

lib/sbitmap.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,9 @@ unsigned long __sbitmap_queue_get_batch(struct sbitmap_queue *sbq, int nr_tags,
533533

534534
get_mask = ((1UL << nr_tags) - 1) << nr;
535535
val = READ_ONCE(map->word);
536-
do {
537-
if ((val & ~get_mask) != val)
538-
goto next;
539-
} while (!atomic_long_try_cmpxchg(ptr, &val,
540-
get_mask | val));
536+
while (!atomic_long_try_cmpxchg(ptr, &val,
537+
get_mask | val))
538+
;
541539
get_mask = (get_mask & ~val) >> nr;
542540
if (get_mask) {
543541
*offset = nr + (index << sb->shift);

0 commit comments

Comments
 (0)