Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eecd24d authored by gkiranku's avatar gkiranku Committed by Indira Biruduraju
Browse files

msm: kgsl: skip if requested address doesn't fall in the svm range 



User should not be provided address out of SVM region.
Return error for any such requests from user.

Change-Id: If149044039b156f8192f405714f5c1a0571004e7
Signed-off-by: default avatargkiranku <gkiranku@codeaurora.org>
Signed-off-by: default avatarDeepak Kumar <dkumar@codeaurora.org>
Signed-off-by: default avatarIndira Biruduraju <ibirudur@codeaurora.org>
parent 1593b765

drivers/gpu/msm/kgsl_iommu.c

+19 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2427,6 +2427,22 @@ static uint64_t kgsl_iommu_find_svm_region(struct kgsl_pagetable *pagetable, 
	return addr;

}



static bool iommu_addr_in_svm_ranges(struct kgsl_iommu_pt *pt,

	u64 gpuaddr, u64 size)

{

	if ((gpuaddr >= pt->compat_va_start && gpuaddr < pt->compat_va_end) &&

		((gpuaddr + size) > pt->compat_va_start &&

			(gpuaddr + size) <= pt->compat_va_end))

		return true;



	if ((gpuaddr >= pt->svm_start && gpuaddr < pt->svm_end) &&

		((gpuaddr + size) > pt->svm_start &&

			(gpuaddr + size) <= pt->svm_end))

		return true;



	return false;

}



static int kgsl_iommu_set_svm_region(struct kgsl_pagetable *pagetable,

		uint64_t gpuaddr, uint64_t size)

{
@@ -2434,9 +2450,8 @@ static int kgsl_iommu_set_svm_region(struct kgsl_pagetable *pagetable, 
	struct kgsl_iommu_pt *pt = pagetable->priv;

	struct rb_node *node;



	/* Make sure the requested address doesn't fall in the global range */

	if (ADDR_IN_GLOBAL(pagetable->mmu, gpuaddr) ||

			ADDR_IN_GLOBAL(pagetable->mmu, gpuaddr + size))

	/* Make sure the requested address doesn't fall out of SVM range */

	if (!iommu_addr_in_svm_ranges(pt, gpuaddr, size))

		return -ENOMEM;



	spin_lock(&pagetable->lock);