Commit 4cd24494 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: set TMZ bits in PTEs for secure BO (v4) 



If a buffer object is secure, i.e. created with
AMDGPU_GEM_CREATE_ENCRYPTED, then the TMZ bit of
the PTEs that belong the buffer object should be
set.

v1: design and draft the skeletion of TMZ bits setting on PTEs (Alex)
v2: return failure once create secure BO on non-TMZ platform  (Ray)
v3: amdgpu_bo_encrypted() only checks the BO (Luben)
v4: move TMZ flag setting into amdgpu_vm_bo_update  (Christian)

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
parent cb5fae14

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+11 −1
Original line number Diff line number Diff line
@@ -233,7 +233,8 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
		      AMDGPU_GEM_CREATE_CPU_GTT_USWC |

		      AMDGPU_GEM_CREATE_VRAM_CLEARED |

		      AMDGPU_GEM_CREATE_VM_ALWAYS_VALID |

		      AMDGPU_GEM_CREATE_EXPLICIT_SYNC))

		      AMDGPU_GEM_CREATE_EXPLICIT_SYNC |

		      AMDGPU_GEM_CREATE_ENCRYPTED))



		return -EINVAL;
@@ -241,6 +242,11 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
	if (args->in.domains & ~AMDGPU_GEM_DOMAIN_MASK)

		return -EINVAL;



	if (!adev->tmz.enabled && (flags & AMDGPU_GEM_CREATE_ENCRYPTED)) {

		DRM_ERROR("Cannot allocate secure buffer while tmz is disabled\n");

		return -EINVAL;

	}



	/* create a gem object to contain this object in */

	if (args->in.domains & (AMDGPU_GEM_DOMAIN_GDS |

	    AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA)) {
@@ -262,6 +268,10 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
		resv = vm->root.base.bo->tbo.base.resv;

	}



	if (flags & AMDGPU_GEM_CREATE_ENCRYPTED) {

		/* XXX: pad out alignment to meet TMZ requirements */

	}



	r = amdgpu_gem_object_create(adev, size, args->in.alignment,

				     (u32)(0xffffffff & args->in.domains),

				     flags, ttm_bo_type_device, resv, &gobj);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h

+11 −0
Original line number Diff line number Diff line
@@ -229,6 +229,17 @@ static inline bool amdgpu_bo_explicit_sync(struct amdgpu_bo *bo) 
	return bo->flags & AMDGPU_GEM_CREATE_EXPLICIT_SYNC;

}



/**

 * amdgpu_bo_encrypted - test if the BO is encrypted

 * @bo: pointer to a buffer object

 *

 * Return true if the buffer object is encrypted, false otherwise.

 */

static inline bool amdgpu_bo_encrypted(struct amdgpu_bo *bo)

{

	return bo->flags & AMDGPU_GEM_CREATE_ENCRYPTED;

}



bool amdgpu_bo_is_amdgpu_bo(struct ttm_buffer_object *bo);

void amdgpu_bo_placement_from_domain(struct amdgpu_bo *abo, u32 domain);

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+4 −0
Original line number Diff line number Diff line
@@ -1784,6 +1784,10 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, 


	if (bo) {

		flags = amdgpu_ttm_tt_pte_flags(adev, bo->tbo.ttm, mem);



		if (amdgpu_bo_encrypted(bo))

			flags |= AMDGPU_PTE_TMZ;



		bo_adev = amdgpu_ttm_adev(bo->tbo.bdev);

	} else {

		flags = 0x0;