mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
795f2813e6
Use an LRU policy to map usermode rings to HW compute queues. Most compute clients use one queue, and usually the first queue available. This results in poor pipe/queue work distribution when multiple compute apps are running. In most cases pipe 0 queue 0 is the only queue that gets used. In order to better distribute work across multiple HW queues, we adopt a policy to map the usermode ring ids to the LRU HW queue. This fixes a large majority of multi-app compute workloads sharing the same HW queue, even though 7 other queues are available. v2: use ring->funcs->type instead of ring->hw_ip v3: remove amdgpu_queue_mapper_funcs v4: change ring_lru_list_lock to spinlock, grab only once in lru_get() Signed-off-by: Andres Rodriguez <andresx7@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
287 lines
7 KiB
C
287 lines
7 KiB
C
/*
|
|
* Copyright 2017 Valve Corporation
|
|
*
|
|
* 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.
|
|
*
|
|
* Authors: Andres Rodriguez
|
|
*/
|
|
|
|
#include "amdgpu.h"
|
|
#include "amdgpu_ring.h"
|
|
|
|
static int amdgpu_queue_mapper_init(struct amdgpu_queue_mapper *mapper,
|
|
int hw_ip)
|
|
{
|
|
if (!mapper)
|
|
return -EINVAL;
|
|
|
|
if (hw_ip > AMDGPU_MAX_IP_NUM)
|
|
return -EINVAL;
|
|
|
|
mapper->hw_ip = hw_ip;
|
|
mutex_init(&mapper->lock);
|
|
|
|
memset(mapper->queue_map, 0, sizeof(mapper->queue_map));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct amdgpu_ring *amdgpu_get_cached_map(struct amdgpu_queue_mapper *mapper,
|
|
int ring)
|
|
{
|
|
return mapper->queue_map[ring];
|
|
}
|
|
|
|
static int amdgpu_update_cached_map(struct amdgpu_queue_mapper *mapper,
|
|
int ring, struct amdgpu_ring *pring)
|
|
{
|
|
if (WARN_ON(mapper->queue_map[ring])) {
|
|
DRM_ERROR("Un-expected ring re-map\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
mapper->queue_map[ring] = pring;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int amdgpu_identity_map(struct amdgpu_device *adev,
|
|
struct amdgpu_queue_mapper *mapper,
|
|
int ring,
|
|
struct amdgpu_ring **out_ring)
|
|
{
|
|
switch (mapper->hw_ip) {
|
|
case AMDGPU_HW_IP_GFX:
|
|
*out_ring = &adev->gfx.gfx_ring[ring];
|
|
break;
|
|
case AMDGPU_HW_IP_COMPUTE:
|
|
*out_ring = &adev->gfx.compute_ring[ring];
|
|
break;
|
|
case AMDGPU_HW_IP_DMA:
|
|
*out_ring = &adev->sdma.instance[ring].ring;
|
|
break;
|
|
case AMDGPU_HW_IP_UVD:
|
|
*out_ring = &adev->uvd.ring;
|
|
break;
|
|
case AMDGPU_HW_IP_VCE:
|
|
*out_ring = &adev->vce.ring[ring];
|
|
break;
|
|
case AMDGPU_HW_IP_UVD_ENC:
|
|
*out_ring = &adev->uvd.ring_enc[ring];
|
|
break;
|
|
case AMDGPU_HW_IP_VCN_DEC:
|
|
*out_ring = &adev->vcn.ring_dec;
|
|
break;
|
|
case AMDGPU_HW_IP_VCN_ENC:
|
|
*out_ring = &adev->vcn.ring_enc[ring];
|
|
break;
|
|
default:
|
|
*out_ring = NULL;
|
|
DRM_ERROR("unknown HW IP type: %d\n", mapper->hw_ip);
|
|
return -EINVAL;
|
|
}
|
|
|
|
return amdgpu_update_cached_map(mapper, ring, *out_ring);
|
|
}
|
|
|
|
static enum amdgpu_ring_type amdgpu_hw_ip_to_ring_type(int hw_ip)
|
|
{
|
|
switch (hw_ip) {
|
|
case AMDGPU_HW_IP_GFX:
|
|
return AMDGPU_RING_TYPE_GFX;
|
|
case AMDGPU_HW_IP_COMPUTE:
|
|
return AMDGPU_RING_TYPE_COMPUTE;
|
|
case AMDGPU_HW_IP_DMA:
|
|
return AMDGPU_RING_TYPE_SDMA;
|
|
case AMDGPU_HW_IP_UVD:
|
|
return AMDGPU_RING_TYPE_UVD;
|
|
case AMDGPU_HW_IP_VCE:
|
|
return AMDGPU_RING_TYPE_VCE;
|
|
default:
|
|
DRM_ERROR("Invalid HW IP specified %d\n", hw_ip);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
static int amdgpu_lru_map(struct amdgpu_device *adev,
|
|
struct amdgpu_queue_mapper *mapper,
|
|
int user_ring,
|
|
struct amdgpu_ring **out_ring)
|
|
{
|
|
int r;
|
|
int ring_type = amdgpu_hw_ip_to_ring_type(mapper->hw_ip);
|
|
|
|
r = amdgpu_ring_lru_get(adev, ring_type, out_ring);
|
|
if (r)
|
|
return r;
|
|
|
|
return amdgpu_update_cached_map(mapper, user_ring, *out_ring);
|
|
}
|
|
|
|
/**
|
|
* amdgpu_queue_mgr_init - init an amdgpu_queue_mgr struct
|
|
*
|
|
* @adev: amdgpu_device pointer
|
|
* @mgr: amdgpu_queue_mgr structure holding queue information
|
|
*
|
|
* Initialize the the selected @mgr (all asics).
|
|
*
|
|
* Returns 0 on success, error on failure.
|
|
*/
|
|
int amdgpu_queue_mgr_init(struct amdgpu_device *adev,
|
|
struct amdgpu_queue_mgr *mgr)
|
|
{
|
|
int i, r;
|
|
|
|
if (!adev || !mgr)
|
|
return -EINVAL;
|
|
|
|
memset(mgr, 0, sizeof(*mgr));
|
|
|
|
for (i = 0; i < AMDGPU_MAX_IP_NUM; ++i) {
|
|
r = amdgpu_queue_mapper_init(&mgr->mapper[i], i);
|
|
if (r)
|
|
return r;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* amdgpu_queue_mgr_fini - de-initialize an amdgpu_queue_mgr struct
|
|
*
|
|
* @adev: amdgpu_device pointer
|
|
* @mgr: amdgpu_queue_mgr structure holding queue information
|
|
*
|
|
* De-initialize the the selected @mgr (all asics).
|
|
*
|
|
* Returns 0 on success, error on failure.
|
|
*/
|
|
int amdgpu_queue_mgr_fini(struct amdgpu_device *adev,
|
|
struct amdgpu_queue_mgr *mgr)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* amdgpu_queue_mgr_map - Map a userspace ring id to an amdgpu_ring
|
|
*
|
|
* @adev: amdgpu_device pointer
|
|
* @mgr: amdgpu_queue_mgr structure holding queue information
|
|
* @hw_ip: HW IP enum
|
|
* @instance: HW instance
|
|
* @ring: user ring id
|
|
* @our_ring: pointer to mapped amdgpu_ring
|
|
*
|
|
* Map a userspace ring id to an appropriate kernel ring. Different
|
|
* policies are configurable at a HW IP level.
|
|
*
|
|
* Returns 0 on success, error on failure.
|
|
*/
|
|
int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
|
|
struct amdgpu_queue_mgr *mgr,
|
|
int hw_ip, int instance, int ring,
|
|
struct amdgpu_ring **out_ring)
|
|
{
|
|
int r, ip_num_rings;
|
|
struct amdgpu_queue_mapper *mapper = &mgr->mapper[hw_ip];
|
|
|
|
if (!adev || !mgr || !out_ring)
|
|
return -EINVAL;
|
|
|
|
if (hw_ip >= AMDGPU_MAX_IP_NUM)
|
|
return -EINVAL;
|
|
|
|
if (ring >= AMDGPU_MAX_RINGS)
|
|
return -EINVAL;
|
|
|
|
/* Right now all IPs have only one instance - multiple rings. */
|
|
if (instance != 0) {
|
|
DRM_ERROR("invalid ip instance: %d\n", instance);
|
|
return -EINVAL;
|
|
}
|
|
|
|
switch (hw_ip) {
|
|
case AMDGPU_HW_IP_GFX:
|
|
ip_num_rings = adev->gfx.num_gfx_rings;
|
|
break;
|
|
case AMDGPU_HW_IP_COMPUTE:
|
|
ip_num_rings = adev->gfx.num_compute_rings;
|
|
break;
|
|
case AMDGPU_HW_IP_DMA:
|
|
ip_num_rings = adev->sdma.num_instances;
|
|
break;
|
|
case AMDGPU_HW_IP_UVD:
|
|
ip_num_rings = 1;
|
|
break;
|
|
case AMDGPU_HW_IP_VCE:
|
|
ip_num_rings = adev->vce.num_rings;
|
|
break;
|
|
case AMDGPU_HW_IP_UVD_ENC:
|
|
ip_num_rings = adev->uvd.num_enc_rings;
|
|
break;
|
|
case AMDGPU_HW_IP_VCN_DEC:
|
|
ip_num_rings = 1;
|
|
break;
|
|
case AMDGPU_HW_IP_VCN_ENC:
|
|
ip_num_rings = adev->vcn.num_enc_rings;
|
|
break;
|
|
default:
|
|
DRM_ERROR("unknown ip type: %d\n", hw_ip);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (ring >= ip_num_rings) {
|
|
DRM_ERROR("Ring index:%d exceeds maximum:%d for ip:%d\n",
|
|
ring, ip_num_rings, hw_ip);
|
|
return -EINVAL;
|
|
}
|
|
|
|
mutex_lock(&mapper->lock);
|
|
|
|
*out_ring = amdgpu_get_cached_map(mapper, ring);
|
|
if (*out_ring) {
|
|
/* cache hit */
|
|
r = 0;
|
|
goto out_unlock;
|
|
}
|
|
|
|
switch (mapper->hw_ip) {
|
|
case AMDGPU_HW_IP_GFX:
|
|
case AMDGPU_HW_IP_DMA:
|
|
case AMDGPU_HW_IP_UVD:
|
|
case AMDGPU_HW_IP_VCE:
|
|
case AMDGPU_HW_IP_UVD_ENC:
|
|
case AMDGPU_HW_IP_VCN_DEC:
|
|
case AMDGPU_HW_IP_VCN_ENC:
|
|
r = amdgpu_identity_map(adev, mapper, ring, out_ring);
|
|
break;
|
|
case AMDGPU_HW_IP_COMPUTE:
|
|
r = amdgpu_lru_map(adev, mapper, ring, out_ring);
|
|
break;
|
|
default:
|
|
*out_ring = NULL;
|
|
r = -EINVAL;
|
|
DRM_ERROR("unknown HW IP type: %d\n", mapper->hw_ip);
|
|
}
|
|
|
|
out_unlock:
|
|
mutex_unlock(&mapper->lock);
|
|
return r;
|
|
}
|