| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <8201946a5b8b26dab35738b87da24ff27a9f9270.1649166391.git.robin.murphy@arm.com>
Date: Tue, 5 Apr 2022 14:46:31 +0100
From: Robin Murphy <robin.murphy@....com>
To: ogabbay@...nel.org, arnd@...db.de, gregkh@...uxfoundation.org
Cc: linux-kernel@...r.kernel.org, iommu@...ts.linux-foundation.org
Subject: [PATCH] habanalabs: Stop using iommu_present()
Even if an IOMMU might be present for some PCI segment in the system,
that doesn't necessarily mean it provides translation for the device
we care about. Replace iommu_present() with a more appropriate check.
Signed-off-by: Robin Murphy <robin.murphy@....com>
---
drivers/misc/habanalabs/gaudi/gaudi.c | 8 ++++----
drivers/misc/habanalabs/goya/goya.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
index 21c2b678ff72..5dc66dc7618e 100644
--- a/drivers/misc/habanalabs/gaudi/gaudi.c
+++ b/drivers/misc/habanalabs/gaudi/gaudi.c
@@ -6133,7 +6133,7 @@ static int gaudi_debugfs_read32(struct hl_device *hdev, u64 addr,
rc = -EIO;
} else if (addr >= HOST_PHYS_BASE && addr < host_phys_end &&
- user_address && !iommu_present(&pci_bus_type)) {
+ user_address && !device_iommu_mapped(&hdev->pdev->dev)) {
*val = *(u32 *) phys_to_virt(addr - HOST_PHYS_BASE);
@@ -6176,7 +6176,7 @@ static int gaudi_debugfs_write32(struct hl_device *hdev, u64 addr,
rc = -EIO;
} else if (addr >= HOST_PHYS_BASE && addr < host_phys_end &&
- user_address && !iommu_present(&pci_bus_type)) {
+ user_address && !device_iommu_mapped(&hdev->pdev->dev)) {
*(u32 *) phys_to_virt(addr - HOST_PHYS_BASE) = val;
@@ -6223,7 +6223,7 @@ static int gaudi_debugfs_read64(struct hl_device *hdev, u64 addr,
rc = -EIO;
} else if (addr >= HOST_PHYS_BASE && addr < host_phys_end &&
- user_address && !iommu_present(&pci_bus_type)) {
+ user_address && !device_iommu_mapped(&hdev->pdev->dev)) {
*val = *(u64 *) phys_to_virt(addr - HOST_PHYS_BASE);
@@ -6268,7 +6268,7 @@ static int gaudi_debugfs_write64(struct hl_device *hdev, u64 addr,
rc = -EIO;
} else if (addr >= HOST_PHYS_BASE && addr < host_phys_end &&
- user_address && !iommu_present(&pci_bus_type)) {
+ user_address && !device_iommu_mapped(&hdev->pdev->dev)) {
*(u64 *) phys_to_virt(addr - HOST_PHYS_BASE) = val;
diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
index ec9358bcbf0b..0c455bf460f4 100644
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@ -4309,7 +4309,7 @@ static int goya_debugfs_read32(struct hl_device *hdev, u64 addr,
rc = -EIO;
} else if (addr >= HOST_PHYS_BASE && addr < host_phys_end &&
- user_address && !iommu_present(&pci_bus_type)) {
+ user_address && !device_iommu_mapped(&hdev->pdev->dev)) {
*val = *(u32 *) phys_to_virt(addr - HOST_PHYS_BASE);
} else {
@@ -4369,7 +4369,7 @@ static int goya_debugfs_write32(struct hl_device *hdev, u64 addr,
rc = -EIO;
} else if (addr >= HOST_PHYS_BASE && addr < host_phys_end &&
- user_address && !iommu_present(&pci_bus_type)) {
+ user_address && !device_iommu_mapped(&hdev->pdev->dev)) {
*(u32 *) phys_to_virt(addr - HOST_PHYS_BASE) = val;
} else {
@@ -4418,7 +4418,7 @@ static int goya_debugfs_read64(struct hl_device *hdev, u64 addr,
rc = -EIO;
} else if (addr >= HOST_PHYS_BASE && addr < host_phys_end &&
- user_address && !iommu_present(&pci_bus_type)) {
+ user_address && !device_iommu_mapped(&hdev->pdev->dev)) {
*val = *(u64 *) phys_to_virt(addr - HOST_PHYS_BASE);
} else {
@@ -4465,7 +4465,7 @@ static int goya_debugfs_write64(struct hl_device *hdev, u64 addr,
rc = -EIO;
} else if (addr >= HOST_PHYS_BASE && addr < host_phys_end &&
- user_address && !iommu_present(&pci_bus_type)) {
+ user_address && !device_iommu_mapped(&hdev->pdev->dev)) {
*(u64 *) phys_to_virt(addr - HOST_PHYS_BASE) = val;
} else {
--
2.28.0.dirty
Powered by blists - more mailing lists