drm/msm: Split the a5xx preemption record
Subsystems (4)
PATCH 1/2 drm/msm: Split the a5xx preemption record
The main a5xx preemption record can be marked as privileged to protect it from user access but the counters storage needs to be remain unprivileged. Split the buffers mark the critical memory privileged.
Signed-off-by Jordan Crouse <[email protected]>
---
drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 1 + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 25 ++++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.h +1 -0
@@ -31,6 +31,7 @@ struct a5xx_gpu {struct msm_ringbuffer *next_ring;struct drm_gem_object *preempt_bo[MSM_GPU_MAX_RINGS ]; +struct drm_gem_object *preempt_counters_bo[MSM_GPU_MAX_RINGS ];struct a5xx_preempt_record *preempt[MSM_GPU_MAX_RINGS ];uint64_t preempt_iova[MSM_GPU_MAX_RINGS ];
drivers/gpu/drm/msm/adreno/a5xx_preempt.c +20 -5
@@ -226,19 +226,31 @@ static int preempt_init_ring(struct a5xx_gpu *a5xx_gpu,struct adreno_gpu *adreno_gpu = &a5xx_gpu->base;struct msm_gpu *gpu = &adreno_gpu->base;struct a5xx_preempt_record *ptr; -struct drm_gem_object *bo =NULL ; -u64 iova =0 ; +void *counters; +struct drm_gem_object *bo =NULL , *counters_bo =NULL ; +u64 iova =0 , counters_iova =0 ; ptr =msm_gem_kernel_new (gpu->dev,A5XX_PREEMPT_RECORD_SIZE +A5XX_PREEMPT_COUNTER_SIZE , -MSM_BO_UNCACHED , gpu->aspace, &bo, &iova); +MSM_BO_UNCACHED |MSM_BO_MAP_PRIV , gpu->aspace, &bo, &iova);if (IS_ERR (ptr))return PTR_ERR (ptr); +/* The buffer to store counters needs to be unprivileged */ + counters =msm_gem_kernel_new (gpu->dev, +A5XX_PREEMPT_COUNTER_SIZE , +MSM_BO_UNCACHED , gpu->aspace, &counters_bo, &counters_iova); +if (IS_ERR (counters)) { +msm_gem_kernel_put (bo, gpu->aspace, true); +return PTR_ERR (counters); + } +msm_gem_object_set_name (bo,"preempt" ); +msm_gem_object_set_name (counters_bo,"preempt_counters" ); a5xx_gpu->preempt_bo[ring->id] = bo; + a5xx_gpu->preempt_counters_bo[ring->id] = counters_bo; a5xx_gpu->preempt_iova[ring->id] = iova; a5xx_gpu->preempt[ring->id] = ptr;
@@ -249,7 +261,7 @@ static int preempt_init_ring(struct a5xx_gpu *a5xx_gpu, ptr->data =0 ; ptr->cntl =MSM_GPU_RB_CNTL_DEFAULT ; ptr->rptr_addr =rbmemptr (ring, rptr); - ptr->counter = iova +A5XX_PREEMPT_RECORD_SIZE ; + ptr->counter = counters_iova;return 0 ; }
@@ -260,8 +272,11 @@ void a5xx_preempt_fini(struct msm_gpu *gpu)struct a5xx_gpu *a5xx_gpu =to_a5xx_gpu (adreno_gpu);int i; -for (i =0 ; i < gpu->nr_rings; i++) +for (i =0 ; i < gpu->nr_rings; i++) {msm_gem_kernel_put (a5xx_gpu->preempt_bo[i], gpu->aspace, true); +msm_gem_kernel_put (a5xx_gpu->preempt_counters_bo[i], + gpu->aspace, true); + } }void a5xx_preempt_init (struct msm_gpu *gpu)
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/2 drm/msm: Enable expanded apriv support for a650
a650 supports expanded apriv support that allows us to map critical buffers (ringbuffer and memstore) as as privileged to protect them from corruption.
Signed-off-by Jordan Crouse <[email protected]>
---
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 6 +++++- drivers/gpu/drm/msm/msm_gpu.c | 2 +- drivers/gpu/drm/msm/msm_gpu.h | 11 +++++++++++ drivers/gpu/drm/msm/msm_ringbuffer.c | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +5 -1
@@ -678,7 +678,8 @@ static int a6xx_hw_init(struct msm_gpu *gpu) A6XX_PROTECT_RDONLY(0x980, 0x4));gpu_write (gpu,REG_A6XX_CP_PROTECT (25 ),A6XX_PROTECT_RW (0xa630 ,0x0 )); -if (adreno_is_a650 (adreno_gpu)) { +/* Enable expanded apriv for targets that support it */ +if (gpu->hw_apriv) {gpu_write (gpu,REG_A6XX_CP_APRIV_CNTL , (1 <<6 ) | (1 <<5 ) | (1 <<3 ) | (1 <<2 ) | (1 <<1 )); }
@@ -1056,6 +1057,9 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) adreno_gpu->registers =NULL ; adreno_gpu->reg_offsets = a6xx_register_offsets; +if (adreno_is_a650 (adreno_gpu)) + adreno_gpu->base.hw_apriv = true; + ret =adreno_gpu_init (dev, pdev, adreno_gpu, &funcs,1 );if (ret) {a6xx_destroy (&(a6xx_gpu->base.base));
drivers/gpu/drm/msm/msm_gpu.c +1 -1
@@ -908,7 +908,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, memptrs =msm_gem_kernel_new (drm,sizeof (struct msm_rbmemptrs ) * nr_rings, -MSM_BO_UNCACHED , gpu->aspace, &gpu->memptrs_bo, +check_apriv (gpu,MSM_BO_UNCACHED ), gpu->aspace, &gpu->memptrs_bo, &memptrs_iova);if (IS_ERR (memptrs)) {
drivers/gpu/drm/msm/msm_gpu.h +11 -0
@@ -15,6 +15,7 @@#include "msm_drv.h" #include "msm_fence.h" #include "msm_ringbuffer.h" +#include "msm_gem.h" struct msm_gem_submit ;struct msm_gpu_perfcntr ;
@@ -139,6 +140,8 @@ struct msm_gpu { } devfreq;struct msm_gpu_state *crashstate; +/* True if the hardware supports expanded apriv (a650 and newer) */ +bool hw_apriv; };/* It turns out that all targets use the same ringbuffer size */
@@ -327,4 +330,12 @@ static inline void msm_gpu_crashstate_put(struct msm_gpu *gpu) mutex_unlock(&gpu->dev->struct_mutex); } +/* +* Simple macro to semi-cleanly add the MAP_PRIV flag for targets that can +* support expanded privileges +*/ +#define check_apriv (gpu, flags) \ + (((gpu)->hw_apriv ? MSM_BO_MAP_PRIV : 0) | (flags)) + +#endif /* __MSM_GPU_H__ */
drivers/gpu/drm/msm/msm_ringbuffer.c +2 -2
@@ -27,8 +27,8 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int id, ring->id = id; ring->start =msm_gem_kernel_new (gpu->dev,MSM_GPU_RINGBUFFER_SZ , -MSM_BO_WC |MSM_BO_GPU_READONLY , gpu->aspace, &ring->bo, - &ring->iova); +check_apriv (gpu,MSM_BO_WC |MSM_BO_GPU_READONLY ), + gpu->aspace, &ring->bo, &ring->iova);if (IS_ERR (ring->start)) { ret =PTR_ERR (ring->start);
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel