drm/i915: support creating LMEM objects
Subsystems (2)
PATCH v2 1/7 drm/i915: support creating LMEM objects
We currently define LMEM, or local memory, as just another memory region, like system memory or stolen, which we can expose to userspace and can be mapped to the CPU via some BAR.
--- drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 56 +++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 29 ++++++++++ drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/intel_region_lmem.c | 16 ++++++ drivers/gpu/drm/i915/intel_region_lmem.h | 11 ++++ .../drm/i915/selftests/i915_live_selftests.h | 1 + .../drm/i915/selftests/intel_memory_region.c | 40 +++++++++++++ 8 files changed, 158 insertions(+) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_lmem.c create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_lmem.h create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.c create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.h
drivers/gpu/drm/i915/Makefile +2 -0
@@ -119,6 +119,7 @@ gem-y += \ gem/i915_gem_internal.o \ gem/i915_gem_object.o \ gem/i915_gem_object_blt.o \ + gem/i915_gem_lmem.o \ gem/i915_gem_mman.o \ gem/i915_gem_pages.o \ gem/i915_gem_phys.o \
@@ -147,6 +148,7 @@ i915-y += \ i915_scheduler.o \ i915_trace_points.o \ i915_vma.o \ + intel_region_lmem.o \ intel_wopcm.o # general-purpose microcontroller (GuC) support
drivers/gpu/drm/i915/gem/i915_gem_lmem.c new file +56 -0
56 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_lmem.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2019 Intel Corporation +*/ + +#ifndef __I915_GEM_LMEM_H +#define __I915_GEM_LMEM_H + +#include <linux/types.h> + +struct drm_i915_private ; +struct drm_i915_gem_object ; +struct intel_memory_region ; + +extern const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops; + +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj); + +struct drm_i915_gem_object * +i915_gem_object_create_lmem (struct drm_i915_private *i915, +resource_size_t size, +unsigned int flags); + +struct drm_i915_gem_object * +__i915_gem_lmem_object_create (struct intel_memory_region *mem, +resource_size_t size, +unsigned int flags); + +#endif /* !__I915_GEM_LMEM_H */
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -101,6 +101,8 @@#include "i915_vma.h" #include "i915_irq.h" +#include "intel_region_lmem.h" +#include "intel_gvt.h" /* General customization:
@@ -1781,6 +1783,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_IPC (dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc)#define HAS_REGION (i915, i) (INTEL_INFO(i915)->memory_regions & (i)) +#define HAS_LMEM (i915) HAS_REGION(i915, REGION_LMEM)#define HAS_GT_UC (dev_priv) (INTEL_INFO(dev_priv)->has_gt_uc)
drivers/gpu/drm/i915/intel_region_lmem.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2019 Intel Corporation +*/ + +#include "i915_drv.h" +#include "intel_memory_region.h" +#include "gem/i915_gem_lmem.h" +#include "gem/i915_gem_region.h" +#include "intel_region_lmem.h" + +const struct intel_memory_region_ops intel_region_lmem_ops = { + .init = intel_memory_region_init_buddy, + .release = intel_memory_region_release_buddy, + .create_object = __i915_gem_lmem_object_create, +};
drivers/gpu/drm/i915/intel_region_lmem.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2019 Intel Corporation +*/ + +#ifndef __INTEL_REGION_LMEM_H +#define __INTEL_REGION_LMEM_H + +extern const struct intel_memory_region_ops intel_region_lmem_ops; + +#endif /* !__INTEL_REGION_LMEM_H */
drivers/gpu/drm/i915/selftests/i915_live_selftests.h +1 -0
@@ -32,6 +32,7 @@ selftest(gem_contexts, i915_gem_context_live_selftests) selftest(blt, i915_gem_object_blt_live_selftests) selftest(client, i915_gem_client_blt_live_selftests) selftest(reset, intel_reset_live_selftests) +selftest(memory_region, intel_memory_region_live_selftests) selftest(hangcheck, intel_hangcheck_live_selftests) selftest(execlists, intel_execlists_live_selftests)selftest (guc, intel_guc_live_selftest)
drivers/gpu/drm/i915/selftests/intel_memory_region.c +40 -0
@@ -11,8 +11,10 @@#include "mock_gem_device.h" #include "mock_region.h" +#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_region.h" #include "gem/selftests/mock_context.h" +#include "gt/intel_gt.h" #include "selftests/i915_random.h" static void close_objects(struct intel_memory_region *mem,
@@ -252,6 +254,27 @@ static int igt_mock_contiguous(void *arg)return err; } +static int igt_lmem_create (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct drm_i915_gem_object *obj; +int err =0 ; + + obj =i915_gem_object_create_lmem (i915,PAGE_SIZE ,0 ); +if (IS_ERR (obj)) +return PTR_ERR (obj); + + err =i915_gem_object_pin_pages (obj); +if (err) + goto out_put; + +i915_gem_object_unpin_pages (obj); +out_put: +i915_gem_object_put (obj); + +return err; +} +int intel_memory_region_mock_selftests (void ) {static const struct i915_subtest tests[] = {
@@ -280,3 +303,20 @@ int intel_memory_region_mock_selftests(void)drm_dev_put (&i915->drm);return err; } + +int intel_memory_region_live_selftests (struct drm_i915_private *i915) +{ +static const struct i915_subtest tests[] = { +SUBTEST (igt_lmem_create), + }; + +if (!HAS_LMEM (i915)) { +pr_info ("device lacks LMEM support, skipping\n" ); +return 0 ; + } + +if (intel_gt_is_wedged (&i915->gt)) +return 0 ; + +return i915_live_subtests (tests, i915); +}
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/7 drm/i915: setup io-mapping for LMEM
From: Abdiel Janulgue <[email protected]>
--- drivers/gpu/drm/i915/intel_region_lmem.c | 28 ++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_region_lmem.c +26 -2
@@ -9,8 +9,32 @@#include "gem/i915_gem_region.h" #include "intel_region_lmem.h" +static void +region_lmem_release (struct intel_memory_region *mem) +{ +io_mapping_fini (&mem->iomap); +intel_memory_region_release_buddy (mem); +} + +static int +region_lmem_init (struct intel_memory_region *mem) +{ +int ret; + +if (!io_mapping_init_wc (&mem->iomap, + mem->io_start, +resource_size (&mem->region))) +return -EIO ; + + ret =intel_memory_region_init_buddy (mem); +if (ret) +io_mapping_fini (&mem->iomap); + +return ret; +} +const struct intel_memory_region_ops intel_region_lmem_ops = { - .init = intel_memory_region_init_buddy, - .release = intel_memory_region_release_buddy, + .init = region_lmem_init, + .release = region_lmem_release, .create_object = __i915_gem_lmem_object_create, };
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/7 drm/i915/lmem: support kernel mapping
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
We can create LMEM objects, but we also need to support mapping them into kernel space for internal use.
--- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 36 ++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 8 ++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 9 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 22 +++- .../drm/i915/selftests/intel_memory_region.c | 113 ++++++++++++++++++ 5 files changed, 180 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +36 -0
@@ -9,11 +9,47 @@#include "i915_drv.h" const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = { + .flags =I915_GEM_OBJECT_HAS_IOMEM , + .get_pages = i915_gem_object_get_pages_buddy, .put_pages = i915_gem_object_put_pages_buddy, .release = i915_gem_object_release_memory_region, }; +/* XXX: Time to vfunc your life up? */ +void __iomem *i915_gem_object_lmem_io_map_page (struct drm_i915_gem_object *obj, +unsigned long n) +{ +resource_size_t offset; + + offset =i915_gem_object_get_dma_address (obj, n); + +return io_mapping_map_wc (&obj->mm.region->iomap, offset,PAGE_SIZE ); +} + +void __iomem *i915_gem_object_lmem_io_map_page_atomic (struct drm_i915_gem_object *obj, +unsigned long n) +{ +resource_size_t offset; + + offset =i915_gem_object_get_dma_address (obj, n); + +return io_mapping_map_atomic_wc (&obj->mm.region->iomap, offset); +} + +void __iomem *i915_gem_object_lmem_io_map (struct drm_i915_gem_object *obj, +unsigned long n, +unsigned long size) +{ +resource_size_t offset; + +GEM_BUG_ON (!i915_gem_object_is_contiguous (obj)); + + offset =i915_gem_object_get_dma_address (obj, n); + +return io_mapping_map_wc (&obj->mm.region->iomap, offset, size); +} +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj) {return obj->ops == &i915_gem_lmem_obj_ops;
drivers/gpu/drm/i915/gem/i915_gem_lmem.h +8 -0
@@ -14,6 +14,14 @@ struct intel_memory_region;extern const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops; +void __iomem *i915_gem_object_lmem_io_map (struct drm_i915_gem_object *obj, +unsigned long n,unsigned long size); +void __iomem *i915_gem_object_lmem_io_map_page (struct drm_i915_gem_object *obj, +unsigned long n); +void __iomem * +i915_gem_object_lmem_io_map_page_atomic (struct drm_i915_gem_object *obj, +unsigned long n); +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj); struct drm_i915_gem_object *
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +5 -4
@@ -31,10 +31,11 @@ struct i915_lut_handle {struct drm_i915_gem_object_ops {unsigned int flags;#define I915_GEM_OBJECT_HAS_STRUCT_PAGE BIT(0) -#define I915_GEM_OBJECT_IS_SHRINKABLE BIT(1) -#define I915_GEM_OBJECT_IS_PROXY BIT(2) -#define I915_GEM_OBJECT_NO_GGTT BIT(3) -#define I915_GEM_OBJECT_ASYNC_CANCEL BIT(4) +#define I915_GEM_OBJECT_HAS_IOMEM BIT(1) +#define I915_GEM_OBJECT_IS_SHRINKABLE BIT(2) +#define I915_GEM_OBJECT_IS_PROXY BIT(3) +#define I915_GEM_OBJECT_NO_GGTT BIT(4) +#define I915_GEM_OBJECT_ASYNC_CANCEL BIT(5)/* Interface between the GEM object and its backing storage. * get_pages() is called once prior to the use of the associated set
drivers/gpu/drm/i915/gem/i915_gem_pages.c +18 -4
@@ -7,6 +7,7 @@#include "i915_drv.h" #include "i915_gem_object.h" #include "i915_scatterlist.h" +#include "i915_gem_lmem.h" void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj, struct sg_table *pages,
@@ -172,7 +173,9 @@ __i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)void *ptr; ptr =page_mask_bits (obj->mm.mapping); -if (is_vmalloc_addr (ptr)) +if (i915_gem_object_is_lmem (obj)) +io_mapping_unmap (ptr); +else if (is_vmalloc_addr (ptr))vunmap (ptr);else kunmap (kmap_to_page (ptr));
@@ -231,7 +234,7 @@ int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj, }/* The 'mapping' part of i915_gem_object_pin_map() below */ -static void *i915_gem_object_map (const struct drm_i915_gem_object *obj, +static void *i915_gem_object_map (struct drm_i915_gem_object *obj,enum i915_map_type type) {unsigned long n_pages = obj->base.size >>PAGE_SHIFT ;
@@ -244,6 +247,13 @@ static void *i915_gem_object_map(const struct drm_i915_gem_object *obj,pgprot_t pgprot;void *addr; +if (i915_gem_object_is_lmem (obj)) { +if (type !=I915_MAP_WC ) +return NULL ; + +return i915_gem_object_lmem_io_map (obj,0 , obj->base.size); + } +/* A single page can always be kmapped */ if (n_pages ==1 && type ==I915_MAP_WB )return kmap (sg_page (sgt->sgl));
@@ -285,11 +295,13 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj, enum i915_map_type type) {enum i915_map_type has_type; +unsigned int flags;bool pinned;void *ptr;int err; -if (unlikely (!i915_gem_object_has_struct_page (obj))) + flags =I915_GEM_OBJECT_HAS_STRUCT_PAGE |I915_GEM_OBJECT_HAS_IOMEM ; +if (!i915_gem_object_type_has (obj, flags))return ERR_PTR (-ENXIO ); err =mutex_lock_interruptible (&obj->mm.lock);
@@ -321,7 +333,9 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj, goto err_unpin; } -if (is_vmalloc_addr (ptr)) +if (i915_gem_object_is_lmem (obj)) +io_mapping_unmap (ptr); +else if (is_vmalloc_addr (ptr))vunmap (ptr);else kunmap (kmap_to_page (ptr));
drivers/gpu/drm/i915/selftests/intel_memory_region.c +113 -0
133 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/7] drm/i915/lmem: support kernel mapping
Quoting Matthew Auld (2019-10-21 20:27:43)
drivers/gpu/drm/i915/gem/i915_gem_pages.c static void *i915_gem_object_map(const struct drm_i915_gem_object *obj, · line 252
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_pages.c +3
-0@@ -244,6 +247,13 @@ static void *i915_gem_object_map(const struct drm_i915_gem_object *obj,pgprot_t pgprot;void *addr; +if (i915_gem_object_is_lmem (obj)) { +if (type !=I915_MAP_WC ) +return NULL ;
return ERR_PTR(-EINVAL) or ERR_PTR(-ENODEV);
drivers/gpu/drm/i915/gem/i915_gem_pages.c static void *i915_gem_object_map(const struct drm_i915_gem_object *obj, · line 259
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_pages.c +4
-0+ +return i915_gem_object_lmem_io_map (obj,0 , obj->base.size); + } +/* A single page can always be kmapped */ if (n_pages ==1 && type ==I915_MAP_WB )return kmap (sg_page (sgt->sgl));
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/7] drm/i915/lmem: support kernel mapping
Quoting Chris Wilson (2019-10-21 20:37:46)
Quoted 10 lines
Quoting Matthew Auld (2019-10-21 20:27:43)
drivers/gpu/drm/i915/gem/i915_gem_pages.c static void *i915_gem_object_map(const struct drm_i915_gem_object *obj, · line 252
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_pages.c +3
-0@@ -244,6 +247,13 @@ static void *i915_gem_object_map(const struct drm_i915_gem_object *obj,pgprot_t pgprot;void *addr; +if (i915_gem_object_is_lmem (obj)) { +if (type !=I915_MAP_WC ) +return NULL ;return
ERR_PTR(-EINVAL)orERR_PTR(-ENODEV);
Belay that, wrong level. Slightly obnoxious though. -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/7 drm/i915/selftests: add write-dword test for LMEM
In reply to Matthew AuldSimple test writing to dwords across an object, using various engines in a randomized order, checking that our writes land from the cpu.
--- .../drm/i915/selftests/intel_memory_region.c | 166 ++++++++++++++++++ 1 file changed, 166 insertions(+)
drivers/gpu/drm/i915/selftests/intel_memory_region.c +166 -0
@@ -11,9 +11,11 @@#include "mock_gem_device.h" #include "mock_region.h" +#include "gem/i915_gem_context.h" #include "gem/i915_gem_lmem.h" #include "gem/i915_gem_region.h" #include "gem/i915_gem_object_blt.h" +#include "gem/selftests/igt_gem_utils.h" #include "gem/selftests/mock_context.h" #include "gt/intel_gt.h" #include "selftests/igt_flush_test.h"
@@ -256,6 +258,125 @@ static int igt_mock_contiguous(void *arg)return err; } +static int igt_gpu_write_dw (struct intel_context *ce, +struct i915_vma *vma, +u32 dword, +u32 value) +{ +return igt_gpu_fill_dw (ce, vma, dword *sizeof (u32), + vma->size >>PAGE_SHIFT , value); +} + +static int igt_cpu_check (struct drm_i915_gem_object *obj,u32 dword,u32 val) +{ +unsigned long n; +int err; + +i915_gem_object_lock (obj); + err =i915_gem_object_set_to_wc_domain (obj, false); +i915_gem_object_unlock (obj); +if (err) +return err; + + err =i915_gem_object_pin_pages (obj); +if (err) +return err; + +for (n =0 ; n < obj->base.size >>PAGE_SHIFT ; ++n) { +u32 __iomem *base; +u32 read_val; + + base =i915_gem_object_lmem_io_map_page_atomic (obj, n); + + read_val =ioread32 (base + dword); +io_mapping_unmap_atomic (base); +if (read_val != val) { +pr_err ("n=%lu base[%u]=%u, val=%u\n" , + n, dword, read_val, val); + err = -EINVAL ; +break ; + } + } + +i915_gem_object_unpin_pages (obj); +return err; +} + +static int igt_gpu_write (struct i915_gem_context *ctx, +struct drm_i915_gem_object *obj) +{ +struct drm_i915_private *i915 = ctx->i915; +struct i915_address_space *vm = ctx->vm ?: &i915->ggtt.vm; +struct i915_gem_engines *engines; +struct i915_gem_engines_iter it; +struct intel_context *ce; +I915_RND_STATE (prng); +IGT_TIMEOUT (end_time); +unsigned int count; +struct i915_vma *vma; +int *order; +int i, n; +int err =0 ; + +GEM_BUG_ON (!i915_gem_object_has_pinned_pages (obj)); + + n =0 ; + count =0 ; +for_each_gem_engine (ce,i915_gem_context_lock_engines (ctx), it) { + count++; +if (!intel_engine_can_store_dword (ce->engine)) +continue ; + + n++; + } +i915_gem_context_unlock_engines (ctx); +if (!n) +return 0 ; + + order =i915_random_order (count * count, &prng); +if (!order) +return -ENOMEM ; + + vma =i915_vma_instance (obj, vm,NULL ); +if (IS_ERR (vma)) { + err =PTR_ERR (vma); + goto out_free; + } + + err =i915_vma_pin (vma,0 ,0 ,PIN_USER ); +if (err) + goto out_free; + + i =0 ; + engines =i915_gem_context_lock_engines (ctx); +do { +u32 rng =prandom_u32_state (&prng); +u32 dword =offset_in_page (rng) /4 ; + + ce = engines->engines[order[i] % engines->num_engines]; + i = (i +1 ) % (count * count); +if (!ce || !intel_engine_can_store_dword (ce->engine)) +continue ; + + err =igt_gpu_write_dw (ce, vma, dword, rng); +if (err) +break ; + + err =igt_cpu_check (obj, dword, rng); +if (err) +break ; + }while (!__igt_timeout (end_time,NULL )); +i915_gem_context_unlock_engines (ctx); + +out_free: +kfree (order); + +if (err == -ENOMEM ) + err =0 ; + +return err; +} +static int igt_lmem_create (void *arg) {struct drm_i915_private *i915 = arg;
@@ -277,6 +398,50 @@ static int igt_lmem_create(void *arg)return err; } +static int igt_lmem_write_gpu (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct drm_i915_gem_object *obj; +struct i915_gem_context *ctx; +struct drm_file *file; +I915_RND_STATE (prng); +u32 sz; +int err; + + file =mock_file (i915); +if (IS_ERR (file)) +return PTR_ERR (file); + + ctx =live_context (i915, file); +if (IS_ERR (ctx)) { + err =PTR_ERR (ctx); + goto out_file; + } + + sz =round_up (prandom_u32_state (&prng) %SZ_32M ,PAGE_SIZE ); + + obj =i915_gem_object_create_lmem (i915, sz,0 ); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); + goto out_file; + } + + err =i915_gem_object_pin_pages (obj); +if (err) + goto out_put; + + err =igt_gpu_write (ctx, obj); +if (err) +pr_err ("igt_gpu_write failed(%d)\n" , err); + +i915_gem_object_unpin_pages (obj); +out_put: +i915_gem_object_put (obj); +out_file: +mock_file_free (i915, file); +return err; +} +static int igt_lmem_write_cpu (void *arg) {struct drm_i915_private *i915 = arg;
@@ -421,6 +586,7 @@ int intel_memory_region_live_selftests(struct drm_i915_private *i915)static const struct i915_subtest tests[] = {SUBTEST (igt_lmem_create),SUBTEST (igt_lmem_write_cpu), +SUBTEST (igt_lmem_write_gpu), };if (!HAS_LMEM (i915)) {
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/7 drm/i915/selftests: extend coverage to include LMEM huge-pages
In reply to Matthew AuldAdd LMEM objects to list of backends we test for huge-GTT-pages.
--- .../gpu/drm/i915/gem/selftests/huge_pages.c | 121 +++++++++++++++++- 1 file changed, 120 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +120 -1
@@ -9,6 +9,7 @@#include "i915_selftest.h" #include "gem/i915_gem_region.h" +#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_pm.h" #include "gt/intel_gt.h"
@@ -981,7 +982,7 @@ static int gpu_write(struct intel_context *ce, vma->size >> PAGE_SHIFT, val); } -static int cpu_check (struct drm_i915_gem_object *obj,u32 dword,u32 val) +static int __cpu_check_shmem (struct drm_i915_gem_object *obj,u32 dword,u32 val) {unsigned int needs_flush;unsigned long n;
@@ -1013,6 +1014,51 @@ static int cpu_check(struct drm_i915_gem_object *obj, u32 dword, u32 val)return err; } +static int __cpu_check_lmem (struct drm_i915_gem_object *obj,u32 dword,u32 val) +{ +unsigned long n; +int err; + +i915_gem_object_lock (obj); + err =i915_gem_object_set_to_wc_domain (obj, false); +i915_gem_object_unlock (obj); +if (err) +return err; + + err =i915_gem_object_pin_pages (obj); +if (err) +return err; + +for (n =0 ; n < obj->base.size >>PAGE_SHIFT ; ++n) { +u32 __iomem *base; +u32 read_val; + + base =i915_gem_object_lmem_io_map_page_atomic (obj, n); + + read_val =ioread32 (base + dword); +io_mapping_unmap_atomic (base); +if (read_val != val) { +pr_err ("n=%lu base[%u]=%u, val=%u\n" , + n, dword, read_val, val); + err = -EINVAL ; +break ; + } + } + +i915_gem_object_unpin_pages (obj); +return err; +} + +static int cpu_check (struct drm_i915_gem_object *obj,u32 dword,u32 val) +{ +if (i915_gem_object_has_struct_page (obj)) +return __cpu_check_shmem (obj, dword, val); +else if (i915_gem_object_is_lmem (obj)) +return __cpu_check_lmem (obj, dword, val); + +return -ENODEV ; +} + static int __igt_write_huge(struct intel_context *ce, struct drm_i915_gem_object *obj, u64 size, u64 offset,
@@ -1397,6 +1443,78 @@ static int igt_ppgtt_gemfs_huge(void *arg)return err; } +static int igt_ppgtt_lmem_huge (void *arg) +{ +struct i915_gem_context *ctx = arg; +struct drm_i915_private *i915 = ctx->i915; +struct drm_i915_gem_object *obj; +static const unsigned int sizes[] = { +SZ_64K , +SZ_512K , +SZ_1M , +SZ_2M , + }; +int i; +int err; + +if (!HAS_LMEM (i915)) { +pr_info ("device lacks LMEM support, skipping\n" ); +return 0 ; + } + +/* +* Sanity check that the HW uses huge pages correctly through LMEM +* -- ensure that our writes land in the right place. +*/ + +for (i =0 ; i <ARRAY_SIZE (sizes); ++i) { +unsigned int size = sizes[i]; + + obj =i915_gem_object_create_lmem (i915, size,I915_BO_ALLOC_CONTIGUOUS ); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); +if (err == -E2BIG ) { +pr_info ("object too big for region!\n" ); +return 0 ; + } + +return err; + } + + err =i915_gem_object_pin_pages (obj); +if (err) + goto out_put; + +if (obj->mm.page_sizes.phys <I915_GTT_PAGE_SIZE_64K ) { +pr_info ("LMEM unable to allocate huge-page(s) with size=%u\n" , + size); + goto out_unpin; + } + + err =igt_write_huge (ctx, obj); +if (err) { +pr_err ("LMEM write-huge failed with size=%u\n" , size); + goto out_unpin; + } + +i915_gem_object_unpin_pages (obj); +__i915_gem_object_put_pages (obj,I915_MM_NORMAL ); +i915_gem_object_put (obj); + } + +return 0 ; + +out_unpin: +i915_gem_object_unpin_pages (obj); +out_put: +i915_gem_object_put (obj); + +if (err == -ENOMEM ) + err =0 ; + +return err; +} +static int igt_ppgtt_pin_update (void *arg) {struct i915_gem_context *ctx = arg;
@@ -1758,6 +1876,7 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915)SUBTEST (igt_ppgtt_exhaust_huge),SUBTEST (igt_ppgtt_gemfs_huge),SUBTEST (igt_ppgtt_internal_huge), + SUBTEST(igt_ppgtt_lmem_huge), };struct drm_file *file;struct i915_gem_context *ctx;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/7 drm/i915/selftests: prefer random sizes for the huge-GTT-page smoke tests
In reply to Matthew AuldDitch the dubious static list of sizes to enumerate, in favour of choosing a random size within the limits of each backing store. With repeated CI runs this should give us a wider range of object sizes, and in turn more page-size combinations, while using less machine time.
--- .../gpu/drm/i915/gem/selftests/huge_pages.c | 198 +++++++++--------- 1 file changed, 94 insertions(+), 104 deletions(-)
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +94 -104
@@ -1314,20 +1314,33 @@ static int igt_ppgtt_exhaust_huge(void *arg)return err; } +static u32 igt_random_size (struct rnd_state *prng, +u32 min_page_size, +u32 max_page_size) +{ +u64 mask; +u32 size; + +GEM_BUG_ON (!is_power_of_2 (min_page_size)); +GEM_BUG_ON (!is_power_of_2 (max_page_size)); +GEM_BUG_ON (min_page_size <PAGE_SIZE ); +GEM_BUG_ON (min_page_size > max_page_size); + + mask = ((max_page_size <<1ULL ) -1 ) &PAGE_MASK ; + size =prandom_u32_state (prng) & mask; +if (size < min_page_size) + size |= min_page_size; + +return size; +} +static int igt_ppgtt_internal_huge (void *arg) {struct i915_gem_context *ctx = arg;struct drm_i915_private *i915 = ctx->i915;struct drm_i915_gem_object *obj; -static const unsigned int sizes[] = { -SZ_64K , -SZ_128K , -SZ_256K , -SZ_512K , -SZ_1M , -SZ_2M , - }; -int i; +I915_RND_STATE (prng); +u32 size;int err;/*
@@ -1335,42 +1348,36 @@ static int igt_ppgtt_internal_huge(void *arg)* -- ensure that our writes land in the right place. */ -for (i =0 ; i <ARRAY_SIZE (sizes); ++i) { -unsigned int size = sizes[i]; - - obj =i915_gem_object_create_internal (i915, size); -if (IS_ERR (obj)) -return PTR_ERR (obj); + size =igt_random_size (&prng,SZ_64K ,SZ_2M ); - err =i915_gem_object_pin_pages (obj); -if (err) - goto out_put; - -if (obj->mm.page_sizes.phys <I915_GTT_PAGE_SIZE_64K ) { -pr_info ("internal unable to allocate huge-page(s) with size=%u\n" , - size); - goto out_unpin; - } + obj =i915_gem_object_create_internal (i915, size); +if (IS_ERR (obj)) +return PTR_ERR (obj); - err =igt_write_huge (ctx, obj); -if (err) { -pr_err ("internal write-huge failed with size=%u\n" , - size); - goto out_unpin; - } + err =i915_gem_object_pin_pages (obj); +if (err) + goto out_put; -i915_gem_object_unpin_pages (obj); -__i915_gem_object_put_pages (obj,I915_MM_NORMAL ); -i915_gem_object_put (obj); +if (obj->mm.page_sizes.phys <I915_GTT_PAGE_SIZE_64K ) { +pr_info ("%s unable to allocate huge-page(s) with size=%u\n" , + __func__, size); + err = -ENOMEM ; + goto out_unpin; } -return 0 ; + err =igt_write_huge (ctx, obj); +if (err) +pr_err ("%s write-huge failed with size=%u\n" , __func__, size); out_unpin:i915_gem_object_unpin_pages (obj); +__i915_gem_object_put_pages (obj,I915_MM_NORMAL ); out_put:i915_gem_object_put (obj); +if (err == -ENOMEM ) + err =0 ; +return err; }
@@ -1384,14 +1391,8 @@ static int igt_ppgtt_gemfs_huge(void *arg)struct i915_gem_context *ctx = arg;struct drm_i915_private *i915 = ctx->i915;struct drm_i915_gem_object *obj; -static const unsigned int sizes[] = { -SZ_2M , -SZ_4M , -SZ_8M , -SZ_16M , -SZ_32M , - }; -int i; +I915_RND_STATE (prng); +u32 size;int err;/*
@@ -1400,46 +1401,40 @@ static int igt_ppgtt_gemfs_huge(void *arg)*/ if (!igt_can_allocate_thp (i915)) { -pr_info ("missing THP support, skipping\n" ); +pr_info ("%s missing THP support, skipping\n" , __func__);return 0 ; } -for (i =0 ; i <ARRAY_SIZE (sizes); ++i) { -unsigned int size = sizes[i]; - - obj =i915_gem_object_create_shmem (i915, size); -if (IS_ERR (obj)) -return PTR_ERR (obj); - - err =i915_gem_object_pin_pages (obj); -if (err) - goto out_put; + size =igt_random_size (&prng,SZ_2M ,SZ_32M ); -if (obj->mm.page_sizes.phys <I915_GTT_PAGE_SIZE_2M ) { -pr_info ("finishing test early, gemfs unable to allocate huge-page(s) with size=%u\n" , - size); - goto out_unpin; - } + obj =i915_gem_object_create_shmem (i915, size); +if (IS_ERR (obj)) +return PTR_ERR (obj); - err =igt_write_huge (ctx, obj); -if (err) { -pr_err ("gemfs write-huge failed with size=%u\n" , - size); - goto out_unpin; - } + err =i915_gem_object_pin_pages (obj); +if (err) + goto out_put; -i915_gem_object_unpin_pages (obj); -__i915_gem_object_put_pages (obj,I915_MM_NORMAL ); -i915_gem_object_put (obj); +if (obj->mm.page_sizes.phys <I915_GTT_PAGE_SIZE_2M ) { +pr_info ("%s finishing test early, gemfs unable to allocate huge-page(s) with size=%u\n" , + __func__, size); + err = -ENOMEM ; + goto out_unpin; } -return 0 ; + err =igt_write_huge (ctx, obj); +if (err) +pr_err ("%s write-huge failed with size=%u\n" , __func__, size); out_unpin:i915_gem_object_unpin_pages (obj); +__i915_gem_object_put_pages (obj,I915_MM_NORMAL ); out_put:i915_gem_object_put (obj); +if (err == -ENOMEM ) + err =0 ; +return err; }
@@ -1448,13 +1443,8 @@ static int igt_ppgtt_lmem_huge(void *arg)struct i915_gem_context *ctx = arg;struct drm_i915_private *i915 = ctx->i915;struct drm_i915_gem_object *obj; -static const unsigned int sizes[] = { -SZ_64K , -SZ_512K , -SZ_1M , -SZ_2M , - }; -int i; +I915_RND_STATE (prng); +u32 size;int err;if (!HAS_LMEM (i915)) {
@@ -1467,49 +1457,49 @@ static int igt_ppgtt_lmem_huge(void *arg)* -- ensure that our writes land in the right place. */ -for (i =0 ; i <ARRAY_SIZE (sizes); ++i) { -unsigned int size = sizes[i]; - - obj =i915_gem_object_create_lmem (i915, size,I915_BO_ALLOC_CONTIGUOUS ); -if (IS_ERR (obj)) { - err =PTR_ERR (obj); -if (err == -E2BIG ) { -pr_info ("object too big for region!\n" ); -return 0 ; - } + size =SZ_1G ; +try_again: + size =igt_random_size (&prng,SZ_64K ,rounddown_pow_of_two (size)); -return err; + obj =i915_gem_object_create_lmem (i915, size,0 ); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); +if (err == -E2BIG ) { + size >>=1 ; + goto try_again; } - err =i915_gem_object_pin_pages (obj); -if (err) - goto out_put; - -if (obj->mm.page_sizes.phys <I915_GTT_PAGE_SIZE_64K ) { -pr_info ("LMEM unable to allocate huge-page(s) with size=%u\n" , - size); - goto out_unpin; - } +return err; + } - err =igt_write_huge (ctx, obj); -if (err) { -pr_err ("LMEM write-huge failed with size=%u\n" , size); - goto out_unpin; + err =i915_gem_object_pin_pages (obj); +if (err) { +if (err == -ENXIO ) { +i915_gem_object_put (obj); + size >>=1 ; + goto try_again; } + goto out_put; + } -i915_gem_object_unpin_pages (obj); -__i915_gem_object_put_pages (obj,I915_MM_NORMAL ); -i915_gem_object_put (obj); +if (obj->mm.page_sizes.phys <I915_GTT_PAGE_SIZE_64K ) { +pr_info ("%s unable to allocate huge-page(s) with size=%u\n" , + __func__, size); + err = -ENOMEM ; + goto out_unpin; } -return 0 ; + err =igt_write_huge (ctx, obj); +if (err) +pr_err ("%s write-huge failed with size=%u\n" , __func__, size); out_unpin:i915_gem_object_unpin_pages (obj); +__i915_gem_object_put_pages (obj,I915_MM_NORMAL ); out_put:i915_gem_object_put (obj); -if (err == -ENOMEM ) +if (err == -ENOMEM || err == -ENXIO ) err =0 ;return err;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/7 drm/i915/selftests: add sanity selftest for huge-GTT-pages
In reply to Matthew AuldNow that for all the relevant backends we do randomised testing, we need to make sure we still sanity check the obvious cases that might blow up, such that introducing a temporary regression is less likely. Also rather than do this for every backend, just limit to our two memory
types: system and local.
--- .../gpu/drm/i915/gem/selftests/huge_pages.c | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+)
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +103 -0
@@ -1505,6 +1505,108 @@ static int igt_ppgtt_lmem_huge(void *arg)return err; } +static struct drm_i915_gem_object * +igt_create_local (struct drm_i915_private *i915,u32 size) +{ +return i915_gem_object_create_lmem (i915, size,I915_ALLOC_CONTIGUOUS ); +} + +static struct drm_i915_gem_object * +igt_create_system (struct drm_i915_private *i915,u32 size) +{ +return huge_pages_object (i915, size, size); +} + +typedef struct drm_i915_gem_object * +(*igt_create_fn )(struct drm_i915_private *i915,u32 size); + +static int igt_ppgtt_sanity_check (void *arg) +{ +struct i915_gem_context *ctx = arg; +struct drm_i915_private *i915 = ctx->i915; +unsigned int supported =INTEL_INFO (i915)->page_sizes; +struct { +u32 size; +u32 pages; + } combos[] = { + {SZ_64K ,SZ_64K , }, + {SZ_2M ,SZ_2M , }, + {SZ_2M ,SZ_64K , }, + {SZ_2M +SZ_4K ,SZ_64K |SZ_4K , }, + {SZ_2M +SZ_4K ,SZ_2M |SZ_4K , }, + {SZ_2M +SZ_64K ,SZ_2M |SZ_64K , }, + }; +igt_create_fn fns[] = { + igt_create_local, + igt_create_system, + }; +int i, j; +int err; + +if (supported ==I915_GTT_PAGE_SIZE_4K ) +return 0 ; + +/* +* Sanity check that the HW behaves with a limited set of combinations. +* We already have a bunch of randomised testing, which should give us +* a decent amount of variation between runs, however we should keep +* this to limit the chances of introducing a temporary regression, by +* testing the most obvious cases that might make something blow up. +*/ + +for (i =0 ; i <ARRAY_SIZE (fns); ++i) { +for (j =0 ; j <ARRAY_SIZE (combos); ++j) { +struct drm_i915_gem_object *obj; +u32 size = combos[j].size; +u32 pages = combos[j].pages; + + obj = fns[i](i915, size); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); +if (err == -ENODEV ) { +pr_info ("Device lacks local memory, skipping\n" ); + err =0 ; +break ; + } + +return err; + } + + err =i915_gem_object_pin_pages (obj); +if (err) { +i915_gem_object_put (obj); + goto out; + } + +GEM_BUG_ON (pages > obj->base.size); + pages = pages & supported; + +if (pages) + obj->mm.page_sizes.sg = pages; + + err =igt_write_huge (ctx, obj); + +i915_gem_object_unpin_pages (obj); +__i915_gem_object_put_pages (obj,I915_MM_NORMAL ); +i915_gem_object_put (obj); + +if (err) { +pr_err ("%s write-huge failed with size=%u pages=%u i=%d, j=%d\n" , + __func__, size, pages, i, j); + goto out; + } + } + +cond_resched (); + } + +out: +if (err == -ENOMEM ) + err =0 ; + +return err; +} +static int igt_ppgtt_pin_update (void *arg) {struct i915_gem_context *ctx = arg;
@@ -1867,6 +1969,7 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915)SUBTEST (igt_ppgtt_gemfs_huge),SUBTEST (igt_ppgtt_internal_huge),SUBTEST (igt_ppgtt_lmem_huge), + SUBTEST(igt_ppgtt_sanity_check), };struct drm_file *file;struct i915_gem_context *ctx;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 7/7] drm/i915/selftests: add sanity selftest for huge-GTT-pages
Quoting Matthew Auld (2019-10-21 20:27:47)
Quoted 21 lines
Now that for all the relevant backends we do randomised testing, we need to make sure we still sanity check the obvious cases that might blow up, such that introducing a temporary regression is less likely. Also rather than do this for every backend, just limit to our two memory
types: system and local.Suggested-by Chris Wilson <[email protected]>Signed-off-by Matthew Auld <[email protected]>Cc Chris Wilson <[email protected]>--- .../gpu/drm/i915/gem/selftests/huge_pages.c | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+)drivers/gpu/drm/i915/gem/selftests/huge_pages.c +0
-0@@ -1505,6 +1505,108 @@ static int igt_ppgtt_lmem_huge(void *arg)return err; }
drivers/gpu/drm/i915/gem/selftests/huge_pages.c static int igt_ppgtt_lmem_huge(void *arg) · line 1517
Quoted 10 lines
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +10
-0+static struct drm_i915_gem_object * +igt_create_local (struct drm_i915_private *i915,u32 size) +{ +return i915_gem_object_create_lmem (i915, size,I915_ALLOC_CONTIGUOUS ); +} + +static struct drm_i915_gem_object * +igt_create_system (struct drm_i915_private *i915,u32 size) +{ +return huge_pages_object (i915, size, size);
Some might say that these [internal, mocks] should also be part of the factory service ;)
Quoted 8 lines
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +8
-0+typedef struct drm_i915_gem_object * +(*igt_create_fn )(struct drm_i915_private *i915,u32 size); + +static int igt_ppgtt_sanity_check (void *arg) +{ +struct i915_gem_context *ctx = arg; +struct drm_i915_private *i915 = ctx->i915; +unsigned int supported =INTEL_INFO (i915)->page_sizes;
drivers/gpu/drm/i915/gem/selftests/huge_pages.c static int igt_ppgtt_lmem_huge(void *arg) · line 1537
Quoted 10 lines
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +10
-0+struct { +u32 size; +u32 pages; + } combos[] = { + {SZ_64K ,SZ_64K , }, + {SZ_2M ,SZ_2M , }, + {SZ_2M ,SZ_64K , }, + {SZ_2M +SZ_4K ,SZ_64K |SZ_4K , }, + {SZ_2M +SZ_4K ,SZ_2M |SZ_4K , }, + {SZ_2M +SZ_64K ,SZ_2M |SZ_64K , },
Won't SZ_2M - PAGE_SIZE also be as interesting?
If I am not barking up the wrong tree with my understanding here,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Matthew Auld (2019-10-21 20:27:41)
Quoted 11 lines
drivers/gpu/drm/i915/intel_region_lmem.c new file +5
-0@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2019 Intel Corporation +*/ +
drivers/gpu/drm/i915/intel_region_lmem.c line 15
Quoted 10 lines
drivers/gpu/drm/i915/intel_region_lmem.c new file +10
-0+#include "i915_drv.h" +#include "intel_memory_region.h" +#include "gem/i915_gem_lmem.h" +#include "gem/i915_gem_region.h" +#include "intel_region_lmem.h" + +const struct intel_memory_region_ops intel_region_lmem_ops = { + .init = intel_memory_region_init_buddy, + .release = intel_memory_region_release_buddy, + .create_object = __i915_gem_lmem_object_create,
I think the factory is misplaced, but will do for now. (I'm not fond of ops.create_object here, that should be a GEM factory.)
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx