github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 20:54:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

thunderbolt: Wait for tb_domain_release() to complete when driver is removed

Browse Source 
We should not call nhi_shutdown() before the domain structure and the
control channel rings are completely released. Otherwise we might
release resources like the nhi->msix_ida that are still referenced in
tb_domain_release(). For this reason wait for the tb_domain_release() to
be completed before continuing to nhi_shutdown() and eventually
releasing of the rest of the data structures.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Mika Westerberg 2025-11-19 12:53:58 +02:00
parent e56249d8a6
commit f5cc545f59
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/thunderbolt/domain.c
View File

@ -319,12 +319,15 @@ const struct bus_type tb_bus_type = {
static void tb_domain_release(struct device *dev) static void tb_domain_release(struct device *dev)
{ {
struct tb *tb = container_of(dev, struct tb, dev); struct tb *tb = container_of(dev, struct tb, dev);
struct tb_nhi *nhi = tb->nhi;
tb_ctl_free(tb->ctl); tb_ctl_free(tb->ctl);
destroy_workqueue(tb->wq); destroy_workqueue(tb->wq);
ida_free(&tb_domain_ida, tb->index); ida_free(&tb_domain_ida, tb->index);
mutex_destroy(&tb->lock); mutex_destroy(&tb->lock);
kfree(tb); kfree(tb);
complete(&nhi->domain_released);
} }
const struct device_type tb_domain_type = { const struct device_type tb_domain_type = {

4
drivers/thunderbolt/nhi.c
View File

@ -1401,6 +1401,8 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
dev_dbg(dev, "NHI initialized, starting thunderbolt\n"); dev_dbg(dev, "NHI initialized, starting thunderbolt\n");
init_completion(&nhi->domain_released);
res = tb_domain_add(tb, host_reset); res = tb_domain_add(tb, host_reset);
if (res) { if (res) {
/* /*
@ -1408,6 +1410,7 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
* activated. Do a proper shutdown. * activated. Do a proper shutdown.
*/ */
tb_domain_put(tb); tb_domain_put(tb);
wait_for_completion(&nhi->domain_released);
nhi_shutdown(nhi); nhi_shutdown(nhi);
return res; return res;
} }
@ -1433,6 +1436,7 @@ static void nhi_remove(struct pci_dev *pdev)
pm_runtime_forbid(&pdev->dev); pm_runtime_forbid(&pdev->dev);
tb_domain_remove(tb); tb_domain_remove(tb);
wait_for_completion(&nhi->domain_released);
nhi_shutdown(nhi); nhi_shutdown(nhi);
} }

2
include/linux/thunderbolt.h
View File

@ -493,6 +493,7 @@ static inline struct tb_xdomain *tb_service_parent(struct tb_service *svc)
* MSI-X is used. * MSI-X is used.
* @hop_count: Number of rings (end point hops) supported by NHI. * @hop_count: Number of rings (end point hops) supported by NHI.
* @quirks: NHI specific quirks if any * @quirks: NHI specific quirks if any
* @domain_released: Completed when domain has been fully released
*/ */
struct tb_nhi { struct tb_nhi {
spinlock_t lock; spinlock_t lock;
@ -507,6 +508,7 @@ struct tb_nhi {
struct work_struct interrupt_work; struct work_struct interrupt_work;
u32 hop_count; u32 hop_count;
unsigned long quirks; unsigned long quirks;
struct completion domain_released;
}; };
/** /**