From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Padmanabha Srinivasaiah <treasure4paddy@gmail.com>,
Maxime Ripard <maxime@cerno.tech>,
Sasha Levin <sashal@kernel.org>,
emma@anholt.net, mripard@kernel.org, airlied@linux.ie,
daniel@ffwll.ch, dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.15 19/41] drm/vc4: Fix deadlock on DSI device attach error
Date: Thu, 3 Feb 2022 15:32:23 -0500 [thread overview]
Message-ID: <20220203203245.3007-19-sashal@kernel.org> (raw)
In-Reply-To: <20220203203245.3007-1-sashal@kernel.org>
From: Padmanabha Srinivasaiah <treasure4paddy@gmail.com>
[ Upstream commit 0a3d12ab5097b1d045e693412e6b366b7e82031b ]
DSI device attach to DSI host will be done with host device's lock
held.
Un-registering host in "device attach" error path (ex: probe retry)
will result in deadlock with below call trace and non operational
DSI display.
Startup Call trace:
[ 35.043036] rt_mutex_slowlock.constprop.21+0x184/0x1b8
[ 35.043048] mutex_lock_nested+0x7c/0xc8
[ 35.043060] device_del+0x4c/0x3e8
[ 35.043075] device_unregister+0x20/0x40
[ 35.043082] mipi_dsi_remove_device_fn+0x18/0x28
[ 35.043093] device_for_each_child+0x68/0xb0
[ 35.043105] mipi_dsi_host_unregister+0x40/0x90
[ 35.043115] vc4_dsi_host_attach+0xf0/0x120 [vc4]
[ 35.043199] mipi_dsi_attach+0x30/0x48
[ 35.043209] tc358762_probe+0x128/0x164 [tc358762]
[ 35.043225] mipi_dsi_drv_probe+0x28/0x38
[ 35.043234] really_probe+0xc0/0x318
[ 35.043244] __driver_probe_device+0x80/0xe8
[ 35.043254] driver_probe_device+0xb8/0x118
[ 35.043263] __device_attach_driver+0x98/0xe8
[ 35.043273] bus_for_each_drv+0x84/0xd8
[ 35.043281] __device_attach+0xf0/0x150
[ 35.043290] device_initial_probe+0x1c/0x28
[ 35.043300] bus_probe_device+0xa4/0xb0
[ 35.043308] deferred_probe_work_func+0xa0/0xe0
[ 35.043318] process_one_work+0x254/0x700
[ 35.043330] worker_thread+0x4c/0x448
[ 35.043339] kthread+0x19c/0x1a8
[ 35.043348] ret_from_fork+0x10/0x20
Shutdown Call trace:
[ 365.565417] Call trace:
[ 365.565423] __switch_to+0x148/0x200
[ 365.565452] __schedule+0x340/0x9c8
[ 365.565467] schedule+0x48/0x110
[ 365.565479] schedule_timeout+0x3b0/0x448
[ 365.565496] wait_for_completion+0xac/0x138
[ 365.565509] __flush_work+0x218/0x4e0
[ 365.565523] flush_work+0x1c/0x28
[ 365.565536] wait_for_device_probe+0x68/0x158
[ 365.565550] device_shutdown+0x24/0x348
[ 365.565561] kernel_restart_prepare+0x40/0x50
[ 365.565578] kernel_restart+0x20/0x70
[ 365.565591] __do_sys_reboot+0x10c/0x220
[ 365.565605] __arm64_sys_reboot+0x2c/0x38
[ 365.565619] invoke_syscall+0x4c/0x110
[ 365.565634] el0_svc_common.constprop.3+0xfc/0x120
[ 365.565648] do_el0_svc+0x2c/0x90
[ 365.565661] el0_svc+0x4c/0xf0
[ 365.565671] el0t_64_sync_handler+0x90/0xb8
[ 365.565682] el0t_64_sync+0x180/0x184
Signed-off-by: Padmanabha Srinivasaiah <treasure4paddy@gmail.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220118005127.29015-1-treasure4paddy@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/vc4/vc4_dsi.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
index a185027911ce5..d09c1ea60c04e 100644
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -1262,7 +1262,6 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host,
struct mipi_dsi_device *device)
{
struct vc4_dsi *dsi = host_to_dsi(host);
- int ret;
dsi->lanes = device->lanes;
dsi->channel = device->channel;
@@ -1297,18 +1296,15 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host,
return 0;
}
- ret = component_add(&dsi->pdev->dev, &vc4_dsi_ops);
- if (ret) {
- mipi_dsi_host_unregister(&dsi->dsi_host);
- return ret;
- }
-
- return 0;
+ return component_add(&dsi->pdev->dev, &vc4_dsi_ops);
}
static int vc4_dsi_host_detach(struct mipi_dsi_host *host,
struct mipi_dsi_device *device)
{
+ struct vc4_dsi *dsi = host_to_dsi(host);
+
+ component_del(&dsi->pdev->dev, &vc4_dsi_ops);
return 0;
}
@@ -1706,9 +1702,7 @@ static int vc4_dsi_dev_remove(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct vc4_dsi *dsi = dev_get_drvdata(dev);
- component_del(&pdev->dev, &vc4_dsi_ops);
mipi_dsi_host_unregister(&dsi->dsi_host);
-
return 0;
}
--
2.34.1
next prev parent reply other threads:[~2022-02-03 20:35 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-03 20:32 [PATCH AUTOSEL 5.15 01/41] NFS: change nfs_access_get_cached to only report the mask Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 02/41] NFSv4 only print the label when its queried Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 03/41] nfs: nfs4clinet: check the return value of kstrdup() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 04/41] NFSv4.1: Fix uninitialised variable in devicenotify Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 05/41] netfilter: nf_conntrack_netbios_ns: fix helper module alias Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 06/41] NFSv4 remove zero number of fs_locations entries error check Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 07/41] NFSv4 store server support for fs_location attribute Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 08/41] NFSv4.1 query for fs_location attr on a new file system Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 09/41] NFSv4 expose nfs_parse_server_name function Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 10/41] NFSv4 handle port presence in fs_location server string Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 11/41] SUNRPC allow for unspecified transport time in rpc_clnt_add_xprt Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 12/41] net/sunrpc: fix reference count leaks in rpc_sysfs_xprt_state_change Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 13/41] sunrpc: Fix potential race conditions in rpc_sysfs_xprt_state_change() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 14/41] irqchip/realtek-rtl: Service all pending interrupts Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 15/41] perf/x86/rapl: fix AMD event handling Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 16/41] x86/perf: Avoid warning for Arch LBR without XSAVE Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 17/41] sched/pelt: Relax the sync of runnable_sum with runnable_avg Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 18/41] sched: Avoid double preemption in __cond_resched_*lock*() Sasha Levin
2022-02-03 20:32 ` Sasha Levin [this message]
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 20/41] drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 21/41] net: sched: Clarify error message when qdisc kind is unknown Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 22/41] powerpc/fixmap: Fix VM debug warning on unmap Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 23/41] scsi: target: iscsi: Make sure the np under each tpg is unique Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 24/41] scsi: ufs: ufshcd-pltfrm: Check the return value of devm_kstrdup() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 25/41] scsi: qedf: Add stag_work to all the vports Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 26/41] scsi: qedf: Fix refcount issue when LOGO is received during TMF Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 27/41] scsi: qedf: Change context reset messages to ratelimited Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 28/41] scsi: pm8001: Fix bogus FW crash for maxcpus=1 Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 29/41] scsi: ufs: Use generic error code in ufshcd_set_dev_pwr_mode() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 30/41] scsi: ufs: Treat link loss as fatal error Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 31/41] scsi: myrs: Fix crash in error case Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 32/41] net: stmmac: reduce unnecessary wakeups from eee sw timer Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 33/41] PM: wakeup: simplify the output logic of pm_show_wakelocks() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 34/41] PM: hibernate: Remove register_nosave_region_late() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 35/41] drm/amd/display: Correct MPC split policy for DCN301 Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 36/41] usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 37/41] perf: Always wake the parent event Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 38/41] nvme-pci: add the IGNORE_DEV_SUBNQN quirk for Intel P4500/P4600 SSDs Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 39/41] MIPS: Fix build error due to PTR used in more places Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 40/41] net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 41/41] block: add bio_start_io_acct_time() to control start_time 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=20220203203245.3007-19-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime@cerno.tech \
--cc=mripard@kernel.org \
--cc=stable@vger.kernel.org \
--cc=treasure4paddy@gmail.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