Commit f07e0f84 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Linus Torvalds

mm/swap_slots.c: don't disable preemption while taking the per-CPU cache

get_cpu_var() disables preemption and returns the per-CPU version of the
variable.  Disabling preemption is useful to ensure atomic access to the
variable within the critical section.

In this case however, after the per-CPU version of the variable is
obtained the ->free_lock is acquired.  For that reason it seems the raw
accessor could be used.  It only seems that ->slots_ret should be
retested (because with disabled preemption this variable can not be set
to NULL otherwise).

This popped up during PREEMPT-RT testing because it tries to take
spinlocks in a preempt disabled section.  In RT, spinlocks can sleep.

Link: http://lkml.kernel.org/r/20170623114755.2ebxdysacvgxzott@linutronix.deSigned-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ying Huang <ying.huang@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b002529d
...@@ -273,11 +273,11 @@ int free_swap_slot(swp_entry_t entry) ...@@ -273,11 +273,11 @@ int free_swap_slot(swp_entry_t entry)
{ {
struct swap_slots_cache *cache; struct swap_slots_cache *cache;
cache = &get_cpu_var(swp_slots); cache = raw_cpu_ptr(&swp_slots);
if (use_swap_slot_cache && cache->slots_ret) { if (use_swap_slot_cache && cache->slots_ret) {
spin_lock_irq(&cache->free_lock); spin_lock_irq(&cache->free_lock);
/* Swap slots cache may be deactivated before acquiring lock */ /* Swap slots cache may be deactivated before acquiring lock */
if (!use_swap_slot_cache) { if (!use_swap_slot_cache || !cache->slots_ret) {
spin_unlock_irq(&cache->free_lock); spin_unlock_irq(&cache->free_lock);
goto direct_free; goto direct_free;
} }
...@@ -297,7 +297,6 @@ int free_swap_slot(swp_entry_t entry) ...@@ -297,7 +297,6 @@ int free_swap_slot(swp_entry_t entry)
direct_free: direct_free:
swapcache_free_entries(&entry, 1); swapcache_free_entries(&entry, 1);
} }
put_cpu_var(swp_slots);
return 0; return 0;
} }
......
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