Commit 10cfafd6 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher

drm/amd/amdgpu: Partial revert of iova debugfs

We discovered that on some devices even with iommu enabled
you can access all of system memory through the iommu translation.

Therefore, we revert the read method to the translation only service
and drop the write method completely.
Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarChristan König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a49ccdbd
...@@ -1784,98 +1784,34 @@ static ssize_t amdgpu_iova_to_phys_read(struct file *f, char __user *buf, ...@@ -1784,98 +1784,34 @@ static ssize_t amdgpu_iova_to_phys_read(struct file *f, char __user *buf,
size_t size, loff_t *pos) size_t size, loff_t *pos)
{ {
struct amdgpu_device *adev = file_inode(f)->i_private; struct amdgpu_device *adev = file_inode(f)->i_private;
ssize_t result, n;
int r; int r;
uint64_t phys; uint64_t phys;
void *ptr;
struct iommu_domain *dom; struct iommu_domain *dom;
dom = iommu_get_domain_for_dev(adev->dev); // always return 8 bytes
if (!dom) if (size != 8)
return -EFAULT; return -EINVAL;
result = 0;
while (size) {
// get physical address and map
phys = iommu_iova_to_phys(dom, *pos);
// copy upto one page
if (size > PAGE_SIZE)
n = PAGE_SIZE;
else
n = size;
// to end of the page
if (((*pos & (PAGE_SIZE - 1)) + n) >= PAGE_SIZE)
n = PAGE_SIZE - (*pos & (PAGE_SIZE - 1));
ptr = kmap(pfn_to_page(PFN_DOWN(phys)));
if (!ptr)
return -EFAULT;
r = copy_to_user(buf, ptr, n);
kunmap(pfn_to_page(PFN_DOWN(phys)));
if (r)
return -EFAULT;
*pos += n;
size -= n;
result += n;
}
return result;
}
static ssize_t amdgpu_iova_to_phys_write(struct file *f, const char __user *buf, // only accept page addresses
size_t size, loff_t *pos) if (*pos & 0xFFF)
{ return -EINVAL;
struct amdgpu_device *adev = file_inode(f)->i_private;
ssize_t result, n;
int r;
uint64_t phys;
void *ptr;
struct iommu_domain *dom;
dom = iommu_get_domain_for_dev(adev->dev); dom = iommu_get_domain_for_dev(adev->dev);
if (!dom) if (dom)
return -EFAULT;
result = 0;
while (size) {
// get physical address and map
phys = iommu_iova_to_phys(dom, *pos); phys = iommu_iova_to_phys(dom, *pos);
else
phys = *pos;
// copy upto one page r = copy_to_user(buf, &phys, 8);
if (size > PAGE_SIZE) if (r)
n = PAGE_SIZE; return -EFAULT;
else
n = size;
// to end of the page
if (((*pos & (PAGE_SIZE - 1)) + n) >= PAGE_SIZE)
n = PAGE_SIZE - (*pos & (PAGE_SIZE - 1));
ptr = kmap(pfn_to_page(PFN_DOWN(phys)));
if (!ptr)
return -EFAULT;
r = copy_from_user(ptr, buf, n);
kunmap(pfn_to_page(PFN_DOWN(phys)));
if (r)
return -EFAULT;
*pos += n;
size -= n;
result += n;
}
return result; return 8;
} }
static const struct file_operations amdgpu_ttm_iova_fops = { static const struct file_operations amdgpu_ttm_iova_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = amdgpu_iova_to_phys_read, .read = amdgpu_iova_to_phys_read,
.write = amdgpu_iova_to_phys_write,
.llseek = default_llseek .llseek = default_llseek
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment