Command parser batch buffer copy
Subsystems (3)
v2 cover Command parser batch buffer copy
From: Brad Volkin <[email protected]>
This is v2 of the series I sent here:
http://lists.freedesktop.org/archives/intel-gfx/2014-June/047609.html
I believe that I've addressed all of the feedback except
* I didn't move the allocation of the shadow batch buffer into parse_cmds(). It didn't seem like it added much value and would maybe complicate the error handling in do_execbuffer().
* I kept the part about attaching the shadow batch to the request, though in perhaps a less invasive way. My concern here is with the scheduler possibly reordering requests, I don't know if we'd still be able to implement the busy tracking in the pool as suggested.
The commit message for patch 4 still applies: we aren't ready for that change until the secure dispatch regression is resolved, but it's needed for testing.
I've added patch 5 to use batch_len instead of object size, as an optimization. My testing didn't show any perf difference, but I don't have any libva benchmarks to run, and that's where it sounded like the issue would be. I just tacked the patch onto the end of the series rather than squashing it in so we can easily take it or leave it as desired.
Brad Volkin (5):
drm/i915: Implement a framework for batch buffer pools drm/i915: Use batch pools with the command parser drm/i915: Add a batch pool debugfs file
drm/i915: Dispatch the shadow batch buffer
drm/i915: Use batch length instead of object size in command parser
Documentation/DocBook/drm.tmpl | 5 ++ drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_cmd_parser.c | 88 +++++++++++++++---- drivers/gpu/drm/i915/i915_debugfs.c | 41 +++++++++ drivers/gpu/drm/i915/i915_dma.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 26 ++++++ drivers/gpu/drm/i915/i915_gem.c | 10 +++ drivers/gpu/drm/i915/i915_gem_batch_pool.c | 133 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 39 ++++++++- 9 files changed, 325 insertions(+), 19 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.c
Signature · 1 line
1.8.3.2
PATCH v2 1/5 drm/i915: Implement a framework for batch buffer pools
From: Brad Volkin <[email protected]>
This adds a small module for managing a pool of batch buffers. The only current use case is for the command parser, as described in the kerneldoc in the patch. The code is simple, but separating it out makes it easier to change the underlying algorithms and to extend to future use cases should they arise.
The interface is simple: init to create an empty pool, fini to clean it up; get to obtain a new buffer, put to return it to the pool. Note that all buffers must be returned to the pool before freeing it.
Buffers are purgeable while in the pool, but not explicitly truncated in order to avoid overhead during execbuf.
Locking is currently based on the caller holding the struct_mutex. We already do that in the places where we will use the batch pool for the command parser.
v2:
- s/BUG_ON/WARN_ON/ for locking assertions
- Remove the cap on pool size
- Switch from alloc/free to init/fini
--- Documentation/DocBook/drm.tmpl | 5 ++ drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 17 ++++ drivers/gpu/drm/i915/i915_gem.c | 1 + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 133 +++++++++++++++++++++++++++++ 5 files changed, 157 insertions(+) create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.c
Documentation/DocBook/drm.tmpl +5 -0
@@ -3945,6 +3945,11 @@ int num_ioctls;</synopsis> !Pdrivers/gpu/drm/i915/i915_cmd_parser.c batch buffer command parser !Idrivers/gpu/drm/i915/i915_cmd_parser.c </sect2> + <sect2> + <title>Batchbuffer Pools</title> +!Pdrivers/gpu/drm/i915/i915_gem_batch_pool.c batch pool +!Idrivers/gpu/drm/i915/i915_gem_batch_pool.c + </sect2> </sect1> </chapter> </part>
drivers/gpu/drm/i915/Makefile +1 -0
@@ -17,6 +17,7 @@ i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o # GEM code i915-y += i915_cmd_parser.o \ + i915_gem_batch_pool.o \ i915_gem_context.o \ i915_gem_render_state.o \ i915_gem_debug.o \
drivers/gpu/drm/i915/i915_drv.h +17 -0
@@ -1062,6 +1062,12 @@ struct intel_l3_parity {int which_slice; }; +struct i915_gem_batch_pool { +struct drm_device *dev; +struct list_head active_list; +struct list_head inactive_list; +}; +struct i915_gem_mm {/** Memory allocator for GTT stolen memory */ struct drm_mm stolen;
@@ -1690,6 +1696,8 @@ struct drm_i915_gem_object {/** Used in execbuf to temporarily hold a ref */ struct list_head obj_exec_link; +struct list_head batch_pool_list; +/** * This is set if the object is on the active lists (has pending * rendering and so a non-zero seqno), and is not set if it i s on
@@ -2594,6 +2602,15 @@ void i915_destroy_error_state(struct drm_device *dev);void i915_get_extra_instdone (struct drm_device *dev,uint32_t *instdone);const char *i915_cache_level_str (int type); +/* i915_gem_batch_pool.c */ +void i915_gem_batch_pool_init (struct drm_device *dev, +struct i915_gem_batch_pool *pool); +void i915_gem_batch_pool_fini (struct i915_gem_batch_pool *pool); +struct drm_i915_gem_object * +i915_gem_batch_pool_get (struct i915_gem_batch_pool *pool,size_t size); +void i915_gem_batch_pool_put (struct i915_gem_batch_pool *pool, +struct drm_i915_gem_object *obj); +/* i915_cmd_parser.c */ int i915_cmd_parser_get_version (void );int i915_cmd_parser_init_ring (struct intel_engine_cs *ring);
drivers/gpu/drm/i915/i915_gem.c +1 -0
@@ -4332,6 +4332,7 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,INIT_LIST_HEAD (&obj->ring_list);INIT_LIST_HEAD (&obj->obj_exec_link);INIT_LIST_HEAD (&obj->vma_list); +INIT_LIST_HEAD (&obj->batch_pool_list); obj->ops = ops;
drivers/gpu/drm/i915/i915_gem_batch_pool.c new file +133 -0
133 lines not on this page · raw message
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/5] drm/i915: Implement a framework for batch buffer pools
drivers/gpu/drm/i915/i915_gem_batch_pool.c line 72
Quoted 12 lines · On Tue, Jul 08, 2014 at 03:26:36PM -0700, [email protected] wrote:
drivers/gpu/drm/i915/i915_gem_batch_pool.c new file +12
-0+void i915_gem_batch_pool_fini (struct i915_gem_batch_pool *pool) +{ +struct drm_i915_gem_object *obj, *next; + +WARN_ON (!mutex_is_locked (&pool->dev->struct_mutex)); +WARN_ON (!list_empty (&pool->active_list)); + +list_for_each_entry_safe (obj, next, + &pool->inactive_list, batch_pool_list) { +list_del (&obj->batch_pool_list); +drm_gem_object_unreference (&obj->base); + }
Cleanup loops are idiomatically: while (!list_empty()) { }
drivers/gpu/drm/i915/i915_gem_batch_pool.c line 100
Quoted 11 lines
drivers/gpu/drm/i915/i915_gem_batch_pool.c new file +11
-0+struct drm_i915_gem_object * +i915_gem_batch_pool_get (struct i915_gem_batch_pool *pool, +size_t size) +{ +struct drm_i915_gem_object *obj =NULL ; +struct drm_i915_gem_object *tmp; + +WARN_ON (!mutex_is_locked (&pool->dev->struct_mutex)); + +list_for_each_entry (tmp, &pool->inactive_list, batch_pool_list) { +if (tmp->base.size >= size) {
A general rule-of-thumb we use elsewhere is not to hand back an object that is greater than 2x the request. If you want to be generic, you could change size to min_size, max_size.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH v2 1/5] drm/i915: Implement a framework for batch buffer pools
In reply to [email protected]Quoted 16 lines · On Tue, Jul 08, 2014 at 03:26:36PM -0700, [email protected] wrote:
From: Brad Volkin <[email protected]>
This adds a small module for managing a pool of batch buffers. The only current use case is for the command parser, as described in the kerneldoc in the patch. The code is simple, but separating it out makes it easier to change the underlying algorithms and to extend to future use cases should they arise.
The interface is simple: init to create an empty pool, fini to clean it up; get to obtain a new buffer, put to return it to the pool. Note that all buffers must be returned to the pool before freeing it.
Buffers are purgeable while in the pool, but not explicitly truncated in order to avoid overhead during execbuf.
Quoted 8 lines
Locking is currently based on the caller holding the
struct_mutex. We already do that in the places where we will use the batch pool for the command parser.v2:
- s/BUG_ON/WARN_ON/ for locking assertions
- Remove the cap on pool size
- Switch from alloc/free to init/fini
You are missing the madvise mechanics.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH v2 1/5] drm/i915: Implement a framework for batch buffer pools
Quoted 21 lines · Chris Wilson
Quoted 20 lines · On Tue, Jul 08, 2014 at 03:26:36PM -0700, [email protected] wrote:
From: Brad Volkin <[email protected]>
This adds a small module for managing a pool of batch buffers. The only current use case is for the command parser, as described in the kerneldoc in the patch. The code is simple, but separating it out makes it easier to change the underlying algorithms and to extend to future use cases should they arise.
The interface is simple: init to create an empty pool, fini to clean it up; get to obtain a new buffer, put to return it to the pool. Note that all buffers must be returned to the pool before freeing it.
Buffers are purgeable while in the pool, but not explicitly truncated in order to avoid overhead during execbuf.
Locking is currently based on the caller holding the
struct_mutex. We already do that in the places where we will use the batch pool for the command parser.
Quoted 6 lines
Quoted 4 lines
v2:
- s/BUG_ON/WARN_ON/ for locking assertions
- Remove the cap on pool size
- Switch from alloc/free to init/finiYou are missing the madvise mechanics.
_get() and _put() set obj->madv, which I thought was enough for what I've described (i.e. purgeable while in the pool but not explicitly truncated). Is that not enough for the shrinker to truncate as needed? Or do you want them explicitly truncated while in the pool? I was worried about the extra cost of getting the backing storage back during execbuf.
Brad
Quoted 4 lines
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH v2 1/5] drm/i915: Implement a framework for batch buffer pools
Quoted 27 lines · Bradley D
Quoted 26 lines · Chris Wilson
Quoted 24 lines · On Tue, Jul 08, 2014 at 03:26:36PM -0700, [email protected] wrote:
From: Brad Volkin <[email protected]>
This adds a small module for managing a pool of batch buffers. The only current use case is for the command parser, as described in the kerneldoc in the patch. The code is simple, but separating it out makes it easier to change the underlying algorithms and to extend to future use cases should they arise.
The interface is simple: init to create an empty pool, fini to clean it up; get to obtain a new buffer, put to return it to the pool. Note that all buffers must be returned to the pool before freeing it.
Buffers are purgeable while in the pool, but not explicitly truncated in order to avoid overhead during execbuf.
Locking is currently based on the caller holding the
struct_mutex. We already do that in the places where we will use the batch pool for the command parser.v2:
- s/BUG_ON/WARN_ON/ for locking assertions
- Remove the cap on pool size
- Switch from alloc/free to init/fini
Quoted 7 lines
Quoted 1 line
You are missing the madvise mechanics.
_get()and_put()setobj->madv, which I thought was enough for what I've described (i.e. purgeable while in the pool but not explicitly truncated). Is that not enough for the shrinker to truncate as needed? Or do you want them explicitly truncated while in the pool? I was worried about the extra cost of getting the backing storage back during execbuf.
You need to check that the shrinker hasn't truncated your backing storage whilst it was marked DONTNEED. It just amounts to checking for obj->madv == __I915_MADV_PURGED in pool_get() and discarding the cache entry if it has been truncated.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH v2 1/5] drm/i915: Implement a framework for batch buffer pools
Quoted 36 lines · Chris Wilson
Quoted 27 lines · Bradley D
Quoted 26 lines · Chris Wilson
Quoted 24 lines · On Tue, Jul 08, 2014 at 03:26:36PM -0700, [email protected] wrote:
From: Brad Volkin <[email protected]>
This adds a small module for managing a pool of batch buffers. The only current use case is for the command parser, as described in the kerneldoc in the patch. The code is simple, but separating it out makes it easier to change the underlying algorithms and to extend to future use cases should they arise.
The interface is simple: init to create an empty pool, fini to clean it up; get to obtain a new buffer, put to return it to the pool. Note that all buffers must be returned to the pool before freeing it.
Buffers are purgeable while in the pool, but not explicitly truncated in order to avoid overhead during execbuf.
Locking is currently based on the caller holding the
struct_mutex. We already do that in the places where we will use the batch pool for the command parser.v2:
- s/BUG_ON/WARN_ON/ for locking assertions
- Remove the cap on pool size
- Switch from alloc/free to init/finiQuoted 7 lines
Quoted 1 line
You are missing the madvise mechanics.
_get()and_put()setobj->madv, which I thought was enough for what I've described (i.e. purgeable while in the pool but not explicitly truncated). Is that not enough for the shrinker to truncate as needed? Or do you want them explicitly truncated while in the pool? I was worried about the extra cost of getting the backing storage back during execbuf.
Quoted 4 lines
You need to check that the shrinker hasn't truncated your backing storage whilst it was marked DONTNEED. It just amounts to checking for
obj->madv==__I915_MADV_PURGEDinpool_get()and discarding the cache entry if it has been truncated.
Ok. When we hit a purged object, do you think it's worth doing a retry loop (as in libdrm's cache) or just fall straight through to allocating a new object?
Brad
Quoted 4 lines
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH v2 1/5] drm/i915: Implement a framework for batch buffer pools
Quoted 8 lines · Bradley D
Quoted 4 lines · Chris Wilson
You need to check that the shrinker hasn't truncated your backing storage whilst it was marked DONTNEED. It just amounts to checking for
obj->madv==__I915_MADV_PURGEDinpool_get()and discarding the cache entry if it has been truncated.Ok. When we hit a purged object, do you think it's worth doing a retry loop (as in libdrm's cache) or just fall straight through to allocating a new object?
I'd keeping going through the cache, deleting purged entries until we find a usable object (or we have cleared the list).
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH v3 1/5 drm/i915: Implement a framework for batch buffer pools
In reply to [email protected]From: Brad Volkin <[email protected]>
This adds a small module for managing a pool of batch buffers. The only current use case is for the command parser, as described in the kerneldoc in the patch. The code is simple, but separating it out makes it easier to change the underlying algorithms and to extend to future use cases should they arise.
The interface is simple: init to create an empty pool, fini to clean it up; get to obtain a new buffer, put to return it to the pool. Note that all buffers must be returned to the pool before freeing it.
Buffers are purgeable while in the pool, but not explicitly truncated in order to avoid overhead during execbuf.
Locking is currently based on the caller holding the struct_mutex. We already do that in the places where we will use the batch pool for the command parser.
v2:
- s/BUG_ON/WARN_ON/ for locking assertions
- Remove the cap on pool size
- Switch from alloc/free to init/fini
v3:
- Idiomatic looping structure in _fini
- Correct handling of purged objects
- Don't return a buffer that's too much larger than needed
--- Documentation/DocBook/drm.tmpl | 5 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 17 ++++ drivers/gpu/drm/i915/i915_gem.c | 1 + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 153 +++++++++++++++++++++++++++++ 5 files changed, 177 insertions(+) create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.c
Documentation/DocBook/drm.tmpl +5 -0
@@ -3945,6 +3945,11 @@ int num_ioctls;</synopsis> !Pdrivers/gpu/drm/i915/i915_cmd_parser.c batch buffer command parser !Idrivers/gpu/drm/i915/i915_cmd_parser.c </sect2> + <sect2> + <title>Batchbuffer Pools</title> +!Pdrivers/gpu/drm/i915/i915_gem_batch_pool.c batch pool +!Idrivers/gpu/drm/i915/i915_gem_batch_pool.c + </sect2> </sect1> </chapter> </part>
drivers/gpu/drm/i915/Makefile +1 -0
@@ -17,6 +17,7 @@ i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o # GEM code i915-y += i915_cmd_parser.o \ + i915_gem_batch_pool.o \ i915_gem_context.o \ i915_gem_render_state.o \ i915_gem_debug.o \
drivers/gpu/drm/i915/i915_drv.h +17 -0
@@ -1062,6 +1062,12 @@ struct intel_l3_parity {int which_slice; }; +struct i915_gem_batch_pool { +struct drm_device *dev; +struct list_head active_list; +struct list_head inactive_list; +}; +struct i915_gem_mm {/** Memory allocator for GTT stolen memory */ struct drm_mm stolen;
@@ -1690,6 +1696,8 @@ struct drm_i915_gem_object {/** Used in execbuf to temporarily hold a ref */ struct list_head obj_exec_link; +struct list_head batch_pool_list; +/** * This is set if the object is on the active lists (has pending * rendering and so a non-zero seqno), and is not set if it i s on
@@ -2594,6 +2602,15 @@ void i915_destroy_error_state(struct drm_device *dev);void i915_get_extra_instdone (struct drm_device *dev,uint32_t *instdone);const char *i915_cache_level_str (int type); +/* i915_gem_batch_pool.c */ +void i915_gem_batch_pool_init (struct drm_device *dev, +struct i915_gem_batch_pool *pool); +void i915_gem_batch_pool_fini (struct i915_gem_batch_pool *pool); +struct drm_i915_gem_object * +i915_gem_batch_pool_get (struct i915_gem_batch_pool *pool,size_t size); +void i915_gem_batch_pool_put (struct i915_gem_batch_pool *pool, +struct drm_i915_gem_object *obj); +/* i915_cmd_parser.c */ int i915_cmd_parser_get_version (void );int i915_cmd_parser_init_ring (struct intel_engine_cs *ring);
drivers/gpu/drm/i915/i915_gem.c +1 -0
@@ -4332,6 +4332,7 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,INIT_LIST_HEAD (&obj->ring_list);INIT_LIST_HEAD (&obj->obj_exec_link);INIT_LIST_HEAD (&obj->vma_list); +INIT_LIST_HEAD (&obj->batch_pool_list); obj->ops = ops;
drivers/gpu/drm/i915/i915_gem_batch_pool.c new file +153 -0
153 lines not on this page · raw message
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/5 drm/i915: Use batch pools with the command parser
In reply to [email protected]From: Brad Volkin <[email protected]>
This patch sets up all of the tracking and copying necessary to use batch pools with the command parser, but does not actually dispatch the copied (shadow) batch to the hardware yet. We still aren't quite ready to set the secure bit during dispatch.
Note that performance takes a hit from the copy in some cases and will likely need some work. At a rough pass, the memcpy appears to be the bottleneck. Without having done a deeper analysis, two ideas that come to mind are:
1) Copy sections of the batch at a time, as they are reached by parsing. Might improve cache locality.
2) Copy only up to the userspace-supplied batch length and memset the rest of the buffer. Reduces the number of reads.
v2:
- Remove setting the capacity of the pool
- One global pool instead of per-ring pools
- Replace batch_obj with shadow_batch_obj and hook into eb->vmas
- Memset any space in the shadow batch beyond what gets copied
- Rebased on execlist prep refactoring
--- drivers/gpu/drm/i915/i915_cmd_parser.c | 84 ++++++++++++++++++++++++------ drivers/gpu/drm/i915/i915_dma.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 8 +++ drivers/gpu/drm/i915/i915_gem.c | 9 ++++ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 35 +++++++++++++ 5 files changed, 121 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_cmd_parser.c +68 -16
@@ -831,6 +831,56 @@ finish:return (u32 *)addr; } +/* Returns a vmap'd pointer to dest_obj, which the caller must unmap */ +static u32 *copy_batch (struct drm_i915_gem_object *dest_obj, +struct drm_i915_gem_object *src_obj) +{ +int ret =0 ; +int needs_clflush =0 ; +u32 *src_addr, *dest_addr =NULL ; + + ret =i915_gem_obj_prepare_shmem_read (src_obj, &needs_clflush); +if (ret) { +DRM_DEBUG_DRIVER ("CMD: failed to prep read\n" ); +return ERR_PTR (ret); + } + + src_addr =vmap_batch (src_obj); +if (!src_addr) { +DRM_DEBUG_DRIVER ("CMD: Failed to vmap batch\n" ); + ret = -ENOMEM ; + goto unpin_src; + } + +if (needs_clflush) +drm_clflush_virt_range ((char *)src_addr, src_obj->base.size); + + ret =i915_gem_object_set_to_cpu_domain (dest_obj, true); +if (ret) { +DRM_DEBUG_DRIVER ("CMD: Failed to set batch CPU domain\n" ); + goto unmap_src; + } + + dest_addr =vmap_batch (dest_obj); +if (!dest_addr) { +DRM_DEBUG_DRIVER ("CMD: Failed to vmap shadow batch\n" ); + ret = -ENOMEM ; + goto unmap_src; + } + +memcpy (dest_addr, src_addr, src_obj->base.size); +if (dest_obj->base.size > src_obj->base.size) +memset ((u8 *)dest_addr + src_obj->base.size,0 , + dest_obj->base.size - src_obj->base.size); + +unmap_src: +vunmap (src_addr); +unpin_src: +i915_gem_object_unpin_pages (src_obj); + +return ret ?ERR_PTR (ret) : dest_addr; +} +/** * i915_needs_cmd_parser() - should a given ring use software command parsing? * @ring: the ring in question
@@ -952,6 +1002,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* i915_parse_cmds() - parse a submitted batch buffer for privilege violations * @ring: the ring on which the batch is to execute * @batch_obj: the batch buffer in question +* @shadow_batch_obj: copy of the batch buffer in question * @batch_start_offset: byte offset in the batch at which execution starts * @is_master: is the submitting process the drm master? *
@@ -962,32 +1013,28 @@ static bool check_cmd(const struct intel_engine_cs *ring,*/ int i915_parse_cmds (struct intel_engine_cs *ring,struct drm_i915_gem_object *batch_obj, +struct drm_i915_gem_object *shadow_batch_obj,u32 batch_start_offset,bool is_master) {int ret =0 ;u32 *cmd, *batch_base, *batch_end;struct drm_i915_cmd_descriptor default_desc = {0 }; -int needs_clflush =0 ;bool oacontrol_set = false;/* OACONTROL tracking. See check_cmd() */ - ret =i915_gem_obj_prepare_shmem_read (batch_obj, &needs_clflush); -if (ret) { -DRM_DEBUG_DRIVER ("CMD: failed to prep read\n" ); -return ret; + batch_base =copy_batch (shadow_batch_obj, batch_obj); +if (IS_ERR (batch_base)) { +DRM_DEBUG_DRIVER ("CMD: Failed to copy batch\n" ); +return PTR_ERR (batch_base); } - batch_base =vmap_batch (batch_obj); -if (!batch_base) { -DRM_DEBUG_DRIVER ("CMD: Failed to vmap batch\n" ); -i915_gem_object_unpin_pages (batch_obj); -return -ENOMEM ; - } - -if (needs_clflush) -drm_clflush_virt_range ((char *)batch_base, batch_obj->base.size); - cmd = batch_base + (batch_start_offset /sizeof (*cmd)); + +/* +* We use the source object's size because the shadow object is as +* large or larger and copy_batch() will write MI_NOPs to the extra +* space. Parsing should be faster in some cases this way. +*/ batch_end = cmd + (batch_obj->base.size /sizeof (*batch_end));while (cmd < batch_end) {
@@ -1039,7 +1086,12 @@ int i915_parse_cmds(struct intel_engine_cs *ring,vunmap (batch_base); -i915_gem_object_unpin_pages (batch_obj); +if (!ret) { + ret =i915_gem_object_set_to_gtt_domain (shadow_batch_obj, + false); +if (ret) +DRM_DEBUG_DRIVER ("CMD: Failed to set batch GTT domain\n" ); + }return ret; }
drivers/gpu/drm/i915/i915_dma.c +1 -0
@@ -1877,6 +1877,7 @@ int i915_driver_unload(struct drm_device *dev)mutex_lock (&dev->struct_mutex);i915_gem_cleanup_ringbuffer (dev); +i915_gem_batch_pool_fini (&dev_priv->mm.batch_pool);i915_gem_context_fini (dev);WARN_ON (dev_priv->mm.aliasing_ppgtt);mutex_unlock (&dev->struct_mutex);
drivers/gpu/drm/i915/i915_drv.h +8 -0
@@ -1081,6 +1081,13 @@ struct i915_gem_mm {*/ struct list_head unbound_list; +/* +* A pool of objects to use as shadow copies of client batch buffers +* when the command parser is enabled. Prevents the client from +* modifying the batch contents after software parsing. +*/ +struct i915_gem_batch_pool batch_pool; +/** Usable portion of the GTT for GEM */ unsigned long stolen_base;/* limited to low memory (32-bit) */
@@ -2618,6 +2625,7 @@ void i915_cmd_parser_fini_ring(struct intel_engine_cs *ring);bool i915_needs_cmd_parser (struct intel_engine_cs *ring);int i915_parse_cmds (struct intel_engine_cs *ring,struct drm_i915_gem_object *batch_obj, +struct drm_i915_gem_object *shadow_batch_obj,u32 batch_start_offset,bool is_master);
drivers/gpu/drm/i915/i915_gem.c +9 -0
@@ -2476,6 +2476,13 @@ static void i915_gem_free_request(struct drm_i915_gem_request *request)if (request->ctx)i915_gem_context_unreference (request->ctx); +if (!list_empty (&request->batch_obj->batch_pool_list)) { +struct drm_i915_private *dev_priv =to_i915 (request->ring->dev); + +i915_gem_batch_pool_put (&dev_priv->mm.batch_pool, + request->batch_obj); + } +kfree (request); }
@@ -4947,6 +4954,8 @@ i915_gem_load(struct drm_device *dev) dev_priv->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom;register_oom_notifier (&dev_priv->mm.oom_notifier); +i915_gem_batch_pool_init (dev, &dev_priv->mm.batch_pool); +mutex_init (&dev_priv->fb_tracking.lock); }
drivers/gpu/drm/i915/i915_gem_execbuffer.c +35 -0
@@ -1242,6 +1242,8 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,struct drm_i915_private *dev_priv = dev->dev_private;struct eb_vmas *eb;struct drm_i915_gem_object *batch_obj; +struct drm_i915_gem_object *shadow_batch_obj =NULL ; +struct drm_i915_gem_exec_object2 shadow_exec_entry;struct intel_engine_cs *ring;struct intel_context *ctx;struct i915_address_space *vm;
@@ -1366,13 +1368,38 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, batch_obj->base.pending_read_domains |=I915_GEM_DOMAIN_COMMAND ;if (i915_needs_cmd_parser (ring)) { +struct i915_vma *vma; + + shadow_batch_obj = +i915_gem_batch_pool_get (&dev_priv->mm.batch_pool, + batch_obj->base.size); +if (IS_ERR (shadow_batch_obj)) { + ret =PTR_ERR (shadow_batch_obj); +/* Don't try to clean up the obj in the error path */ + shadow_batch_obj =NULL ; + goto err; + } + + ret =i915_gem_obj_ggtt_pin (shadow_batch_obj,4096 ,0 ); +if (ret) + goto err; + ret =i915_parse_cmds (ring, batch_obj, + shadow_batch_obj, args->batch_start_offset, file->is_master);if (ret) goto err; + vma =i915_gem_obj_to_ggtt (shadow_batch_obj); + vma->exec_entry = &shadow_exec_entry; + vma->exec_entry->flags = __EXEC_OBJECT_HAS_PIN; +drm_gem_object_reference (&shadow_batch_obj->base); +list_add_tail (&vma->exec_list, &eb->vmas); + + batch_obj = shadow_batch_obj; +/* * XXX: Actually do this when enabling batch copy... *
@@ -1410,6 +1437,14 @@ err:i915_gem_context_unreference (ctx);eb_destroy (eb); +if (ret && ring && shadow_batch_obj) { +if (i915_gem_obj_is_pinned (shadow_batch_obj)) +i915_gem_object_ggtt_unpin (shadow_batch_obj); + +i915_gem_batch_pool_put (&dev_priv->mm.batch_pool, + shadow_batch_obj); + } +mutex_unlock (&dev->struct_mutex); pre_mutex_err:
Signature · 1 line
1.8.3.2
PATCH v2 3/5 drm/i915: Add a batch pool debugfs file
In reply to [email protected]From: Brad Volkin <[email protected]>
It provides some useful information about the buffers in the global command parser batch pool.
v2: rebase on global pool instead of per-ring pools
--- drivers/gpu/drm/i915/i915_debugfs.c | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +41 -0
@@ -568,6 +568,46 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)return 0 ; } +static int i915_gem_batch_pool_info (struct seq_file *m,void *data) +{ +struct drm_info_node *node = m->private; +struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_i915_gem_object *obj; +int count =0 ; +int ret; + + ret =mutex_lock_interruptible (&dev->struct_mutex); +if (ret) +return ret; + +seq_puts (m,"active:\n" ); +list_for_each_entry (obj, + &dev_priv->mm.batch_pool.active_list, + batch_pool_list) { +seq_puts (m," " ); +describe_obj (m, obj); +seq_putc (m,'\n' ); + count++; + } + +seq_puts (m,"inactive:\n" ); +list_for_each_entry (obj, + &dev_priv->mm.batch_pool.inactive_list, + batch_pool_list) { +seq_puts (m," " ); +describe_obj (m, obj); +seq_putc (m,'\n' ); + count++; + } + +seq_printf (m,"total: %d\n" , count); + +mutex_unlock (&dev->struct_mutex); + +return 0 ; +} +static int i915_gem_request_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private;
@@ -3950,6 +3990,7 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_gem_hws_blt", i915_hws_info, 0, (void *)BCS}, {"i915_gem_hws_bsd", i915_hws_info, 0, (void *)VCS}, {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, + {"i915_gem_batch_pool", i915_gem_batch_pool_info, 0}, {"i915_rstdby_delays", i915_rstdby_delays, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_delayfreq_table", i915_delayfreq_table, 0},
Signature · 1 line
1.8.3.2
Re: [PATCH v2 3/5] drm/i915: Add a batch pool debugfs file
Quoted 6 lines · On Tue, Jul 08, 2014 at 03:26:38PM -0700, [email protected] wrote:
From: Brad Volkin <[email protected]>
It provides some useful information about the buffers in the global command parser batch pool.
v2: rebase on global pool instead of per-ring pools
Include the counts in i915_gem_objects as well.
The issue is that the kernel allocated objects will perturb the number of objects allocated (possibly substantially) so having the kernel listed for its consumption will help track usage.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH v2 3/5] drm/i915: Add a batch pool debugfs file
Quoted 6 lines · Chris Wilson
Quoted 5 lines · On Tue, Jul 08, 2014 at 03:26:38PM -0700, [email protected] wrote:
From: Brad Volkin <[email protected]>
It provides some useful information about the buffers in the global command parser batch pool.
Quoted 7 lines
Quoted 1 line
v2: rebase on global pool instead of per-ring pools
Include the counts in
i915_gem_objectsas well.The issue is that the kernel allocated objects will perturb the number of objects allocated (possibly substantially) so having the kernel listed for its consumption will help track usage.
Ok, so maybe reuse per_file_stats() and add another line like those but for the batch pool?
Brad
Quoted 4 lines
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH v2 3/5] drm/i915: Add a batch pool debugfs file
Quoted 9 lines · Bradley D
Quoted 8 lines · Chris Wilson
Quoted 6 lines · On Tue, Jul 08, 2014 at 03:26:38PM -0700, [email protected] wrote:
From: Brad Volkin <[email protected]>
It provides some useful information about the buffers in the global command parser batch pool.
v2: rebase on global pool instead of per-ring pools
Quoted 8 lines
Quoted 5 lines
Include the counts in
i915_gem_objectsas well.The issue is that the kernel allocated objects will perturb the number of objects allocated (possibly substantially) so having the kernel listed for its consumption will help track usage.
Ok, so maybe reuse
per_file_stats()and add another line like those but for the batch pool?
Yes, something along those lines so the kernel batch pool just appears like another client. An exercise for another day would be to add a line for the other fixed entries, getting context objects accounted correctly, etc.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH v2 4/5 drm/i915: Dispatch the shadow batch buffer
In reply to [email protected]From: Brad Volkin <[email protected]>
This is useful for testing the batch pool code with aliasing PPGTT. It doesn't work with full PPGTT though; the GPU hangs and the whole UI is corrupted. We need fixes for the secure dispatch path to enable this for real.
v2: rebase on shadow_batch_obj replacing batch_obj
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -2
@@ -1401,13 +1401,12 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, batch_obj = shadow_batch_obj;/* -* XXX: Actually do this when enabling batch copy... -* * Set the DISPATCH_SECURE bit to remove the NON_SECURE bit * from MI_BATCH_BUFFER_START commands issued in the * dispatch_execbuffer implementations. We specifically don't * want that set when the command parser is enabled. */ + flags |=I915_DISPATCH_SECURE ; }/* snb/ivb/vlv conflate the "batch in ppgtt" bit with the "non-secure
Signature · 1 line
1.8.3.2
PATCH v2 5/5 drm/i915: Use batch length instead of object size in command parser
In reply to [email protected]From: Brad Volkin <[email protected]>
Previously we couldn't trust the user-supplied batch length because it came directly from userspace (i.e. untrusted code). It would have affected what commands software parsed without regard to what hardware would actually execute, leaving a potential hole.
With the parser now copying the user supplied batch buffer and writing MI_NOP commands to any space after the copied region, we can safely use the batch length input. This should be a performance win as the actual batch length is frequently much smaller than the allocated object size.
--- drivers/gpu/drm/i915/i915_cmd_parser.c | 20 +++++++++++--------- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 + 3 files changed, 13 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_cmd_parser.c +11 -9
@@ -833,7 +833,8 @@ finish:/* Returns a vmap'd pointer to dest_obj, which the caller must unmap */ static u32 *copy_batch (struct drm_i915_gem_object *dest_obj, -struct drm_i915_gem_object *src_obj) +struct drm_i915_gem_object *src_obj, +u32 batch_len) {int ret =0 ;int needs_clflush =0 ;
@@ -853,7 +854,7 @@ static u32 *copy_batch(struct drm_i915_gem_object *dest_obj, }if (needs_clflush) -drm_clflush_virt_range ((char *)src_addr, src_obj->base.size); +drm_clflush_virt_range ((char *)src_addr, batch_len); ret =i915_gem_object_set_to_cpu_domain (dest_obj, true);if (ret) {
@@ -868,10 +869,10 @@ static u32 *copy_batch(struct drm_i915_gem_object *dest_obj, goto unmap_src; } -memcpy (dest_addr, src_addr, src_obj->base.size); -if (dest_obj->base.size > src_obj->base.size) -memset ((u8 *)dest_addr + src_obj->base.size,0 , - dest_obj->base.size - src_obj->base.size); +memcpy (dest_addr, src_addr, batch_len); +if (dest_obj->base.size > batch_len) +memset ((u8 *)dest_addr + batch_len,0 , + dest_obj->base.size - batch_len); unmap_src:vunmap (src_addr);
@@ -1015,6 +1016,7 @@ int i915_parse_cmds(struct intel_engine_cs *ring,struct drm_i915_gem_object *batch_obj, struct drm_i915_gem_object *shadow_batch_obj, u32 batch_start_offset, + u32 batch_len, bool is_master) { int ret = 0;
@@ -1022,7 +1024,7 @@ int i915_parse_cmds(struct intel_engine_cs *ring,struct drm_i915_cmd_descriptor default_desc = {0 };bool oacontrol_set = false;/* OACONTROL tracking. See check_cmd() */ - batch_base =copy_batch (shadow_batch_obj, batch_obj); + batch_base =copy_batch (shadow_batch_obj, batch_obj, batch_len);if (IS_ERR (batch_base)) {DRM_DEBUG_DRIVER ("CMD: Failed to copy batch\n" );return PTR_ERR (batch_base);
@@ -1031,11 +1033,11 @@ int i915_parse_cmds(struct intel_engine_cs *ring, cmd = batch_base + (batch_start_offset /sizeof (*cmd));/* -* We use the source object's size because the shadow object is as +* We use the batch length as size because the shadow object is as * large or larger and copy_batch() will write MI_NOPs to the extra * space. Parsing should be faster in some cases this way. */ - batch_end = cmd + (batch_obj->base.size /sizeof (*batch_end)); + batch_end = cmd + (batch_len /sizeof (*batch_end));while (cmd < batch_end) {const struct drm_i915_cmd_descriptor *desc;
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2627,6 +2627,7 @@ int i915_parse_cmds(struct intel_engine_cs *ring,struct drm_i915_gem_object *batch_obj, struct drm_i915_gem_object *shadow_batch_obj, u32 batch_start_offset, + u32 batch_len, bool is_master);/* i915_suspend.c */
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -0
@@ -1388,6 +1388,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, batch_obj, shadow_batch_obj, args->batch_start_offset, + args->batch_len, file->is_master);if (ret) goto err;
Signature · 1 line
1.8.3.2
[PATCH 6/5] drm/i915: Add batch pool details to i915_gem_objects debugfs
In reply to [email protected]From: Brad Volkin <[email protected]>
To better account for the potentially large memory consumption of the batch pool.
--- drivers/gpu/drm/i915/i915_debugfs.c | 45 +++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +36 -9
@@ -360,6 +360,38 @@ static int per_file_stats(int id, void *ptr, void *data)return 0 ; } +#define print_file_stats (m, name, stats) \ + seq_printf(m, "%s: %u objects, %zu bytes (%zu active, %zu inactive, %zu global, %zu shared, %zu unbound)\n", \ + name, \ + stats.count, \ + stats.total, \ + stats.active, \ + stats.inactive, \ + stats.global, \ + stats.shared, \ + stats.unbound) + +static void print_batch_pool_stats (struct seq_file *m, +struct drm_i915_private *dev_priv) +{ +struct drm_i915_gem_object *obj; +struct file_stats stats; + +memset (&stats,0 ,sizeof (stats)); + +list_for_each_entry (obj, + &dev_priv->mm.batch_pool.active_list, + batch_pool_list) +per_file_stats (0 , obj, &stats); + +list_for_each_entry (obj, + &dev_priv->mm.batch_pool.inactive_list, + batch_pool_list) +per_file_stats (0 , obj, &stats); + +print_file_stats (m,"batch pool" , stats); +} +#define count_vmas (list, member) do { \ list_for_each_entry(vma, list, member) { \ size += i915_gem_obj_ggtt_size(vma->obj); \
@@ -442,6 +474,9 @@ static int i915_gem_object_info(struct seq_file *m, void* data) dev_priv->gtt.mappable_end - dev_priv->gtt.base.start);seq_putc (m,'\n' ); +print_batch_pool_stats (m, dev_priv); + +seq_putc (m,'\n' );list_for_each_entry_reverse (file, &dev->filelist, lhead) {struct file_stats stats;struct task_struct *task;
@@ -459,15 +494,7 @@ static int i915_gem_object_info(struct seq_file *m, void* data)*/ rcu_read_lock (); task =pid_task (file->pid,PIDTYPE_PID ); -seq_printf (m,"%s: %u objects, %zu bytes (%zu active, %zu inactive, %zu global, %zu shared, %zu unbound)\n" , - task ? task->comm :"<unknown>" , - stats.count, - stats.total, - stats.active, - stats.inactive, - stats.global, - stats.shared, - stats.unbound); +print_file_stats (m, task ? task->comm :"<unknown>" , stats);rcu_read_unlock (); }
Signature · 1 line
1.8.3.2