forked from Minki/linux
2889caa923
The major scaling bottleneck in execbuffer is the processing of the execobjects. Creating an auxiliary list is inefficient when compared to using the execobject array we already have allocated. Reservation is then split into phases. As we lookup up the VMA, we try and bind it back into active location. Only if that fails, do we add it to the unbound list for phase 2. In phase 2, we try and add all those objects that could not fit into their previous location, with fallback to retrying all objects and evicting the VM in case of severe fragmentation. (This is the same as before, except that phase 1 is now done inline with looking up the VMA to avoid an iteration over the execobject array. In the ideal case, we eliminate the separate reservation phase). During the reservation phase, we only evict from the VM between passes (rather than currently as we try to fit every new VMA). In testing with Unreal Engine's Atlantis demo which stresses the eviction logic on gen7 class hardware, this speed up the framerate by a factor of 2. The second loop amalgamation is between move_to_gpu and move_to_active. As we always submit the request, even if incomplete, we can use the current request to track active VMA as we perform the flushes and synchronisation required. The next big advancement is to avoid copying back to the user any execobjects and relocations that are not changed. v2: Add a Theory of Operation spiel. v3: Fall back to slow relocations in preparation for flushing userptrs. v4: Document struct members, factor out eb_validate_vma(), add a few more comments to explain some magic and hide other magic behind macros. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
351 lines
8.4 KiB
C
351 lines
8.4 KiB
C
/*
|
|
* Copyright © 2016 Intel 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 (including the next
|
|
* paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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 "../i915_selftest.h"
|
|
|
|
#include "mock_gem_device.h"
|
|
|
|
static int populate_ggtt(struct drm_i915_private *i915)
|
|
{
|
|
struct drm_i915_gem_object *obj;
|
|
u64 size;
|
|
|
|
for (size = 0;
|
|
size + I915_GTT_PAGE_SIZE <= i915->ggtt.base.total;
|
|
size += I915_GTT_PAGE_SIZE) {
|
|
struct i915_vma *vma;
|
|
|
|
obj = i915_gem_object_create_internal(i915, I915_GTT_PAGE_SIZE);
|
|
if (IS_ERR(obj))
|
|
return PTR_ERR(obj);
|
|
|
|
vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, 0);
|
|
if (IS_ERR(vma))
|
|
return PTR_ERR(vma);
|
|
}
|
|
|
|
if (!list_empty(&i915->mm.unbound_list)) {
|
|
size = 0;
|
|
list_for_each_entry(obj, &i915->mm.unbound_list, global_link)
|
|
size++;
|
|
|
|
pr_err("Found %lld objects unbound!\n", size);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (list_empty(&i915->ggtt.base.inactive_list)) {
|
|
pr_err("No objects on the GGTT inactive list!\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void unpin_ggtt(struct drm_i915_private *i915)
|
|
{
|
|
struct i915_vma *vma;
|
|
|
|
list_for_each_entry(vma, &i915->ggtt.base.inactive_list, vm_link)
|
|
i915_vma_unpin(vma);
|
|
}
|
|
|
|
static void cleanup_objects(struct drm_i915_private *i915)
|
|
{
|
|
struct drm_i915_gem_object *obj, *on;
|
|
|
|
list_for_each_entry_safe(obj, on, &i915->mm.unbound_list, global_link)
|
|
i915_gem_object_put(obj);
|
|
|
|
list_for_each_entry_safe(obj, on, &i915->mm.bound_list, global_link)
|
|
i915_gem_object_put(obj);
|
|
|
|
mutex_unlock(&i915->drm.struct_mutex);
|
|
|
|
i915_gem_drain_freed_objects(i915);
|
|
|
|
mutex_lock(&i915->drm.struct_mutex);
|
|
}
|
|
|
|
static int igt_evict_something(void *arg)
|
|
{
|
|
struct drm_i915_private *i915 = arg;
|
|
struct i915_ggtt *ggtt = &i915->ggtt;
|
|
int err;
|
|
|
|
/* Fill the GGTT with pinned objects and try to evict one. */
|
|
|
|
err = populate_ggtt(i915);
|
|
if (err)
|
|
goto cleanup;
|
|
|
|
/* Everything is pinned, nothing should happen */
|
|
err = i915_gem_evict_something(&ggtt->base,
|
|
I915_GTT_PAGE_SIZE, 0, 0,
|
|
0, U64_MAX,
|
|
0);
|
|
if (err != -ENOSPC) {
|
|
pr_err("i915_gem_evict_something failed on a full GGTT with err=%d\n",
|
|
err);
|
|
goto cleanup;
|
|
}
|
|
|
|
unpin_ggtt(i915);
|
|
|
|
/* Everything is unpinned, we should be able to evict something */
|
|
err = i915_gem_evict_something(&ggtt->base,
|
|
I915_GTT_PAGE_SIZE, 0, 0,
|
|
0, U64_MAX,
|
|
0);
|
|
if (err) {
|
|
pr_err("i915_gem_evict_something failed on a full GGTT with err=%d\n",
|
|
err);
|
|
goto cleanup;
|
|
}
|
|
|
|
cleanup:
|
|
cleanup_objects(i915);
|
|
return err;
|
|
}
|
|
|
|
static int igt_overcommit(void *arg)
|
|
{
|
|
struct drm_i915_private *i915 = arg;
|
|
struct drm_i915_gem_object *obj;
|
|
struct i915_vma *vma;
|
|
int err;
|
|
|
|
/* Fill the GGTT with pinned objects and then try to pin one more.
|
|
* We expect it to fail.
|
|
*/
|
|
|
|
err = populate_ggtt(i915);
|
|
if (err)
|
|
goto cleanup;
|
|
|
|
obj = i915_gem_object_create_internal(i915, I915_GTT_PAGE_SIZE);
|
|
if (IS_ERR(obj)) {
|
|
err = PTR_ERR(obj);
|
|
goto cleanup;
|
|
}
|
|
|
|
list_move(&obj->global_link, &i915->mm.unbound_list);
|
|
|
|
vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, 0);
|
|
if (!IS_ERR(vma) || PTR_ERR(vma) != -ENOSPC) {
|
|
pr_err("Failed to evict+insert, i915_gem_object_ggtt_pin returned err=%d\n", (int)PTR_ERR(vma));
|
|
err = -EINVAL;
|
|
goto cleanup;
|
|
}
|
|
|
|
cleanup:
|
|
cleanup_objects(i915);
|
|
return err;
|
|
}
|
|
|
|
static int igt_evict_for_vma(void *arg)
|
|
{
|
|
struct drm_i915_private *i915 = arg;
|
|
struct i915_ggtt *ggtt = &i915->ggtt;
|
|
struct drm_mm_node target = {
|
|
.start = 0,
|
|
.size = 4096,
|
|
};
|
|
int err;
|
|
|
|
/* Fill the GGTT with pinned objects and try to evict a range. */
|
|
|
|
err = populate_ggtt(i915);
|
|
if (err)
|
|
goto cleanup;
|
|
|
|
/* Everything is pinned, nothing should happen */
|
|
err = i915_gem_evict_for_node(&ggtt->base, &target, 0);
|
|
if (err != -ENOSPC) {
|
|
pr_err("i915_gem_evict_for_node on a full GGTT returned err=%d\n",
|
|
err);
|
|
goto cleanup;
|
|
}
|
|
|
|
unpin_ggtt(i915);
|
|
|
|
/* Everything is unpinned, we should be able to evict the node */
|
|
err = i915_gem_evict_for_node(&ggtt->base, &target, 0);
|
|
if (err) {
|
|
pr_err("i915_gem_evict_for_node returned err=%d\n",
|
|
err);
|
|
goto cleanup;
|
|
}
|
|
|
|
cleanup:
|
|
cleanup_objects(i915);
|
|
return err;
|
|
}
|
|
|
|
static void mock_color_adjust(const struct drm_mm_node *node,
|
|
unsigned long color,
|
|
u64 *start,
|
|
u64 *end)
|
|
{
|
|
}
|
|
|
|
static int igt_evict_for_cache_color(void *arg)
|
|
{
|
|
struct drm_i915_private *i915 = arg;
|
|
struct i915_ggtt *ggtt = &i915->ggtt;
|
|
const unsigned long flags = PIN_OFFSET_FIXED;
|
|
struct drm_mm_node target = {
|
|
.start = I915_GTT_PAGE_SIZE * 2,
|
|
.size = I915_GTT_PAGE_SIZE,
|
|
.color = I915_CACHE_LLC,
|
|
};
|
|
struct drm_i915_gem_object *obj;
|
|
struct i915_vma *vma;
|
|
int err;
|
|
|
|
/* Currently the use of color_adjust is limited to cache domains within
|
|
* the ggtt, and so the presence of mm.color_adjust is assumed to be
|
|
* i915_gtt_color_adjust throughout our driver, so using a mock color
|
|
* adjust will work just fine for our purposes.
|
|
*/
|
|
ggtt->base.mm.color_adjust = mock_color_adjust;
|
|
|
|
obj = i915_gem_object_create_internal(i915, I915_GTT_PAGE_SIZE);
|
|
if (IS_ERR(obj)) {
|
|
err = PTR_ERR(obj);
|
|
goto cleanup;
|
|
}
|
|
i915_gem_object_set_cache_level(obj, I915_CACHE_LLC);
|
|
|
|
vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0,
|
|
I915_GTT_PAGE_SIZE | flags);
|
|
if (IS_ERR(vma)) {
|
|
pr_err("[0]i915_gem_object_ggtt_pin failed\n");
|
|
err = PTR_ERR(vma);
|
|
goto cleanup;
|
|
}
|
|
|
|
obj = i915_gem_object_create_internal(i915, I915_GTT_PAGE_SIZE);
|
|
if (IS_ERR(obj)) {
|
|
err = PTR_ERR(obj);
|
|
goto cleanup;
|
|
}
|
|
i915_gem_object_set_cache_level(obj, I915_CACHE_LLC);
|
|
|
|
/* Neighbouring; same colour - should fit */
|
|
vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0,
|
|
(I915_GTT_PAGE_SIZE * 2) | flags);
|
|
if (IS_ERR(vma)) {
|
|
pr_err("[1]i915_gem_object_ggtt_pin failed\n");
|
|
err = PTR_ERR(vma);
|
|
goto cleanup;
|
|
}
|
|
|
|
i915_vma_unpin(vma);
|
|
|
|
/* Remove just the second vma */
|
|
err = i915_gem_evict_for_node(&ggtt->base, &target, 0);
|
|
if (err) {
|
|
pr_err("[0]i915_gem_evict_for_node returned err=%d\n", err);
|
|
goto cleanup;
|
|
}
|
|
|
|
/* Attempt to remove the first *pinned* vma, by removing the (empty)
|
|
* neighbour -- this should fail.
|
|
*/
|
|
target.color = I915_CACHE_L3_LLC;
|
|
|
|
err = i915_gem_evict_for_node(&ggtt->base, &target, 0);
|
|
if (!err) {
|
|
pr_err("[1]i915_gem_evict_for_node returned err=%d\n", err);
|
|
err = -EINVAL;
|
|
goto cleanup;
|
|
}
|
|
|
|
err = 0;
|
|
|
|
cleanup:
|
|
unpin_ggtt(i915);
|
|
cleanup_objects(i915);
|
|
ggtt->base.mm.color_adjust = NULL;
|
|
return err;
|
|
}
|
|
|
|
static int igt_evict_vm(void *arg)
|
|
{
|
|
struct drm_i915_private *i915 = arg;
|
|
struct i915_ggtt *ggtt = &i915->ggtt;
|
|
int err;
|
|
|
|
/* Fill the GGTT with pinned objects and try to evict everything. */
|
|
|
|
err = populate_ggtt(i915);
|
|
if (err)
|
|
goto cleanup;
|
|
|
|
/* Everything is pinned, nothing should happen */
|
|
err = i915_gem_evict_vm(&ggtt->base);
|
|
if (err) {
|
|
pr_err("i915_gem_evict_vm on a full GGTT returned err=%d]\n",
|
|
err);
|
|
goto cleanup;
|
|
}
|
|
|
|
unpin_ggtt(i915);
|
|
|
|
err = i915_gem_evict_vm(&ggtt->base);
|
|
if (err) {
|
|
pr_err("i915_gem_evict_vm on a full GGTT returned err=%d]\n",
|
|
err);
|
|
goto cleanup;
|
|
}
|
|
|
|
cleanup:
|
|
cleanup_objects(i915);
|
|
return err;
|
|
}
|
|
|
|
int i915_gem_evict_mock_selftests(void)
|
|
{
|
|
static const struct i915_subtest tests[] = {
|
|
SUBTEST(igt_evict_something),
|
|
SUBTEST(igt_evict_for_vma),
|
|
SUBTEST(igt_evict_for_cache_color),
|
|
SUBTEST(igt_evict_vm),
|
|
SUBTEST(igt_overcommit),
|
|
};
|
|
struct drm_i915_private *i915;
|
|
int err;
|
|
|
|
i915 = mock_gem_device();
|
|
if (!i915)
|
|
return -ENOMEM;
|
|
|
|
mutex_lock(&i915->drm.struct_mutex);
|
|
err = i915_subtests(tests, i915);
|
|
mutex_unlock(&i915->drm.struct_mutex);
|
|
|
|
drm_dev_unref(&i915->drm);
|
|
return err;
|
|
}
|