Am 09.02.2018 um 18:28 schrieb Tom St Denis:
> On 09/02/18 12:27 PM, Tom St Denis wrote:
>> From: Christian König <ckoenig.leichtzumerken at gmail.com>
>
> Oops, I'll remove this from the commit message before pushing :-)
>
> I did give you credit below though.
The patch before this one isn't merged yet because I'm still not sure if
that works under all circumstances or not.
Could you give it some extended testing? Especially if it work with
eviction.
Christian.
>
> Tom
>
>>
>> This allows access to pages allocated through the driver with optional
>> IOMMU mapping.
>>
>> v2: Fix number of bytes copied and add write method
>>
>> Original-by: Christian König <christian.koenig at amd.com>
>> Signed-off-by: Tom St Denis <tom.stdenis at amd.com>
>> ---
>> Â drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 110
>> ++++++++++++++++++++++++++------
>> Â 1 file changed, 89 insertions(+), 21 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> index b372d8d650a5..d6c56b001a2c 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> @@ -1929,38 +1929,106 @@ static const struct file_operations
>> amdgpu_ttm_gtt_fops = {
>> Â Â #endif
>> Â -static ssize_t amdgpu_iova_to_phys_read(struct file *f, char
>> __user *buf,
>> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â size_t size, loff_t *pos)
>> +static ssize_t amdgpu_iomem_read(struct file *f, char __user *buf,
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â size_t size, loff_t *pos)
>> Â {
>> Â Â Â Â Â struct amdgpu_device *adev = file_inode(f)->i_private;
>> -Â Â Â int r;
>> -Â Â Â uint64_t phys;
>> Â Â Â Â Â struct iommu_domain *dom;
>> +Â Â Â ssize_t result = 0;
>> +Â Â Â int r;
>> Â -Â Â Â // always return 8 bytes
>> -Â Â Â if (size != 8)
>> -Â Â Â Â Â Â Â return -EINVAL;
>> +Â Â Â dom = iommu_get_domain_for_dev(adev->dev);
>> Â -Â Â Â // only accept page addresses
>> -Â Â Â if (*pos & 0xFFF)
>> -Â Â Â Â Â Â Â return -EINVAL;
>> +Â Â Â while (size) {
>> +Â Â Â Â Â Â Â phys_addr_t addr = *pos & PAGE_MASK;
>> +Â Â Â Â Â Â Â loff_t off = *pos & ~PAGE_MASK;
>> +Â Â Â Â Â Â Â size_t bytes = PAGE_SIZE - off;
>> +Â Â Â Â Â Â Â unsigned long pfn;
>> +Â Â Â Â Â Â Â struct page *p;
>> +Â Â Â Â Â Â Â void *ptr;
>> +
>> +Â Â Â Â Â Â Â bytes = bytes < size ? bytes : size;
>> +
>> +Â Â Â Â Â Â Â addr = dom ? iommu_iova_to_phys(dom, addr) : addr;
>> +
>> +Â Â Â Â Â Â Â pfn = addr >> PAGE_SHIFT;
>> +Â Â Â Â Â Â Â if (!pfn_valid(pfn))
>> +Â Â Â Â Â Â Â Â Â Â Â return -EPERM;
>> +
>> +Â Â Â Â Â Â Â p = pfn_to_page(pfn);
>> +Â Â Â Â Â Â Â if (p->mapping != adev->mman.bdev.dev_mapping)
>> +Â Â Â Â Â Â Â Â Â Â Â return -EPERM;
>> +
>> +Â Â Â Â Â Â Â ptr = kmap(p);
>> +Â Â Â Â Â Â Â if (ptr) {
>> +Â Â Â Â Â Â Â Â Â Â Â r = copy_to_user(buf, ptr, bytes);
>> +Â Â Â Â Â Â Â Â Â Â Â kunmap(p);
>> +Â Â Â Â Â Â Â Â Â Â Â if (r)
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return -EFAULT;
>> +Â Â Â Â Â Â Â } else {
>> +Â Â Â Â Â Â Â Â Â Â Â return -EFAULT;
>> +Â Â Â Â Â Â Â }
>> +
>> +Â Â Â Â Â Â Â size -= bytes;
>> +Â Â Â Â Â Â Â *pos += bytes;
>> +Â Â Â Â Â Â Â result += bytes;
>> +Â Â Â }
>> +
>> +Â Â Â return result;
>> +}
>> +
>> +static ssize_t amdgpu_iomem_write(struct file *f, const char __user
>> *buf,
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â size_t size, loff_t *pos)
>> +{
>> +Â Â Â struct amdgpu_device *adev = file_inode(f)->i_private;
>> +Â Â Â struct iommu_domain *dom;
>> +Â Â Â ssize_t result = 0;
>> +Â Â Â int r;
>> Â Â Â Â Â Â dom = iommu_get_domain_for_dev(adev->dev);
>> -Â Â Â if (dom)
>> -Â Â Â Â Â Â Â phys = iommu_iova_to_phys(dom, *pos);
>> -Â Â Â else
>> -Â Â Â Â Â Â Â phys = *pos;
>> Â -Â Â Â r = copy_to_user(buf, &phys, 8);
>> -Â Â Â if (r)
>> -Â Â Â Â Â Â Â return -EFAULT;
>> +Â Â Â while (size) {
>> +Â Â Â Â Â Â Â phys_addr_t addr = *pos & PAGE_MASK;
>> +Â Â Â Â Â Â Â loff_t off = *pos & ~PAGE_MASK;
>> +Â Â Â Â Â Â Â size_t bytes = PAGE_SIZE - off;
>> +Â Â Â Â Â Â Â unsigned long pfn;
>> +Â Â Â Â Â Â Â struct page *p;
>> +Â Â Â Â Â Â Â void *ptr;
>> +
>> +Â Â Â Â Â Â Â bytes = bytes < size ? bytes : size;
>> +
>> +Â Â Â Â Â Â Â addr = dom ? iommu_iova_to_phys(dom, addr) : addr;
>> Â -Â Â Â return 8;
>> +Â Â Â Â Â Â Â pfn = addr >> PAGE_SHIFT;
>> +Â Â Â Â Â Â Â if (!pfn_valid(pfn))
>> +Â Â Â Â Â Â Â Â Â Â Â return -EPERM;
>> +
>> +Â Â Â Â Â Â Â p = pfn_to_page(pfn);
>> +Â Â Â Â Â Â Â if (p->mapping != adev->mman.bdev.dev_mapping)
>> +Â Â Â Â Â Â Â Â Â Â Â return -EPERM;
>> +
>> +Â Â Â Â Â Â Â ptr = kmap(p);
>> +Â Â Â Â Â Â Â if (ptr) {
>> +Â Â Â Â Â Â Â Â Â Â Â r = copy_from_user(ptr, buf, bytes);
>> +Â Â Â Â Â Â Â Â Â Â Â kunmap(p);
>> +Â Â Â Â Â Â Â Â Â Â Â if (r)
>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return -EFAULT;
>> +Â Â Â Â Â Â Â } else {
>> +Â Â Â Â Â Â Â Â Â Â Â return -EFAULT;
>> +Â Â Â Â Â Â Â }
>> +
>> +Â Â Â Â Â Â Â size -= bytes;
>> +Â Â Â Â Â Â Â *pos += bytes;
>> +Â Â Â Â Â Â Â result += bytes;
>> +Â Â Â }
>> +
>> +Â Â Â return result;
>> Â }
>> Â -static const struct file_operations amdgpu_ttm_iova_fops = {
>> +static const struct file_operations amdgpu_ttm_iomem_fops = {
>> Â Â Â Â Â .owner = THIS_MODULE,
>> -Â Â Â .read = amdgpu_iova_to_phys_read,
>> +Â Â Â .read = amdgpu_iomem_read,
>> +Â Â Â .write = amdgpu_iomem_write,
>> Â Â Â Â Â .llseek = default_llseek
>> Â };
>> Â @@ -1973,7 +2041,7 @@ static const struct {
>> Â #ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
>> Â Â Â Â Â { "amdgpu_gtt", &amdgpu_ttm_gtt_fops, TTM_PL_TT },
>> Â #endif
>> -Â Â Â { "amdgpu_iova", &amdgpu_ttm_iova_fops, TTM_PL_SYSTEM },
>> +Â Â Â { "amdgpu_iomem", &amdgpu_ttm_iomem_fops, TTM_PL_SYSTEM },
>> Â };
>> Â Â #endif
>>
>
