Skip to content

Commit

Permalink
drm/i915: Mock infrastructure for request emission
Browse files Browse the repository at this point in the history
Create a fake engine that runs requests using a timer to simulate hw.

v2: Prevent leaks of ctx->name along error paths

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170213171558.20942-8-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Feb 13, 2017
1 parent 3b5bb0a commit 0daf011
Show file tree
Hide file tree
Showing 10 changed files with 483 additions and 18 deletions.
4 changes: 4 additions & 0 deletions drivers/gpu/drm/i915/i915_gem_context.c
Original file line number Diff line number Diff line change
Expand Up @@ -1199,3 +1199,7 @@ int i915_gem_context_reset_stats_ioctl(struct drm_device *dev,

return 0;
}

#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
#include "selftests/mock_context.c"
#endif
11 changes: 6 additions & 5 deletions drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "../i915_selftest.h"
#include "i915_random.h"

#include "mock_gem_device.h"
#include "mock_engine.h"

static int check_rbtree(struct intel_engine_cs *engine,
Expand Down Expand Up @@ -466,15 +467,15 @@ int intel_breadcrumbs_mock_selftests(void)
SUBTEST(igt_insert_complete),
SUBTEST(igt_wakeup),
};
struct intel_engine_cs *engine;
struct drm_i915_private *i915;
int err;

engine = mock_engine("mock");
if (!engine)
i915 = mock_gem_device();
if (!i915)
return -ENOMEM;

err = i915_subtests(tests, engine);
kfree(engine);
err = i915_subtests(tests, i915->engine[RCS]);
drm_dev_unref(&i915->drm);

return err;
}
78 changes: 78 additions & 0 deletions drivers/gpu/drm/i915/selftests/mock_context.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*
* 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 "mock_context.h"
#include "mock_gtt.h"

struct i915_gem_context *
mock_context(struct drm_i915_private *i915,
const char *name)
{
struct i915_gem_context *ctx;
int ret;

ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx)
return NULL;

kref_init(&ctx->ref);
INIT_LIST_HEAD(&ctx->link);
ctx->i915 = i915;

ret = ida_simple_get(&i915->context_hw_ida,
0, MAX_CONTEXT_HW_ID, GFP_KERNEL);
if (ret < 0)
goto err_free;
ctx->hw_id = ret;

if (name) {
ctx->name = kstrdup(name, GFP_KERNEL);
if (!ctx->name)
goto err_put;

ctx->ppgtt = mock_ppgtt(i915, name);
if (!ctx->ppgtt)
goto err_put;
}

return ctx;

err_free:
kfree(ctx);
return NULL;

err_put:
i915_gem_context_set_closed(ctx);
i915_gem_context_put(ctx);
return NULL;
}

void mock_context_close(struct i915_gem_context *ctx)
{
i915_gem_context_set_closed(ctx);

i915_ppgtt_close(&ctx->ppgtt->base);

i915_gem_context_put(ctx);
}
34 changes: 34 additions & 0 deletions drivers/gpu/drm/i915/selftests/mock_context.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* 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.
*
*/

#ifndef __MOCK_CONTEXT_H
#define __MOCK_CONTEXT_H

struct i915_gem_context *
mock_context(struct drm_i915_private *i915,
const char *name);

void mock_context_close(struct i915_gem_context *ctx);

#endif /* !__MOCK_CONTEXT_H */
172 changes: 162 additions & 10 deletions drivers/gpu/drm/i915/selftests/mock_engine.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,185 @@
*/

#include "mock_engine.h"
#include "mock_request.h"

struct intel_engine_cs *mock_engine(const char *name)
static struct mock_request *first_request(struct mock_engine *engine)
{
struct intel_engine_cs *engine;
return list_first_entry_or_null(&engine->hw_queue,
struct mock_request,
link);
}

static void hw_delay_complete(unsigned long data)
{
struct mock_engine *engine = (typeof(engine))data;
struct mock_request *request;

spin_lock(&engine->hw_lock);

request = first_request(engine);
if (request) {
list_del_init(&request->link);
mock_seqno_advance(&engine->base, request->base.global_seqno);
}

request = first_request(engine);
if (request)
mod_timer(&engine->hw_delay, jiffies + request->delay);

spin_unlock(&engine->hw_lock);
}

static int mock_context_pin(struct intel_engine_cs *engine,
struct i915_gem_context *ctx)
{
i915_gem_context_get(ctx);
return 0;
}

static void mock_context_unpin(struct intel_engine_cs *engine,
struct i915_gem_context *ctx)
{
i915_gem_context_put(ctx);
}

static int mock_request_alloc(struct drm_i915_gem_request *request)
{
struct mock_request *mock = container_of(request, typeof(*mock), base);

INIT_LIST_HEAD(&mock->link);
mock->delay = 0;

request->ring = request->engine->buffer;
return 0;
}

static int mock_emit_flush(struct drm_i915_gem_request *request,
unsigned int flags)
{
return 0;
}

static void mock_emit_breadcrumb(struct drm_i915_gem_request *request,
u32 *flags)
{
}

static void mock_submit_request(struct drm_i915_gem_request *request)
{
struct mock_request *mock = container_of(request, typeof(*mock), base);
struct mock_engine *engine =
container_of(request->engine, typeof(*engine), base);

i915_gem_request_submit(request);
GEM_BUG_ON(!request->global_seqno);

spin_lock_irq(&engine->hw_lock);
list_add_tail(&mock->link, &engine->hw_queue);
if (mock->link.prev == &engine->hw_queue)
mod_timer(&engine->hw_delay, jiffies + mock->delay);
spin_unlock_irq(&engine->hw_lock);
}

static struct intel_ring *mock_ring(struct intel_engine_cs *engine)
{
const unsigned long sz = roundup_pow_of_two(sizeof(struct intel_ring));
struct intel_ring *ring;

ring = kzalloc(sizeof(*ring) + sz, GFP_KERNEL);
if (!ring)
return NULL;

ring->engine = engine;
ring->size = sz;
ring->effective_size = sz;
ring->vaddr = (void *)(ring + 1);

INIT_LIST_HEAD(&ring->request_list);
ring->last_retired_head = -1;
intel_ring_update_space(ring);

return ring;
}

struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
const char *name)
{
struct mock_engine *engine;
static int id;

engine = kzalloc(sizeof(*engine) + PAGE_SIZE, GFP_KERNEL);
if (!engine)
return NULL;

/* minimal engine setup for seqno */
engine->name = name;
engine->id = id++;
engine->status_page.page_addr = (void *)(engine + 1);
engine->base.buffer = mock_ring(&engine->base);
if (!engine->base.buffer) {
kfree(engine);
return NULL;
}

/* minimal breadcrumbs init */
spin_lock_init(&engine->breadcrumbs.lock);
engine->breadcrumbs.mock = true;
/* minimal engine setup for requests */
engine->base.i915 = i915;
engine->base.name = name;
engine->base.id = id++;
engine->base.status_page.page_addr = (void *)(engine + 1);

return engine;
engine->base.context_pin = mock_context_pin;
engine->base.context_unpin = mock_context_unpin;
engine->base.request_alloc = mock_request_alloc;
engine->base.emit_flush = mock_emit_flush;
engine->base.emit_breadcrumb = mock_emit_breadcrumb;
engine->base.submit_request = mock_submit_request;

engine->base.timeline =
&i915->gt.global_timeline.engine[engine->base.id];

intel_engine_init_breadcrumbs(&engine->base);
engine->base.breadcrumbs.mock = true; /* prevent touching HW for irqs */

/* fake hw queue */
spin_lock_init(&engine->hw_lock);
setup_timer(&engine->hw_delay,
hw_delay_complete,
(unsigned long)engine);
INIT_LIST_HEAD(&engine->hw_queue);

return &engine->base;
}

void mock_engine_flush(struct intel_engine_cs *engine)
{
struct mock_engine *mock =
container_of(engine, typeof(*mock), base);
struct mock_request *request, *rn;

del_timer_sync(&mock->hw_delay);

spin_lock_irq(&mock->hw_lock);
list_for_each_entry_safe(request, rn, &mock->hw_queue, link) {
list_del_init(&request->link);
mock_seqno_advance(&mock->base, request->base.global_seqno);
}
spin_unlock_irq(&mock->hw_lock);
}

void mock_engine_reset(struct intel_engine_cs *engine)
{
intel_write_status_page(engine, I915_GEM_HWS_INDEX, 0);
}

void mock_engine_free(struct intel_engine_cs *engine)
{
struct mock_engine *mock =
container_of(engine, typeof(*mock), base);

GEM_BUG_ON(timer_pending(&mock->hw_delay));

if (engine->last_retired_context)
engine->context_unpin(engine, engine->last_retired_context);

intel_engine_fini_breadcrumbs(engine);

kfree(engine->buffer);
kfree(engine);
}
18 changes: 17 additions & 1 deletion drivers/gpu/drm/i915/selftests/mock_engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,25 @@
#ifndef __MOCK_ENGINE_H__
#define __MOCK_ENGINE_H__

struct intel_engine_cs *mock_engine(const char *name);
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/timer.h>

#include "../intel_ringbuffer.h"

struct mock_engine {
struct intel_engine_cs base;

spinlock_t hw_lock;
struct list_head hw_queue;
struct timer_list hw_delay;
};

struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
const char *name);
void mock_engine_flush(struct intel_engine_cs *engine);
void mock_engine_reset(struct intel_engine_cs *engine);
void mock_engine_free(struct intel_engine_cs *engine);

static inline void mock_seqno_advance(struct intel_engine_cs *engine, u32 seqno)
{
Expand Down
Loading

0 comments on commit 0daf011

Please sign in to comment.