Re: [PATCH v8 02/15] virt: coco: tsm: Remove the device from lookup before PCI teardown

From: Alexey Kardashevskiy

Date: Thu Nov 12 2026 - 06:17:45 EST


On 5/11/26 03:16, Aneesh Kumar K.V (Arm) wrote:
PCI connect looks up a TSM by ID under pci_tsm_rwsem. Previously,
tsm_unregister() released that lock after tearing down PCI state while
the TSM was still in the class lookup.

tsm_unregister() is not touching that lock, what do I miss?

A racing connect could then
attach a new PCI context that the teardown would never see.

Remove the device from the class lookup first, then take the PCI write
lock to drain in-flight operations and destroy their contexts. Drop the
device reference only after PCI teardown completes.

Fixes: 3225f52cde56 ("PCI/TSM: Establish Secure Sessions and Link Encryption")
Signed-off-by: Aneesh Kumar K.V (Arm) <aneesh.kumar@xxxxxxxxxx>
---
drivers/virt/coco/tsm-core.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/drivers/virt/coco/tsm-core.c b/drivers/virt/coco/tsm-core.c
index e784993353d8..f79135986102 100644
--- a/drivers/virt/coco/tsm-core.c
+++ b/drivers/virt/coco/tsm-core.c
@@ -56,26 +56,25 @@ static struct tsm_dev *alloc_tsm_dev(struct device *parent)
return no_free_ptr(tsm_dev);
}
-static struct tsm_dev *tsm_register_pci_or_reset(struct tsm_dev *tsm_dev,
- struct pci_tsm_ops *pci_ops)
+static int tsm_register_pci(struct tsm_dev *tsm_dev, struct pci_tsm_ops *pci_ops)

Why changing a pointer to an int here as later tsm_register() converts it back to a pointer?

And I never understood what is _reset for here (so +1 for that) but now we have tsm_register_pci() and pci_tsm_register() which is weird. May be just open code it? Thanks,


{
int rc;
if (!pci_ops)
- return tsm_dev;
+ return 0;
tsm_dev->pci_ops = pci_ops;
rc = pci_tsm_register(tsm_dev);
if (rc) {
+ tsm_dev->pci_ops = NULL;
dev_err(tsm_dev->dev.parent,
"PCI/TSM registration failure: %d\n", rc);
- device_unregister(&tsm_dev->dev);
- return ERR_PTR(rc);
+ return rc;
}
/* Notify TSM userspace that PCI/TSM operations are now possible */
kobject_uevent(&tsm_dev->dev.kobj, KOBJ_CHANGE);
- return tsm_dev;
+ return 0;
}
struct tsm_dev *tsm_register(struct device *parent, struct pci_tsm_ops *pci_ops)
@@ -96,15 +95,22 @@ struct tsm_dev *tsm_register(struct device *parent, struct pci_tsm_ops *pci_ops)
if (rc)
return ERR_PTR(rc);
- return tsm_register_pci_or_reset(no_free_ptr(tsm_dev), pci_ops);
+ rc = tsm_register_pci(tsm_dev, pci_ops);
+ if (rc) {
+ device_del(dev);
+ return ERR_PTR(rc);
+ }
+ return no_free_ptr(tsm_dev);
}
EXPORT_SYMBOL_GPL(tsm_register);
void tsm_unregister(struct tsm_dev *tsm_dev)
{
+ /* Remove the class lookup first. */
+ device_del(&tsm_dev->dev);
if (tsm_dev->pci_ops)
pci_tsm_unregister(tsm_dev);
- device_unregister(&tsm_dev->dev);
+ put_device(&tsm_dev->dev);
}
EXPORT_SYMBOL_GPL(tsm_unregister);

--
Alexey