Commit 678418c6 authored by Kemeng Shi's avatar Kemeng Shi Committed by Jens Axboe

sbitmap: add sbitmap_find_bit to remove repeat code in __sbitmap_get/__sbitmap_get_shallow

There are three differences between __sbitmap_get and
__sbitmap_get_shallow when searching free bit:
1. __sbitmap_get_shallow limit number of bit to search per word.
__sbitmap_get has no such limit.
2. __sbitmap_get_shallow always searches with wrap set. __sbitmap_get set
wrap according to round_robin.
3. __sbitmap_get_shallow always searches from first bit in first word.
__sbitmap_get searches from first bit when round_robin is not set
otherwise searches from SB_NR_TO_BIT(sb, alloc_hint).

Add helper function sbitmap_find_bit function to do common search while
accept "limit depth per word", "wrap flag" and "first bit to
search" from caller to support the need of both __sbitmap_get and
__sbitmap_get_shallow.
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Link: https://lore.kernel.org/r/20230116205059.3821738-5-shikemeng@huaweicloud.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 08470a98
...@@ -186,27 +186,22 @@ static int sbitmap_find_bit_in_word(struct sbitmap_word *map, ...@@ -186,27 +186,22 @@ static int sbitmap_find_bit_in_word(struct sbitmap_word *map,
return nr; return nr;
} }
static int __sbitmap_get(struct sbitmap *sb, unsigned int alloc_hint) static int sbitmap_find_bit(struct sbitmap *sb,
unsigned int depth,
unsigned int index,
unsigned int alloc_hint,
bool wrap)
{ {
unsigned int i, index; unsigned int i;
int nr = -1; int nr = -1;
index = SB_NR_TO_INDEX(sb, alloc_hint);
/*
* Unless we're doing round robin tag allocation, just use the
* alloc_hint to find the right word index. No point in looping
* twice in find_next_zero_bit() for that case.
*/
if (sb->round_robin)
alloc_hint = SB_NR_TO_BIT(sb, alloc_hint);
else
alloc_hint = 0;
for (i = 0; i < sb->map_nr; i++) { for (i = 0; i < sb->map_nr; i++) {
nr = sbitmap_find_bit_in_word(&sb->map[index], nr = sbitmap_find_bit_in_word(&sb->map[index],
__map_depth(sb, index), min_t(unsigned int,
alloc_hint, !sb->round_robin); __map_depth(sb, index),
depth),
alloc_hint, wrap);
if (nr != -1) { if (nr != -1) {
nr += index << sb->shift; nr += index << sb->shift;
break; break;
...@@ -221,6 +216,26 @@ static int __sbitmap_get(struct sbitmap *sb, unsigned int alloc_hint) ...@@ -221,6 +216,26 @@ static int __sbitmap_get(struct sbitmap *sb, unsigned int alloc_hint)
return nr; return nr;
} }
static int __sbitmap_get(struct sbitmap *sb, unsigned int alloc_hint)
{
unsigned int index;
index = SB_NR_TO_INDEX(sb, alloc_hint);
/*
* Unless we're doing round robin tag allocation, just use the
* alloc_hint to find the right word index. No point in looping
* twice in find_next_zero_bit() for that case.
*/
if (sb->round_robin)
alloc_hint = SB_NR_TO_BIT(sb, alloc_hint);
else
alloc_hint = 0;
return sbitmap_find_bit(sb, UINT_MAX, index, alloc_hint,
!sb->round_robin);
}
int sbitmap_get(struct sbitmap *sb) int sbitmap_get(struct sbitmap *sb)
{ {
int nr; int nr;
...@@ -242,31 +257,12 @@ static int __sbitmap_get_shallow(struct sbitmap *sb, ...@@ -242,31 +257,12 @@ static int __sbitmap_get_shallow(struct sbitmap *sb,
unsigned int alloc_hint, unsigned int alloc_hint,
unsigned long shallow_depth) unsigned long shallow_depth)
{ {
unsigned int i, index; unsigned int index;
int nr = -1;
index = SB_NR_TO_INDEX(sb, alloc_hint); index = SB_NR_TO_INDEX(sb, alloc_hint);
alloc_hint = SB_NR_TO_BIT(sb, alloc_hint); alloc_hint = SB_NR_TO_BIT(sb, alloc_hint);
for (i = 0; i < sb->map_nr; i++) { return sbitmap_find_bit(sb, shallow_depth, index, alloc_hint, true);
nr = sbitmap_find_bit_in_word(&sb->map[index],
min_t(unsigned int,
__map_depth(sb, index),
shallow_depth),
alloc_hint, true);
if (nr != -1) {
nr += index << sb->shift;
break;
}
/* Jump to next index. */
alloc_hint = 0;
if (++index >= sb->map_nr)
index = 0;
}
return nr;
} }
int sbitmap_get_shallow(struct sbitmap *sb, unsigned long shallow_depth) int sbitmap_get_shallow(struct sbitmap *sb, unsigned long shallow_depth)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment