]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
powerpc/pseries: Fix hcall tracing recursion in pv queued spinlocks
authorNicholas Piggin <npiggin@gmail.com>
Sat, 8 May 2021 10:14:52 +0000 (20:14 +1000)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 30 Jun 2021 06:26:55 +0000 (08:26 +0200)
commitb91d984f4fbcb5f88225a153934b6840c6c0b1dd
tree86f3cc119f6669b0f35fa9ed74222eb549b5220c
parentfff510f23a52711de27cfa902e58de0ca9f67a53
powerpc/pseries: Fix hcall tracing recursion in pv queued spinlocks

BugLink: https://bugs.launchpad.net/bugs/1931896
[ Upstream commit 2c8c89b95831f46a2fb31a8d0fef4601694023ce ]

The paravit queued spinlock slow path adds itself to the queue then
calls pv_wait to wait for the lock to become free. This is implemented
by calling H_CONFER to donate cycles.

When hcall tracing is enabled, this H_CONFER call can lead to a spin
lock being taken in the tracing code, which will result in the lock to
be taken again, which will also go to the slow path because it queues
behind itself and so won't ever make progress.

An example trace of a deadlock:

  __pv_queued_spin_lock_slowpath
  trace_clock_global
  ring_buffer_lock_reserve
  trace_event_buffer_lock_reserve
  trace_event_buffer_reserve
  trace_event_raw_event_hcall_exit
  __trace_hcall_exit
  plpar_hcall_norets_trace
  __pv_queued_spin_lock_slowpath
  trace_clock_global
  ring_buffer_lock_reserve
  trace_event_buffer_lock_reserve
  trace_event_buffer_reserve
  trace_event_raw_event_rcu_dyntick
  rcu_irq_exit
  irq_exit
  __do_irq
  call_do_irq
  do_IRQ
  hardware_interrupt_common_virt

Fix this by introducing plpar_hcall_norets_notrace(), and using that to
make SPLPAR virtual processor dispatching hcalls by the paravirt
spinlock code.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210508101455.1578318-2-npiggin@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
arch/powerpc/include/asm/hvcall.h
arch/powerpc/include/asm/paravirt.h
arch/powerpc/platforms/pseries/hvCall.S
arch/powerpc/platforms/pseries/lpar.c