]> git.dujemihanovic.xyz Git - linux.git/commit
net: wan: fsl_qmc_hdlc: Convert carrier_lock spinlock to a mutex
authorHerve Codina <herve.codina@bootlin.com>
Tue, 30 Jul 2024 06:31:04 +0000 (08:31 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 1 Aug 2024 01:06:24 +0000 (18:06 -0700)
commitc4d6a347ba7babdf9d90a0eb24048c266cae0532
tree4882ab97fb7962266e18a2ed0f1a05f44fc53e35
parentfe16667f2959ec89488a872efbd9782bed250d10
net: wan: fsl_qmc_hdlc: Convert carrier_lock spinlock to a mutex

The carrier_lock spinlock protects the carrier detection. While it is
held, framer_get_status() is called which in turn takes a mutex.
This is not correct and can lead to a deadlock.

A run with PROVE_LOCKING enabled detected the issue:
  [ BUG: Invalid wait context ]
  ...
  c204ddbc (&framer->mutex){+.+.}-{3:3}, at: framer_get_status+0x40/0x78
  other info that might help us debug this:
  context-{4:4}
  2 locks held by ifconfig/146:
  #0: c0926a38 (rtnl_mutex){+.+.}-{3:3}, at: devinet_ioctl+0x12c/0x664
  #1: c2006a40 (&qmc_hdlc->carrier_lock){....}-{2:2}, at: qmc_hdlc_framer_set_carrier+0x30/0x98

Avoid the spinlock usage and convert carrier_lock to a mutex.

Fixes: 54762918ca85 ("net: wan: fsl_qmc_hdlc: Add framer support")
Cc: stable@vger.kernel.org
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20240730063104.179553-1-herve.codina@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/wan/fsl_qmc_hdlc.c