Skip to content

Commit 135f97f

Browse files
vwooltorvalds
authored andcommitted
z3fold: remove preempt disabled sections for RT
Replace get_cpu_ptr() with migrate_disable()+this_cpu_ptr() so RT can take spinlocks that become sleeping locks. Signed-off-by Mike Galbraith <efault@gmx.de> Link: https://lkml.kernel.org/r/20201209145151.18994-3-vitaly.wool@konsulko.com Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.com> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent dcf5aed commit 135f97f

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

mm/z3fold.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -623,14 +623,16 @@ static inline void add_to_unbuddied(struct z3fold_pool *pool,
623623
{
624624
if (zhdr->first_chunks == 0 || zhdr->last_chunks == 0 ||
625625
zhdr->middle_chunks == 0) {
626-
struct list_head *unbuddied = get_cpu_ptr(pool->unbuddied);
627-
626+
struct list_head *unbuddied;
628627
int freechunks = num_free_chunks(zhdr);
628+
629+
migrate_disable();
630+
unbuddied = this_cpu_ptr(pool->unbuddied);
629631
spin_lock(&pool->lock);
630632
list_add(&zhdr->buddy, &unbuddied[freechunks]);
631633
spin_unlock(&pool->lock);
632634
zhdr->cpu = smp_processor_id();
633-
put_cpu_ptr(pool->unbuddied);
635+
migrate_enable();
634636
}
635637
}
636638

@@ -880,8 +882,9 @@ static inline struct z3fold_header *__z3fold_alloc(struct z3fold_pool *pool,
880882
int chunks = size_to_chunks(size), i;
881883

882884
lookup:
885+
migrate_disable();
883886
/* First, try to find an unbuddied z3fold page. */
884-
unbuddied = get_cpu_ptr(pool->unbuddied);
887+
unbuddied = this_cpu_ptr(pool->unbuddied);
885888
for_each_unbuddied_list(i, chunks) {
886889
struct list_head *l = &unbuddied[i];
887890

@@ -899,7 +902,7 @@ static inline struct z3fold_header *__z3fold_alloc(struct z3fold_pool *pool,
899902
!z3fold_page_trylock(zhdr)) {
900903
spin_unlock(&pool->lock);
901904
zhdr = NULL;
902-
put_cpu_ptr(pool->unbuddied);
905+
migrate_enable();
903906
if (can_sleep)
904907
cond_resched();
905908
goto lookup;
@@ -913,7 +916,7 @@ static inline struct z3fold_header *__z3fold_alloc(struct z3fold_pool *pool,
913916
test_bit(PAGE_CLAIMED, &page->private)) {
914917
z3fold_page_unlock(zhdr);
915918
zhdr = NULL;
916-
put_cpu_ptr(pool->unbuddied);
919+
migrate_enable();
917920
if (can_sleep)
918921
cond_resched();
919922
goto lookup;
@@ -928,7 +931,7 @@ static inline struct z3fold_header *__z3fold_alloc(struct z3fold_pool *pool,
928931
kref_get(&zhdr->refcount);
929932
break;
930933
}
931-
put_cpu_ptr(pool->unbuddied);
934+
migrate_enable();
932935

933936
if (!zhdr) {
934937
int cpu;

0 commit comments

Comments
 (0)