<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="Generator" content="Microsoft Exchange Server">  <style></style> </head> <body> <font face="Calibri" size="2"><span style="font-size:10pt;"> <div style="padding-right:5pt;padding-left:5pt;"><font color="green">[Public]<br> </font></div> <div style="margin-top:5pt;"><font face="Times New Roman" size="3"><span style="font-size:12pt;"><br> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> From: Alex Deucher <alexdeucher@gmail.com></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> Sent: Saturday, May 31, 2025 5:48 AM</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> To: Liang, Prike <Prike.Liang@amd.com></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> Cc: amd-gfx@lists.freedesktop.org; Deucher, Alexander</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> Lazar, Lijo <Lijo.Lazar@amd.com></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> Subject: Re: [PATCH 4/9] drm/amdgpu: validate userq buffer virtual address and size</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> On Fri, May 30, 2025 at 3:56 AM Prike Liang <<a href="mailto:Prike.Liang@amd.com">Prike.Liang@amd.com</a>> wrote:</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > It needs to validate the userq object virtual address whether it is</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > validated in vm mapping.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > Signed-off-by: Prike Liang <<a href="mailto:Prike.Liang@amd.com">Prike.Liang@amd.com</a>></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > ---</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 56</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h |</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > 2 + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 25 +++++++++-</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > 3 files changed, 80 insertions(+), 3 deletions(-)</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > index f45585bd5872..32e88064bdea 100644</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > @@ -44,6 +44,41 @@ u32 amdgpu_userq_get_supported_ip_mask(struct</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> amdgpu_device *adev)</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > return userq_ip_mask;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +int amdgpu_userq_input_va_validate(struct amdgpu_vm *vm, u64 addr,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + u64 expected_size) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + struct amdgpu_bo_va_mapping *mapping;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + u64 user_addr;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + u64 size;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + int r;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + addr &= AMDGPU_GMC_HOLE_MASK;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + user_addr = ALIGN_DOWN(addr >> AMDGPU_GPU_PAGE_SHIFT,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> 0x100);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + size = expected_size >> AMDGPU_GPU_PAGE_SHIFT;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + r = amdgpu_bo_reserve(vm->root.bo, false);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + if (r)</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + return r;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + mapping = amdgpu_vm_bo_lookup_mapping(vm, user_addr);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + if (!mapping)</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + goto out_err;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + if (user_addr != mapping->start ||</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + (size != 0 && user_addr + size - 1 != mapping->last)) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + pr_debug("expected size 0x%llx not equal to mapping addr 0x%llx size</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> 0x%llx\n",</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + expected_size, mapping->start << AMDGPU_GPU_PAGE_SHIFT,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + (mapping->last - mapping->start + 1) <<</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> AMDGPU_GPU_PAGE_SHIFT);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + goto out_err;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + amdgpu_bo_unreserve(vm->root.bo);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + return 0;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +out_err:</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + amdgpu_bo_unreserve(vm->root.bo);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + return -EINVAL;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +}</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > static int</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > amdgpu_userq_unmap_helper(struct amdgpu_userq_mgr *uq_mgr,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > struct amdgpu_usermode_queue *queue) @@</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > -394,6 +429,17 @@ amdgpu_userq_create(struct drm_file *filp, union</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> drm_amdgpu_userq *args)</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > r = -EINVAL;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > goto unlock;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + /* Validate the userq virtual address.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + * TODO: Need to firgure out why the queue_size(args->in.queue_size))</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> doesn't match</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + * with mesa request size. As a workaround there fix the queue_size to the</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> 0x200000.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + */</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> We just want to validate that the queue is fully within a valid virtual address range for</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> a single buffer. It doesn't matter if the queue address is at the start. Mesa could</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> allocate a single buffer for all of its user queues and then suballocate ring buffers</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> and other metadata out of the memory.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">[Prike] Thanks, I will update GEM BOs validation method.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> Alex</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + if (amdgpu_userq_input_va_validate(&fpriv->vm, args->in.queue_va,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> 0x200000) ||</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + amdgpu_userq_input_va_validate(&fpriv->vm, args->in.rptr_va,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> PAGE_SIZE) ||</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + amdgpu_userq_input_va_validate(&fpriv->vm, args->in.wptr_va,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> PAGE_SIZE)) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + drm_file_err(uq_mgr->file, "Usermode queue input virt address is</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> invalidated\n");</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + r = -EINVAL;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + goto unlock;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > queue = kzalloc(sizeof(struct amdgpu_usermode_queue), GFP_KERNEL);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > if (!queue) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > @@ -504,11 +550,17 @@ static int amdgpu_userq_input_args_validate(struct</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> drm_device *dev,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > if (args->in.queue_va == AMDGPU_BO_INVALID_OFFSET ||</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > - args->in.queue_size == 0) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + args->in.queue_size == 0 ||</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + !access_ok(u64_to_user_ptr(args->in.queue_va &</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> AMDGPU_GMC_HOLE_MASK),</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + args->in.queue_size)) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > drm_file_err(filp, "invalidate userq queue va or size\n");</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > return -EINVAL;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > - if (!args->in.wptr_va || !args->in.rptr_va) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + if (!args->in.wptr_va || !args->in.rptr_va ||</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + !access_ok(u64_to_user_ptr(args->in.wptr_va &</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> AMDGPU_GMC_HOLE_MASK),</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + sizeof(uint64_t)) ||</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + !access_ok(u64_to_user_ptr(args->in.rptr_va &</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> AMDGPU_GMC_HOLE_MASK),</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + sizeof(uint64_t))) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > drm_file_err(filp, "invalidate userq queue rptr or wptr\n");</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > return -EINVAL;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > index ec040c2fd6c9..375fba639c94 100644</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > @@ -132,4 +132,6 @@ int</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > amdgpu_userq_stop_sched_for_enforce_isolation(struct amdgpu_device *adev,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> int amdgpu_userq_start_sched_for_enforce_isolation(struct amdgpu_device *adev,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > u32 idx);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +int amdgpu_userq_input_va_validate(struct amdgpu_vm *vm, u64 addr,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + u64 expected_size);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > #endif</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > diff --git a/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > b/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > index b46e67b179fc..4ba064e6dda0 100644</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > --- a/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +++ b/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > @@ -28,6 +28,7 @@</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > #define AMDGPU_USERQ_PROC_CTX_SZ PAGE_SIZE #define</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > AMDGPU_USERQ_GANG_CTX_SZ PAGE_SIZE</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +#define MQD_SHADOW_BASE_SIZE 73728</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > static int</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > mes_userq_map_gtt_bo_to_gart(struct amdgpu_bo *bo) @@ -246,6 +247,19</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > @@ static int mes_userq_mqd_create(struct amdgpu_userq_mgr *uq_mgr,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > r = -ENOMEM;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > goto free_mqd;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + /*</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + * EOP VA size = MEC_HPD_SIZE * adev->gfx.num_compute_rings.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + * Since the userq support newer than gfx10, so the keep</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> MEC_HPD_SIZE as 2048.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + * TODO: It requires figuring out why the EOP VA not match with</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> MEC_HPD_SIZE *</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + * adev->gfx.num_compute_rings.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + */</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> The EOP size is MEC_HPD_SIZE. We only multiply it by</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> adev->gfx.num_compute_rings for kernel queues because we use one</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> allocation for the EOP buffer for all of the kernel queues.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">[Prike] Yes, EOP and below shadow BOs mapping size just wants to align with the mesa BOs create and map size setting.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">Thanks,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">Prike</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + if (amdgpu_userq_input_va_validate(queue->vm, compute_mqd-</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> >eop_va,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + /*ALIGN(2048 * adev->gfx.num_compute_rings,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> PAGE_SIZE)*/</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + 0x200000)) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + drm_file_err(uq_mgr->file, "EOP VA is invalidated\n");</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + r = -EINVAL;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + goto free_mqd;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > userq_props->eop_gpu_addr = compute_mqd->eop_va;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > userq_props->hqd_pipe_priority =</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > AMDGPU_GFX_PIPE_PRIO_NORMAL; @@ -274,6 +288,15 @@ static int</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> mes_userq_mqd_create(struct amdgpu_userq_mgr *uq_mgr,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > userq_props->csa_addr = mqd_gfx_v11->csa_va;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > userq_props->tmz_queue =</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > mqd_user->flags &</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > AMDGPU_USERQ_CREATE_FLAGS_QUEUE_SECURE;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + /* TODO: Need to check the shadow WA size doesn't match with mesa</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> request.*/</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + if (amdgpu_userq_input_va_validate(queue->vm, mqd_gfx_v11-</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> >shadow_va,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + 0x200000)) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> The shadow size should >= the shadow size defined in struct</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> amdgpu_gfx_shadow_info and returned by</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> adev->gfx.funcs->get_gfx_shadow_info().</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + drm_file_err(uq_mgr->file, "shadow VA is invalidated\n");</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + r = -EINVAL;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + goto free_mqd;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > +</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > kfree(mqd_gfx_v11);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > } else if (queue->queue_type == AMDGPU_HW_IP_DMA) {</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > struct drm_amdgpu_userq_mqd_sdma_gfx11 *mqd_sdma_v11;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > @@ -290,7 +313,7 @@ static int mes_userq_mqd_create(struct</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> amdgpu_userq_mgr *uq_mgr,</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > r = -ENOMEM;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > goto free_mqd;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > -</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + /* TODO: validate the csa and check the va size as</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > + well.*/</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> See adev->gfx.funcs->get_gfx_shadow_info() here as well.</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> Alex</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> </span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > userq_props->csa_addr = mqd_sdma_v11->csa_va;</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > kfree(mqd_sdma_v11);</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > }</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > --</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> > 2.34.1</span></font></div> <div><font face="Arial" size="2"><span style="font-size:11pt;">> ></span></font></div> </span></font> </body> </html>