Unverified Commit 711bbfbe authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10365 drm/amdkfd: don't allow mapping the MMIO HDP page with large pages 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UI66PV7VUH6ODRS46J5RRNQFNOB3I44C/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAEF52 
 
Link:https://gitee.com/openeuler/kernel/pulls/10365

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 433a779d c810b079

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

+4 −1
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ static int kfd_ioctl_alloc_memory_of_gpu(struct file *filep, 
			goto err_unlock;

		}

		offset = amdgpu_amdkfd_get_mmio_remap_phys_addr(dev->kgd);

		if (!offset) {

		if (!offset || (PAGE_SIZE > 4096)) {

			err = -ENOMEM;

			goto err_unlock;

		}
@@ -1962,6 +1962,9 @@ static int kfd_mmio_mmap(struct kfd_dev *dev, struct kfd_process *process, 
	if (vma->vm_end - vma->vm_start != PAGE_SIZE)

		return -EINVAL;



	if (PAGE_SIZE > 4096)

		return -EINVAL;



	address = amdgpu_amdkfd_get_mmio_remap_phys_addr(dev->kgd);



	vma->vm_flags |= VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_NORESERVE |