From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DF7A606A31C for ; Mon, 16 Nov 2026 08:20:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=pWAPMHCU; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=kP859x1W DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=LyPjg2E0PNn9cbVAYSizK7C8d7eNwvUHf19SePJDyrM=; b=pWAPMHCUczZ1FG V85Qw9kJxGz9EUaryBxdKKxf3IW6XCswB7ERQkKZ5TcSTioRGrUicXrA72vneyDsux6Js2UmB9uhZ JTc5YFWDnrH7Cub4o3alxkCt11M04T+6N9GNMF285iGBH99Z/7k931sNkIi/DUBbHHiLZ3RA73gvG rifbWpZjlaC82QqzkpgPWFNmvrltDaQYQAUBFsY1HQwiD9tOJDhLaabZHtmXK3LnUQAaUQ4t5DLPK h1w8+wRiJKyiEszAU/rKapm+eGbNmwsKayyr/+O+yFUKzjrTxiGR/dE8qg7krVsBnWTB0wPCWfTzm wDqnEOO6t0NzSfOL6MSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xSrwh-00000001XiQ-1KcM; Mon, 16 Nov 2026 08:20:11 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xSrwg-00000001Xhh-228M for linux-arm-kernel@lists.infradead.org; Mon, 16 Nov 2026 08:20:10 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id F121D40A81; Mon, 16 Nov 2026 08:20:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 067A11F000C4; Mon, 16 Nov 2026 08:19:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794817209; bh=LyPjg2E0PNn9cbVAYSizK7C8d7eNwvUHf19SePJDyrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kP859x1WSILYDy/zuuJg11KME06/c4spUgqW0jxLMZgFIlAaz+CvbjaNXnpGC1vc8 4zxLQUgPKAD0EsCLmoc9J+FdvZFIBaFEcak2Srqw99YCQg/B0BcvuiF9Fst6ACunPg u9FnlFQFhLnlSyb3UaYNtGNWIPaalm+OXGxtuMXU7YP8TL6+24nuAsOHFXcmOMZDsu 3BbENBpjSanh8Px65co4/qJyRgutY3LLS3m2UQMr6Tfh5uErAjYwP1+AhVy/2PA4ZF rrJr45xildwEp4krCDy39JsAbTWNirjYROhQSWiU4tijownLZqajYWdU/ABWshQuXE BRqZwSfSeUaYQ== From: "Aneesh Kumar K.V (Arm)" To: linux-coco@lists.linux.dev Cc: "Aneesh Kumar K.V (Arm)" , Alex Williamson , Alexey Kardashevskiy , Bjorn Helgaas , Catalin Marinas , Jacob Pan , Jason Gunthorpe , Joerg Roedel , Jonathan Cameron , Jonathan Hunter , Kevin Tian , Krishna Reddy , Lukas Wunner , Nicolin Chen , Robin Murphy , Samuel Ortiz , Shameer Kolothum , Steven Price , Suravee Suthikulpanit , Suzuki K Poulose , Thierry Reding , Vasant Hegde , Will Deacon , Xu Yilun , Ashish Kalra , Herbert Xu , iommu@lists.linux.dev, Jonathan Cameron , Tom Lendacky , kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-tegra@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v9 02/13] virt: coco: tsm: Remove the device from lookup before PCI teardown Date: Mon, 16 Nov 2026 13:49:24 +0530 Message-ID: <20261116081935.85372-3-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261116081935.85372-1-aneesh.kumar@kernel.org> References: <20261116081935.85372-1-aneesh.kumar@kernel.org> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 PCI connect looks up a TSM by ID under pci_tsm_rwsem. Previously, pci_tsm_unregister() released that lock after tearing down PCI state while the TSM was still in the class lookup. 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. Reviewed-by: Kevin Tian Cc: Alexey Kardashevskiy Cc: Jason Gunthorpe Cc: Lukas Wunner Cc: linux-coco@lists.linux.dev Fixes: 3225f52cde56 ("PCI/TSM: Establish Secure Sessions and Link Encryption") Signed-off-by: Aneesh Kumar K.V (Arm) --- drivers/virt/coco/tsm-core.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/virt/coco/tsm-core.c b/drivers/virt/coco/tsm-core.c index 03894c5663f1..57db3f14cf46 100644 --- a/drivers/virt/coco/tsm-core.c +++ b/drivers/virt/coco/tsm-core.c @@ -56,23 +56,22 @@ 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(struct tsm_dev *tsm_dev, struct pci_tsm_ops *pci_ops) { int rc; 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(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); -- 2.43.0