Instead of testing individually our new fault handlers, iterate over all
memory regions and test all from one interface.
Signed-off-by: Abdiel Janulgue <abdiel.janulgue@xxxxxxxxxxxxxxx>
Cc: Matthew Auld <matthew.auld@xxxxxxxxx>
Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
---
.../drm/i915/gem/selftests/i915_gem_mman.c | 233 ++++++++++++------
1 file changed, 160 insertions(+), 73 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
index 591435c5f368..8c32888e31ed 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
@@ -9,6 +9,8 @@
#include "gt/intel_engine_pm.h"
#include "gt/intel_gt.h"
#include "gt/intel_gt_pm.h"
+#include "gem/i915_gem_lmem.h"
+#include "gem/i915_gem_region.h"
#include "huge_gem_object.h"
#include "i915_selftest.h"
#include "selftests/i915_random.h"
@@ -725,44 +727,93 @@ static int igt_mmap_offset_exhaustion(void *arg)
goto out;
}
+typedef int (*obj_set_fn_t)(struct drm_i915_gem_object *obj, bool init);
+
+static int gtt_obj_set(struct drm_i915_gem_object *obj, bool init)
+{
+ u32 __iomem *map;
+ struct i915_vma *vma;
+ int err = 0;
+
+ i915_gem_object_lock(obj);
+ err = i915_gem_object_set_to_gtt_domain(obj, true);
+ i915_gem_object_unlock(obj);
+ if (err)
+ return err;
+
+ vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, PIN_MAPPABLE);
+ if (IS_ERR(vma))
+ return PTR_ERR(vma);
+
+ intel_gt_pm_get(vma->vm->gt);
+ map = i915_vma_pin_iomap(vma);
+ i915_vma_unpin(vma);
+ if (IS_ERR(map)) {
+ err = PTR_ERR(map);
+ goto out;
+ }
+
+ if (init) {
+ memset_io(map, POISON_INUSE, PAGE_SIZE);
+ } else {
+ if (memchr_inv(map, POISON_FREE, PAGE_SIZE)) {
+ pr_err("Write via mmap did not land in backing store\n");
+ err = -EINVAL;
+ }
+ }
+ i915_vma_unpin_iomap(vma);
+
+out:
+ intel_gt_pm_put(vma->vm->gt);
+ return err;
+}
+
+static int cpu_obj_set(struct drm_i915_gem_object *obj, bool init)
+{
+ int err = 0;
+ void *vaddr = i915_gem_object_pin_map(obj, i915_gem_object_is_lmem(obj) ?
+ I915_MAP_WC : I915_MAP_WB);
+ if (IS_ERR(vaddr))
+ return PTR_ERR(vaddr);
+
+ if (init) {
+ memset(vaddr, POISON_INUSE, PAGE_SIZE);
+ i915_gem_object_flush_map(obj);
+ } else {
+ if (memchr_inv(vaddr, POISON_FREE, PAGE_SIZE)) {
+ pr_err("Write via mmap did not land in backing store\n");
+ err = -EINVAL;
+ }
+ }
+ i915_gem_object_unpin_map(obj);
+
+ return err;
+}
+
#define expand32(x) (((x) << 0) | ((x) << 8) | ((x) << 16) | ((x) << 24))
-static int igt_mmap(void *arg, enum i915_mmap_type type)
+static int igt_mmap(struct drm_i915_private *i915, struct drm_i915_gem_object *obj,
+ enum i915_mmap_type type, obj_set_fn_t obj_set_fn)
{
- struct drm_i915_private *i915 = arg;
- struct drm_i915_gem_object *obj;
struct i915_mmap_offset *mmo;
struct vm_area_struct *area;
unsigned long addr;
- void *vaddr;
- int err = 0, i;
+ int err = 0, out_err = 0, i;
- if (!i915_ggtt_has_aperture(&i915->ggtt))
+ if (!i915_ggtt_has_aperture(&i915->ggtt) &&
+ type == I915_MMAP_TYPE_GTT)
return 0;
- obj = i915_gem_object_create_internal(i915, PAGE_SIZE);
- if (IS_ERR(obj))
- return PTR_ERR(obj);
-
- vaddr = i915_gem_object_pin_map(obj, I915_MAP_WB);
- if (IS_ERR(vaddr)) {
- err = PTR_ERR(vaddr);
- goto out;
- }
- memset(vaddr, POISON_INUSE, PAGE_SIZE);
- i915_gem_object_flush_map(obj);
- i915_gem_object_unpin_map(obj);
+ err = obj_set_fn(obj, true);
+ if (err)
+ return err;
mmo = mmap_offset_attach(obj, type, NULL);
- if (IS_ERR(mmo)) {
- err = PTR_ERR(mmo);
- goto out;
- }
+ if (IS_ERR(mmo))
+ return PTR_ERR(mmo);
addr = igt_mmap_node(i915, &mmo->vma_node, 0, PROT_WRITE, MAP_SHARED);
- if (IS_ERR_VALUE(addr)) {
- err = addr;
- goto out;
- }
+ if (IS_ERR_VALUE(addr))
+ return addr;
pr_debug("igt_mmap() @ %lx\n", addr);
@@ -808,31 +859,50 @@ static int igt_mmap(void *arg, enum i915_mmap_type type)
out_unmap:
vm_munmap(addr, PAGE_SIZE);
+ out_err = obj_set_fn(obj, false);
+ if (out_err)
+ err = out_err;
- vaddr = i915_gem_object_pin_map(obj, I915_MAP_FORCE_WC);
- if (IS_ERR(vaddr)) {
- err = PTR_ERR(vaddr);
- goto out;
- }
- if (err == 0 && memchr_inv(vaddr, POISON_FREE, PAGE_SIZE)) {
- pr_err("Write via mmap did not land in backing store\n");
- err = -EINVAL;
- }
- i915_gem_object_unpin_map(obj);
-
-out:
- i915_gem_object_put(obj);
return err;
}
-static int igt_mmap_gtt(void *arg)
+static int igt_mmap_memory_regions(void *arg)
{
- return igt_mmap(arg, I915_MMAP_TYPE_GTT);
-}
+ struct drm_i915_private *i915 = arg;
+ int i, err = 0;
-static int igt_mmap_cpu(void *arg)
-{
- return igt_mmap(arg, I915_MMAP_TYPE_WC);
+ for (i = 0; i < ARRAY_SIZE(i915->mm.regions); i++) {
+ struct intel_memory_region *mem = i915->mm.regions[i];
+ struct drm_i915_gem_object *obj;
+
+ if (!mem)
+ continue;
+ obj = i915_gem_object_create_region(mem, PAGE_SIZE,
+ mem->type == INTEL_MEMORY_LOCAL ?
+ I915_BO_ALLOC_CONTIGUOUS : 0);
+ if (IS_ERR(obj)) {
+ err = PTR_ERR(obj);
+ if (err == -ENODEV) {
+ err = 0;
+ continue;
+ }
+ break;
+ }
+
+ if (!i915_gem_object_type_has(obj,
+ I915_GEM_OBJECT_HAS_STRUCT_PAGE |
+ I915_GEM_OBJECT_HAS_IOMEM))
+ err = igt_mmap(i915, obj, I915_MMAP_TYPE_GTT,
+ gtt_obj_set);
+ else
+ err = igt_mmap(i915, obj, I915_MMAP_TYPE_WC,
+ cpu_obj_set);
+ i915_gem_object_put(obj);
+ if (err)
+ break;
+ }
+
+ return err;
}
static int check_present_pte(pte_t *pte, unsigned long addr, void *data)
@@ -887,32 +957,24 @@ static int prefault_range(u64 start, u64 len)
return __get_user(c, end - 1);
}
-static int igt_mmap_revoke(void *arg, enum i915_mmap_type type)
+static int igt_mmap_revoke(struct drm_i915_private *i915, struct drm_i915_gem_object *obj,
+ enum i915_mmap_type type)
{
- struct drm_i915_private *i915 = arg;
- struct drm_i915_gem_object *obj;
struct i915_mmap_offset *mmo;
unsigned long addr;
int err;
- if (!i915_ggtt_has_aperture(&i915->ggtt))
+ if (!i915_ggtt_has_aperture(&i915->ggtt) &&
+ type == I915_MMAP_TYPE_GTT)
return 0;
- obj = i915_gem_object_create_internal(i915, SZ_4M);
- if (IS_ERR(obj))
- return PTR_ERR(obj);
-
mmo = mmap_offset_attach(obj, type, NULL);
- if (IS_ERR(mmo)) {
- err = PTR_ERR(mmo);
- goto out;
- }
+ if (IS_ERR(mmo))
+ return PTR_ERR(mmo);
addr = igt_mmap_node(i915, &mmo->vma_node, 0, PROT_WRITE, MAP_SHARED);
- if (IS_ERR_VALUE(addr)) {
- err = addr;
- goto out;
- }
+ if (IS_ERR_VALUE(addr))
+ return addr;
err = prefault_range(addr, obj->base.size);
if (err)
@@ -952,19 +1014,46 @@ static int igt_mmap_revoke(void *arg, enum i915_mmap_type type)
out_unmap:
vm_munmap(addr, obj->base.size);
-out:
- i915_gem_object_put(obj);
+
return err;
}
-static int igt_mmap_gtt_revoke(void *arg)
+static int igt_mmap_memory_regions_revoke(void *arg)
{
- return igt_mmap_revoke(arg, I915_MMAP_TYPE_GTT);
-}
+ struct drm_i915_private *i915 = arg;
+ int i, err = 0;
-static int igt_mmap_cpu_revoke(void *arg)
-{
- return igt_mmap_revoke(arg, I915_MMAP_TYPE_WC);
+ for (i = 0; i < ARRAY_SIZE(i915->mm.regions); i++) {
+ struct intel_memory_region *mem = i915->mm.regions[i];
+ struct drm_i915_gem_object *obj;
+
+ if (!mem)
+ continue;
+ obj = i915_gem_object_create_region(mem, PAGE_SIZE,
+ mem->type == INTEL_MEMORY_LOCAL ?
+ I915_BO_ALLOC_CONTIGUOUS : 0);
+ if (IS_ERR(obj)) {
+ err = PTR_ERR(obj);
+ if (err == -ENODEV) {
+ err = 0;
+ continue;
+ }
+ break;
+ }
+
+ if (!i915_gem_object_type_has(obj,
+ I915_GEM_OBJECT_HAS_STRUCT_PAGE |
+ I915_GEM_OBJECT_HAS_IOMEM))
+ err = igt_mmap_revoke(i915, obj, I915_MMAP_TYPE_GTT);
+ else
+ err = igt_mmap_revoke(i915, obj, I915_MMAP_TYPE_WC);
+
+ i915_gem_object_put(obj);
+ if (err)
+ break;
+ }
+
+ return err;
}
int i915_gem_mman_live_selftests(struct drm_i915_private *i915)
@@ -973,10 +1062,8 @@ int i915_gem_mman_live_selftests(struct drm_i915_private *i915)
SUBTEST(igt_partial_tiling),
SUBTEST(igt_smoke_tiling),
SUBTEST(igt_mmap_offset_exhaustion),
- SUBTEST(igt_mmap_gtt),
- SUBTEST(igt_mmap_cpu),
- SUBTEST(igt_mmap_gtt_revoke),
- SUBTEST(igt_mmap_cpu_revoke),
+ SUBTEST(igt_mmap_memory_regions),
+ SUBTEST(igt_mmap_memory_regions_revoke),
};
return i915_subtests(tests, i915);
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
