iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sbitmap: optimise sbitmap_deferred_clear()

Browse Source 
Because of spinlocks and atomics sbitmap_deferred_clear() have to reload
&sb->map[index] on each access even though the map address won't change.
Pass in sbitmap_word instead of {sb, index}, so it's cached in a
variable. It also improves code generation of
sbitmap_find_bit_in_index().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: John Garry <john.garry@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2020-11-22 15:35:45 +00:00 committed by Jens Axboe
parent f6f371f7db
commit b78beea038
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/sbitmap.c
View File

@ -12,32 +12,32 @@
/* /*
* See if we have deferred clears that we can batch move * See if we have deferred clears that we can batch move
*/ */
static inline bool sbitmap_deferred_clear(struct sbitmap *sb, int index) static inline bool sbitmap_deferred_clear(struct sbitmap_word *map)
{ {
unsigned long mask, val; unsigned long mask, val;
bool ret = false; bool ret = false;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&sb->map[index].swap_lock, flags); spin_lock_irqsave(&map->swap_lock, flags);
if (!sb->map[index].cleared) if (!map->cleared)
goto out_unlock; goto out_unlock;
/* /*
* First get a stable cleared mask, setting the old mask to 0. * First get a stable cleared mask, setting the old mask to 0.
*/ */
mask = xchg(&sb->map[index].cleared, 0); mask = xchg(&map->cleared, 0);
/* /*
* Now clear the masked bits in our free word * Now clear the masked bits in our free word
*/ */
do { do {
val = sb->map[index].word; val = map->word;
} while (cmpxchg(&sb->map[index].word, val, val & ~mask) != val); } while (cmpxchg(&map->word, val, val & ~mask) != val);
ret = true; ret = true;
out_unlock: out_unlock:
spin_unlock_irqrestore(&sb->map[index].swap_lock, flags); spin_unlock_irqrestore(&map->swap_lock, flags);
return ret; return ret;
} }
@ -92,7 +92,7 @@ void sbitmap_resize(struct sbitmap *sb, unsigned int depth)
unsigned int i; unsigned int i;
for (i = 0; i < sb->map_nr; i++) for (i = 0; i < sb->map_nr; i++)
sbitmap_deferred_clear(sb, i); sbitmap_deferred_clear(&sb->map[i]);
sb->depth = depth; sb->depth = depth;
sb->map_nr = DIV_ROUND_UP(sb->depth, bits_per_word); sb->map_nr = DIV_ROUND_UP(sb->depth, bits_per_word);
@ -139,15 +139,15 @@ static int __sbitmap_get_word(unsigned long *word, unsigned long depth,
static int sbitmap_find_bit_in_index(struct sbitmap *sb, int index, static int sbitmap_find_bit_in_index(struct sbitmap *sb, int index,
unsigned int alloc_hint, bool round_robin) unsigned int alloc_hint, bool round_robin)
{ {
struct sbitmap_word *map = &sb->map[index];
int nr; int nr;
do { do {
nr = __sbitmap_get_word(&sb->map[index].word, nr = __sbitmap_get_word(&map->word, map->depth, alloc_hint,
sb->map[index].depth, alloc_hint,
!round_robin); !round_robin);
if (nr != -1) if (nr != -1)
break; break;
if (!sbitmap_deferred_clear(sb, index)) if (!sbitmap_deferred_clear(map))
break; break;
} while (1); } while (1);
@ -207,7 +207,7 @@ again:
break; break;
} }
if (sbitmap_deferred_clear(sb, index)) if (sbitmap_deferred_clear(&sb->map[index]))
goto again; goto again;
/* Jump to next index. */ /* Jump to next index. */