diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-07-07 12:07:37 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-07-07 12:07:37 -0700 |
| commit | 83ec88d81aa8762d4fb75f95365da6b73a38efe9 (patch) | |
| tree | 193501a42e488ec81871136d19e0edb129a4a154 /lib/sbitmap.c | |
| parent | cf21b355ccb39b0de0b6a7362532bb5584c84a80 (diff) | |
| parent | ef4ab3ba4e4f99b1f3af3a7b74815f59394d822e (diff) | |
| download | linux-stable-83ec88d81aa8762d4fb75f95365da6b73a38efe9.tar.gz linux-stable-83ec88d81aa8762d4fb75f95365da6b73a38efe9.tar.bz2 linux-stable-83ec88d81aa8762d4fb75f95365da6b73a38efe9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'lib/sbitmap.c')
| -rw-r--r-- | lib/sbitmap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sbitmap.c b/lib/sbitmap.c index ae4fd4de9ebe..29eb0484215a 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -528,7 +528,7 @@ unsigned long __sbitmap_queue_get_batch(struct sbitmap_queue *sbq, int nr_tags, sbitmap_deferred_clear(map); if (map->word == (1UL << (map_depth - 1)) - 1) - continue; + goto next; nr = find_first_zero_bit(&map->word, map_depth); if (nr + nr_tags <= map_depth) { @@ -539,6 +539,8 @@ unsigned long __sbitmap_queue_get_batch(struct sbitmap_queue *sbq, int nr_tags, get_mask = ((1UL << map_tags) - 1) << nr; do { val = READ_ONCE(map->word); + if ((val & ~get_mask) != val) + goto next; ret = atomic_long_cmpxchg(ptr, val, get_mask | val); } while (ret != val); get_mask = (get_mask & ~ret) >> nr; @@ -549,6 +551,7 @@ unsigned long __sbitmap_queue_get_batch(struct sbitmap_queue *sbq, int nr_tags, return get_mask; } } +next: /* Jump to next index. */ if (++index >= sb->map_nr) index = 0; |