Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1680911

Re: [patch V2 2/2] mm/memory-hotplug: Switch locking to a percpu rwsem

Show all headers | View raw

On 07/04/2017 11:32 AM, Thomas Gleixner wrote:
> Andrey reported a potential deadlock with the memory hotplug lock and the
> cpu hotplug lock.
> 
> The reason is that memory hotplug takes the memory hotplug lock and then
> calls stop_machine() which calls get_online_cpus(). That's the reverse lock
> order to get_online_cpus(); get_online_mems(); in mm/slub_common.c
> 
> The problem has been there forever. The reason why this was never reported
> is that the cpu hotplug locking had this homebrewn recursive reader writer
> semaphore construct which due to the recursion evaded the full lock dep
> coverage. The memory hotplug code copied that construct verbatim and
> therefor has similar issues.
> 
> Three steps to fix this:
> 
> 1) Convert the memory hotplug locking to a per cpu rwsem so the potential
>    issues get reported proper by lockdep.
> 
> 2) Lock the online cpus in mem_hotplug_begin() before taking the memory
>    hotplug rwsem and use stop_machine_cpuslocked() in the page_alloc code
>    and use to avoid recursive locking.

     ^ s/and use // ?

> 
> 3) The cpu hotpluck locking in #2 causes a recursive locking of the cpu
>    hotplug lock via __offline_pages() -> lru_add_drain_all(). Solve this by
>    invoking lru_add_drain_all_cpuslocked() instead.
> 
> Reported-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Michal Hocko <mhocko@kernel.org>
> Cc: linux-mm@kvack.org
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Vlastimil Babka <vbabka@suse.cz>
> Cc: Vladimir Davydov <vdavydov.dev@gmail.com>

Acked-by: Vlastimil Babka <vbabka@suse.cz>

> ---
>  mm/memory_hotplug.c |   89 ++++++++--------------------------------------------
>  mm/page_alloc.c     |    2 -
>  2 files changed, 16 insertions(+), 75 deletions(-)

Nice! Glad to see the crazy code go.

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[patch V2 0/2] mm/memory_hotplug: Cure potential deadlocks vs. cpu  hotplug lock Thomas Gleixner <tglx@linutronix.de> - 2017-07-04 11:40 +0200
  [patch V2 1/2] mm: swap: Provide lru_add_drain_all_cpuslocked() Thomas Gleixner <tglx@linutronix.de> - 2017-07-04 11:40 +0200
    Re: [patch V2 1/2] mm: swap: Provide lru_add_drain_all_cpuslocked() Michal Hocko <mhocko@kernel.org> - 2017-07-04 13:00 +0200
      Re: [patch V2 1/2] mm: swap: Provide  lru_add_drain_all_cpuslocked() Thomas Gleixner <tglx@linutronix.de> - 2017-07-04 14:50 +0200
        Re: [patch V2 1/2] mm: swap: Provide lru_add_drain_all_cpuslocked() Michal Hocko <mhocko@kernel.org> - 2017-07-04 15:00 +0200
    Re: [patch V2 1/2] mm: swap: Provide lru_add_drain_all_cpuslocked() Vlastimil Babka <vbabka@suse.cz> - 2017-07-04 14:10 +0200
      Re: [patch V2 1/2] mm: swap: Provide  lru_add_drain_all_cpuslocked() Thomas Gleixner <tglx@linutronix.de> - 2017-07-04 14:40 +0200
  [patch V2 2/2] mm/memory-hotplug: Switch locking to a percpu rwsem Thomas Gleixner <tglx@linutronix.de> - 2017-07-04 11:40 +0200
    Re: [patch V2 2/2] mm/memory-hotplug: Switch locking to a percpu  rwsem Michal Hocko <mhocko@kernel.org> - 2017-07-04 13:00 +0200
    Re: [patch V2 2/2] mm/memory-hotplug: Switch locking to a percpu  rwsem Vlastimil Babka <vbabka@suse.cz> - 2017-07-04 14:20 +0200
      Re: [patch V2 2/2] mm/memory-hotplug: Switch locking to a percpu  rwsem Thomas Gleixner <tglx@linutronix.de> - 2017-07-04 15:00 +0200
    Re: [patch V2 2/2] mm/memory-hotplug: Switch locking to a percpu  rwsem Davidlohr Bueso <dave@stgolabs.net> - 2017-07-04 17:10 +0200
      Re: [patch V2 2/2] mm/memory-hotplug: Switch locking to a percpu  rwsem Davidlohr Bueso <dave@stgolabs.net> - 2017-07-04 17:30 +0200
        Re: [patch V2 2/2] mm/memory-hotplug: Switch locking to a percpu  rwsem Thomas Gleixner <tglx@linutronix.de> - 2017-07-04 17:40 +0200
          Re: [patch V2 2/2] mm/memory-hotplug: Switch locking to a percpu  rwsem Davidlohr Bueso <dave@stgolabs.net> - 2017-07-04 17:50 +0200
  Re: [patch V2 0/2] mm/memory_hotplug: Cure potential deadlocks vs.  cpu hotplug lock Andrew Morton <akpm@linux-foundation.org> - 2017-07-06 00:00 +0200
    Re: [patch V2 0/2] mm/memory_hotplug: Cure potential deadlocks vs.  cpu hotplug lock Thomas Gleixner <tglx@linutronix.de> - 2017-07-06 08:40 +0200

csiph-web