From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Levi Yun <yeoreum.yun@arm.com>,
Denis Nikitin <denik@chromium.org>,
Christoph Hellwig <hch@lst.de>, Sasha Levin <sashal@kernel.org>,
m.szyprowski@samsung.com, iommu@lists.linux.dev
Subject: [PATCH AUTOSEL 5.10 19/33] dma-debug: fix a possible deadlock on radix_lock
Date: Sun, 24 Nov 2024 08:53:31 -0500 [thread overview]
Message-ID: <20241124135410.3349976-19-sashal@kernel.org> (raw)
In-Reply-To: <20241124135410.3349976-1-sashal@kernel.org>
From: Levi Yun <yeoreum.yun@arm.com>
[ Upstream commit 7543c3e3b9b88212fcd0aaf5cab5588797bdc7de ]
radix_lock() shouldn't be held while holding dma_hash_entry[idx].lock
otherwise, there's a possible deadlock scenario when
dma debug API is called holding rq_lock():
CPU0 CPU1 CPU2
dma_free_attrs()
check_unmap() add_dma_entry() __schedule() //out
(A) rq_lock()
get_hash_bucket()
(A) dma_entry_hash
check_sync()
(A) radix_lock() (W) dma_entry_hash
dma_entry_free()
(W) radix_lock()
// CPU2's one
(W) rq_lock()
CPU1 situation can happen when it extending radix tree and
it tries to wake up kswapd via wake_all_kswapd().
CPU2 situation can happen while perf_event_task_sched_out()
(i.e. dma sync operation is called while deleting perf_event using
etm and etr tmc which are Arm Coresight hwtracing driver backends).
To remove this possible situation, call dma_entry_free() after
put_hash_bucket() in check_unmap().
Reported-by: Denis Nikitin <denik@chromium.org>
Closes: https://lists.linaro.org/archives/list/coresight@lists.linaro.org/thread/2WMS7BBSF5OZYB63VT44U5YWLFP5HL6U/#RWM6MLQX5ANBTEQ2PRM7OXCBGCE6NPWU
Signed-off-by: Levi Yun <yeoreum.yun@arm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
kernel/dma/debug.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
index 654b039dfc335..d19f610c9eef8 100644
--- a/kernel/dma/debug.c
+++ b/kernel/dma/debug.c
@@ -1047,9 +1047,13 @@ static void check_unmap(struct dma_debug_entry *ref)
}
hash_bucket_del(entry);
- dma_entry_free(entry);
-
put_hash_bucket(bucket, flags);
+
+ /*
+ * Free the entry outside of bucket_lock to avoid ABBA deadlocks
+ * between that and radix_lock.
+ */
+ dma_entry_free(entry);
}
static void check_for_stack(struct device *dev,
--
2.43.0
next prev parent reply other threads:[~2024-11-24 13:54 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-24 13:53 [PATCH AUTOSEL 5.10 01/33] drm/vc4: hvs: Set AXI panic modes for the HVS Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 02/33] drm: panel-orientation-quirks: Add quirk for AYA NEO 2 model Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 03/33] drm/mcde: Enable module autoloading Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 04/33] drm/radeon/r600_cs: Fix possible int overflow in r600_packet3_check() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 05/33] r8169: don't apply UDP padding quirk on RTL8126A Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 06/33] samples/bpf: Fix a resource leak Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 07/33] net: fec_mpc52xx_phy: Use %pa to format resource_size_t Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 08/33] net: ethernet: fs_enet: " Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 09/33] net/sched: cbs: Fix integer overflow in cbs_set_port_rate() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 10/33] af_packet: avoid erroring out after sock_init_data() in packet_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 11/33] Bluetooth: L2CAP: do not leave dangling sk pointer on error in l2cap_sock_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 12/33] net: af_can: do not leave a dangling sk pointer in can_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 13/33] net: ieee802154: do not leave a dangling sk pointer in ieee802154_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 14/33] net: inet: do not leave a dangling sk pointer in inet_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 15/33] net: inet6: do not leave a dangling sk pointer in inet6_create() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 16/33] wifi: ath5k: add PCI ID for SX76X Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 17/33] wifi: ath5k: add PCI ID for Arcadyan devices Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 18/33] drm/amdgpu: refine error handling in amdgpu_ttm_tt_pin_userptr Sasha Levin
2024-11-24 13:53 ` Sasha Levin [this message]
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 20/33] jfs: array-index-out-of-bounds fix in dtReadFirst Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 21/33] jfs: fix shift-out-of-bounds in dbSplit Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 22/33] jfs: fix array-index-out-of-bounds in jfs_readdir Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 23/33] jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 24/33] net: enetc: add i.MX95 EMDIO support Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 25/33] drm/amdgpu: skip amdgpu_device_cache_pci_state under sriov Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 26/33] drm/amdgpu: set the right AMDGPU sg segment limitation Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 27/33] wifi: ipw2x00: libipw_rx_any(): fix bad alignment Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 28/33] wifi: brcmfmac: Fix oops due to NULL pointer dereference in brcmf_sdiod_sglist_rw() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 29/33] Bluetooth: btusb: Add RTL8852BE device 0489:e123 to device tables Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 30/33] ASoC: hdmi-codec: reorder channel allocation list Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 31/33] rocker: fix link status detection in rocker_carrier_init() Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 32/33] net/neighbor: clear error in case strict check is not set Sasha Levin
2024-11-24 13:53 ` [PATCH AUTOSEL 5.10 33/33] netpoll: Use rcu_access_pointer() in __netpoll_setup Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241124135410.3349976-19-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=denik@chromium.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=stable@vger.kernel.org \
--cc=yeoreum.yun@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox