[RFC 2/7] drm/amdgpu: Add usermode queue for gfx work
Shashank Sharma
shashank.sharma at amd.com
Tue Jan 3 09:22:58 UTC 2023
On 03/01/2023 10:15, Christian König wrote:
> Am 03.01.23 um 10:12 schrieb Shashank Sharma:
>>
>> On 02/01/2023 13:39, Christian König wrote:
>>> Hi Shashank,
>>>
>>> Am 26.12.22 um 11:41 schrieb Shashank Sharma:
>>>> [SNIP]
>>>>>> /* df */
>>>>>> struct amdgpu_df df;
>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h
>>>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h
>>>>>> index 0fa0e56daf67..f7413859b14f 100644
>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h
>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h
>>>>>> @@ -57,6 +57,7 @@ struct amdgpu_ctx {
>>>>>> unsigned long ras_counter_ce;
>>>>>> unsigned long ras_counter_ue;
>>>>>> uint32_t stable_pstate;
>>>>>> + struct amdgpu_usermode_queue *userq;
>>>>>
>>>>> Why should we have this in the ctx here???
>>>>
>>>> We are allocating a few things dynamically for the queue, which
>>>> would be valid until we destroy this queue. Also we need to save
>>>> this queue
>>>>
>>>> container at some place for the destroy function, and I thought it
>>>> would make sense to keep this with the context ptr, as this is how
>>>> we are
>>>>
>>>> identifying the incoming request.
>>>
>>> I have absolutely no idea how you end up with that design.
>>>
>>> The ctx object is the CS IOCTL context, that is not even remotely
>>> related to anything the user queues should be doing.
>>>
>>> Please completely drop that relationship and don't use any of the
>>> ctx object stuff in the user queue code.
>>>
>> Historically the workload submission always came with a context (due
>> to CS IOCTL), so we thought it would make sense to still have its
>> relevance in the new workload submission method. Would you prefer
>> this new submission to be independent of AMDGPU context ?
>
> Well not prefer, the point is that this doesn't make any sense at all.
>
> See the amdgpu_ctx object contains the resulting fence pointers for
> the CS IOCTL as well as information necessary for the CS IOCTL to work
> (e.g. scheduler entities etc...).
>
> I don't see how anything from that stuff would be useful for the MES
> or user queues.
>
> Christian.
I am getting your point, and it makes sense as well. But in such
scenario, we might have to create something parallel to AMDGPU_USERQ_CTX
which is doing very much the same.
We can still do it to make a logically separate entity, but any
suggestions on where to keep this udev_ctx ptr (if not in adev, as well
as not ctx) ?
- Shashank
>
>>
>> - Shashank
>>
>>
>>> Christian.
>>>
>>>>
>>>> - Shashank
>>>>
>>>>>
>>>>> Regards,
>>>>> Christian.
>>>>>
>>>>>> };
>>>>>> struct amdgpu_ctx_mgr {
>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
>>>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
>>>>>> new file mode 100644
>>>>>> index 000000000000..3b6e8f75495c
>>>>>> --- /dev/null
>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
>>>>>> @@ -0,0 +1,187 @@
>>>>>> +/*
>>>>>> + * Copyright 2022 Advanced Micro Devices, Inc.
>>>>>> + *
>>>>>> + * Permission is hereby granted, free of charge, to any person
>>>>>> obtaining a
>>>>>> + * copy of this software and associated documentation files (the
>>>>>> "Software"),
>>>>>> + * to deal in the Software without restriction, including
>>>>>> without limitation
>>>>>> + * the rights to use, copy, modify, merge, publish, distribute,
>>>>>> sublicense,
>>>>>> + * and/or sell copies of the Software, and to permit persons to
>>>>>> whom the
>>>>>> + * Software is furnished to do so, subject to the following
>>>>>> conditions:
>>>>>> + *
>>>>>> + * The above copyright notice and this permission notice shall
>>>>>> be included in
>>>>>> + * all copies or substantial portions of the Software.
>>>>>> + *
>>>>>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
>>>>>> KIND, EXPRESS OR
>>>>>> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>>>>>> MERCHANTABILITY,
>>>>>> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
>>>>>> EVENT SHALL
>>>>>> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM,
>>>>>> DAMAGES OR
>>>>>> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
>>>>>> OTHERWISE,
>>>>>> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
>>>>>> THE USE OR
>>>>>> + * OTHER DEALINGS IN THE SOFTWARE.
>>>>>> + *
>>>>>> + */
>>>>>> +
>>>>>> +#include "amdgpu.h"
>>>>>> +#include "amdgpu_vm.h"
>>>>>> +#include "amdgpu_mes.h"
>>>>>> +#include "amdgpu_usermode_queue.h"
>>>>>> +#include "soc15_common.h"
>>>>>> +
>>>>>> +#define CHECK_ACCESS(a) (access_ok((const void __user *)a,
>>>>>> sizeof(__u64)))
>>>>>> +
>>>>>> +static int
>>>>>> +amdgpu_userqueue_index(struct amdgpu_device *adev)
>>>>>> +{
>>>>>> + int index;
>>>>>> + struct amdgpu_userq_globals *uqg = &adev->userq;
>>>>>> +
>>>>>> + index = ida_simple_get(&uqg->ida, 2, AMDGPU_MAX_USERQ,
>>>>>> GFP_KERNEL);
>>>>>> + return index;
>>>>>> +}
>>>>>> +
>>>>>> +static void
>>>>>> +amdgpu_userqueue_remove_index(struct amdgpu_device *adev, struct
>>>>>> amdgpu_usermode_queue *queue)
>>>>>> +{
>>>>>> + struct amdgpu_userq_globals *uqg = &adev->userq;
>>>>>> +
>>>>>> + ida_simple_remove(&uqg->ida, queue->queue_id);
>>>>>> +}
>>>>>> +
>>>>>> +static int
>>>>>> +amdgpu_userqueue_validate_input(struct amdgpu_device *adev,
>>>>>> struct drm_amdgpu_userq_mqd *mqd_in)
>>>>>> +{
>>>>>> + if (mqd_in->queue_va == 0 || mqd_in->doorbell_handle == 0 ||
>>>>>> mqd_in->doorbell_offset == 0) {
>>>>>> + DRM_ERROR("Invalid queue object address\n");
>>>>>> + return -EINVAL;
>>>>>> + }
>>>>>> +
>>>>>> + if (mqd_in->queue_size == 0 || mqd_in->rptr_va == 0 ||
>>>>>> mqd_in->wptr_va == 0) {
>>>>>> + DRM_ERROR("Invalid queue object value\n");
>>>>>> + return -EINVAL;
>>>>>> + }
>>>>>> +
>>>>>> + if (mqd_in->ip_type < AMDGPU_HW_IP_GFX || mqd_in->ip_type >=
>>>>>> AMDGPU_HW_IP_NUM) {
>>>>>> + DRM_ERROR("Invalid HW IP type 0x%x\n", mqd_in->ip_type);
>>>>>> + return -EINVAL;
>>>>>> + }
>>>>>> +
>>>>>> + if (!CHECK_ACCESS(mqd_in->queue_va) ||
>>>>>> !CHECK_ACCESS(mqd_in->rptr_va) ||
>>>>>> + !CHECK_ACCESS(mqd_in->wptr_va)) {
>>>>>> + DRM_ERROR("Invalid mapping of queue ptrs, access
>>>>>> error\n");
>>>>>> + return -EINVAL;
>>>>>> + }
>>>>>> +
>>>>>> + DRM_DEBUG_DRIVER("Input parameters to create queue are
>>>>>> valid\n");
>>>>>> + return 0;
>>>>>> +}
>>>>>> +
>>>>>> +int amdgpu_userqueue_create(struct amdgpu_device *adev, struct
>>>>>> drm_file *filp,
>>>>>> + union drm_amdgpu_userq *args)
>>>>>> +{
>>>>>> + int r, pasid;
>>>>>> + struct amdgpu_usermode_queue *queue;
>>>>>> + struct amdgpu_fpriv *fpriv = filp->driver_priv;
>>>>>> + struct amdgpu_vm *vm = &fpriv->vm;
>>>>>> + struct amdgpu_ctx *ctx = amdgpu_ctx_get(fpriv,
>>>>>> args->in.ctx_id);
>>>>>> + struct drm_amdgpu_userq_mqd *mqd_in = &args->in.mqd;
>>>>>> +
>>>>>> + if (!ctx) {
>>>>>> + DRM_ERROR("Invalid GPU context\n");
>>>>>> + return -EINVAL;
>>>>>> + }
>>>>>> +
>>>>>> + if (vm->pasid < 0) {
>>>>>> + DRM_WARN("No PASID info found\n");
>>>>>> + pasid = 0;
>>>>>> + }
>>>>>> +
>>>>>> + mutex_lock(&adev->userq.userq_mutex);
>>>>>> +
>>>>>> + queue = kzalloc(sizeof(struct amdgpu_usermode_queue),
>>>>>> GFP_KERNEL);
>>>>>> + if (!queue) {
>>>>>> + DRM_ERROR("Failed to allocate memory for queue\n");
>>>>>> + mutex_unlock(&adev->userq.userq_mutex);
>>>>>> + return -ENOMEM;
>>>>>> + }
>>>>>> +
>>>>>> + r = amdgpu_userqueue_validate_input(adev, mqd_in);
>>>>>> + if (r < 0) {
>>>>>> + DRM_ERROR("Invalid input to create queue\n");
>>>>>> + goto free_queue;
>>>>>> + }
>>>>>> +
>>>>>> + queue->vm = vm;
>>>>>> + queue->pasid = pasid;
>>>>>> + queue->wptr_gpu_addr = mqd_in->wptr_va;
>>>>>> + queue->rptr_gpu_addr = mqd_in->rptr_va;
>>>>>> + queue->queue_size = mqd_in->queue_size;
>>>>>> + queue->queue_type = mqd_in->ip_type;
>>>>>> + queue->paging = false;
>>>>>> + queue->flags = mqd_in->flags;
>>>>>> + queue->queue_id = amdgpu_userqueue_index(adev);
>>>>>> +
>>>>>> + ctx->userq = queue;
>>>>>> + args->out.q_id = queue->queue_id;
>>>>>> + args->out.flags = 0;
>>>>>> + mutex_unlock(&adev->userq.userq_mutex);
>>>>>> + return 0;
>>>>>> +
>>>>>> +free_queue:
>>>>>> + amdgpu_userqueue_remove_index(adev, queue);
>>>>>> + mutex_unlock(&adev->userq.userq_mutex);
>>>>>> + kfree(queue);
>>>>>> + return r;
>>>>>> +}
>>>>>> +
>>>>>> +void amdgpu_userqueue_destroy(struct amdgpu_device *adev, struct
>>>>>> drm_file *filp,
>>>>>> + union drm_amdgpu_userq *args)
>>>>>> +{
>>>>>> + struct amdgpu_fpriv *fpriv = filp->driver_priv;
>>>>>> + struct amdgpu_ctx *ctx = amdgpu_ctx_get(fpriv,
>>>>>> args->in.ctx_id);
>>>>>> + struct amdgpu_usermode_queue *queue = ctx->userq;
>>>>>> +
>>>>>> + mutex_lock(&adev->userq.userq_mutex);
>>>>>> + amdgpu_userqueue_remove_index(adev, queue);
>>>>>> + ctx->userq = NULL;
>>>>>> + mutex_unlock(&adev->userq.userq_mutex);
>>>>>> + kfree(queue);
>>>>>> +}
>>>>>> +
>>>>>> +int amdgpu_userq_ioctl(struct drm_device *dev, void *data,
>>>>>> + struct drm_file *filp)
>>>>>> +{
>>>>>> + union drm_amdgpu_userq *args = data;
>>>>>> + struct amdgpu_device *adev = drm_to_adev(dev);
>>>>>> + int r = 0;
>>>>>> +
>>>>>> + switch (args->in.op) {
>>>>>> + case AMDGPU_USERQ_OP_CREATE:
>>>>>> + r = amdgpu_userqueue_create(adev, filp, args);
>>>>>> + if (r)
>>>>>> + DRM_ERROR("Failed to create usermode queue\n");
>>>>>> + break;
>>>>>> +
>>>>>> + case AMDGPU_USERQ_OP_FREE:
>>>>>> + amdgpu_userqueue_destroy(adev, filp, args);
>>>>>> + break;
>>>>>> +
>>>>>> + default:
>>>>>> + DRM_ERROR("Invalid user queue op specified: %d\n",
>>>>>> args->in.op);
>>>>>> + return -EINVAL;
>>>>>> + }
>>>>>> +
>>>>>> + return r;
>>>>>> +}
>>>>>> +
>>>>>> +int amdgpu_userqueue_init(struct amdgpu_device *adev)
>>>>>> +{
>>>>>> + struct amdgpu_userq_globals *uqg = &adev->userq;
>>>>>> +
>>>>>> + mutex_init(&uqg->userq_mutex);
>>>>>> + return 0;
>>>>>> +}
>>>>>> +
>>>>>> +void amdgpu_userqueue_fini(struct amdgpu_device *adev)
>>>>>> +{
>>>>>> +
>>>>>> +}
>>>>>> diff --git a/drivers/gpu/drm/amd/include/amdgpu_usermode_queue.h
>>>>>> b/drivers/gpu/drm/amd/include/amdgpu_usermode_queue.h
>>>>>> new file mode 100644
>>>>>> index 000000000000..c1fe39ffaf72
>>>>>> --- /dev/null
>>>>>> +++ b/drivers/gpu/drm/amd/include/amdgpu_usermode_queue.h
>>>>>> @@ -0,0 +1,50 @@
>>>>>> +/*
>>>>>> + * Copyright 2022 Advanced Micro Devices, Inc.
>>>>>> + *
>>>>>> + * Permission is hereby granted, free of charge, to any person
>>>>>> obtaining a
>>>>>> + * copy of this software and associated documentation files (the
>>>>>> "Software"),
>>>>>> + * to deal in the Software without restriction, including
>>>>>> without limitation
>>>>>> + * the rights to use, copy, modify, merge, publish, distribute,
>>>>>> sublicense,
>>>>>> + * and/or sell copies of the Software, and to permit persons to
>>>>>> whom the
>>>>>> + * Software is furnished to do so, subject to the following
>>>>>> conditions:
>>>>>> + *
>>>>>> + * The above copyright notice and this permission notice shall
>>>>>> be included in
>>>>>> + * all copies or substantial portions of the Software.
>>>>>> + *
>>>>>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
>>>>>> KIND, EXPRESS OR
>>>>>> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>>>>>> MERCHANTABILITY,
>>>>>> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
>>>>>> EVENT SHALL
>>>>>> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM,
>>>>>> DAMAGES OR
>>>>>> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
>>>>>> OTHERWISE,
>>>>>> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
>>>>>> THE USE OR
>>>>>> + * OTHER DEALINGS IN THE SOFTWARE.
>>>>>> + *
>>>>>> + */
>>>>>> +
>>>>>> +#ifndef AMDGPU_USERMODE_QUEUE_H_
>>>>>> +#define AMDGPU_USERMODE_QUEUE_H_
>>>>>> +
>>>>>> +#define AMDGPU_MAX_USERQ 512
>>>>>> +
>>>>>> +struct amdgpu_usermode_queue {
>>>>>> + int queue_id;
>>>>>> + int queue_type;
>>>>>> + int queue_size;
>>>>>> + int paging;
>>>>>> + int pasid;
>>>>>> + int use_doorbell;
>>>>>> + int doorbell_index;
>>>>>> +
>>>>>> + uint64_t mqd_gpu_addr;
>>>>>> + uint64_t wptr_gpu_addr;
>>>>>> + uint64_t rptr_gpu_addr;
>>>>>> + uint64_t queue_gpu_addr;
>>>>>> + uint64_t flags;
>>>>>> + void *mqd_cpu_ptr;
>>>>>> +
>>>>>> + struct amdgpu_bo *mqd_obj;
>>>>>> + struct amdgpu_vm *vm;
>>>>>> + struct list_head list;
>>>>>> +};
>>>>>> +
>>>>>> +#endif
>>>>>
>>>
>
More information about the amd-gfx
mailing list