* [Intel-gfx] [CI 1/2] drm/i915/gem: Extend mmap support for lmem
@ 2020-01-01 1:35 Chris Wilson
2020-01-01 1:35 ` [Intel-gfx] [CI 2/2] drm/i915/selftests: Extend fault handler selftests to all memory regions Chris Wilson
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2020-01-01 1:35 UTC (permalink / raw)
To: intel-gfx
From: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Local memory objects are similar to our usual scatterlist, but instead
of using the struct page stored therein, we need to use the
sg->dma_address.
Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 16 +++++++------
drivers/gpu/drm/i915/i915_drv.h | 6 ++---
drivers/gpu/drm/i915/i915_mm.c | 30 +++++++++++++++---------
3 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index 905527ce2999..4caf7d750c34 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -216,6 +216,7 @@ static vm_fault_t i915_error_to_vmf_fault(int err)
case -ENOSPC: /* shmemfs allocation failure */
case -ENOMEM: /* our allocation failure */
+ case -ENXIO:
return VM_FAULT_OOM;
case 0:
@@ -236,11 +237,10 @@ static vm_fault_t vm_fault_cpu(struct vm_fault *vmf)
struct vm_area_struct *area = vmf->vma;
struct i915_mmap_offset *mmo = area->vm_private_data;
struct drm_i915_gem_object *obj = mmo->obj;
+ bool use_dma =
+ !i915_gem_object_type_has(obj, I915_GEM_OBJECT_HAS_STRUCT_PAGE);
int err;
- if (unlikely(!i915_gem_object_has_struct_page(obj)))
- return VM_FAULT_SIGBUS;
-
/* Sanity check that we allow writing into this object */
if (unlikely(i915_gem_object_is_readonly(obj) &&
area->vm_flags & VM_WRITE))
@@ -251,9 +251,9 @@ static vm_fault_t vm_fault_cpu(struct vm_fault *vmf)
goto out;
/* PTEs are revoked in obj->ops->put_pages() */
- err = remap_io_sg_page(area,
- area->vm_start, area->vm_end - area->vm_start,
- obj->mm.pages->sgl);
+ err = remap_io_sg(area,
+ area->vm_start, area->vm_end - area->vm_start,
+ obj->mm.pages->sgl, use_dma);
if (area->vm_flags & VM_WRITE) {
GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
@@ -552,7 +552,9 @@ __assign_mmap_offset(struct drm_file *file,
}
if (mmap_type != I915_MMAP_TYPE_GTT &&
- !i915_gem_object_has_struct_page(obj)) {
+ !i915_gem_object_type_has(obj,
+ I915_GEM_OBJECT_HAS_STRUCT_PAGE |
+ I915_GEM_OBJECT_HAS_IOMEM)) {
err = -ENODEV;
goto out;
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 2c7e3020e766..ccd632fecf36 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2017,9 +2017,9 @@ int i915_reg_read_ioctl(struct drm_device *dev, void *data,
int remap_io_mapping(struct vm_area_struct *vma,
unsigned long addr, unsigned long pfn, unsigned long size,
struct io_mapping *iomap);
-int remap_io_sg_page(struct vm_area_struct *vma,
- unsigned long addr, unsigned long size,
- struct scatterlist *sgl);
+int remap_io_sg(struct vm_area_struct *vma,
+ unsigned long addr, unsigned long size,
+ struct scatterlist *sgl, bool use_dma);
static inline int intel_hws_csb_write_index(struct drm_i915_private *i915)
{
diff --git a/drivers/gpu/drm/i915/i915_mm.c b/drivers/gpu/drm/i915/i915_mm.c
index 2998689e6d42..7f1680b4125e 100644
--- a/drivers/gpu/drm/i915/i915_mm.c
+++ b/drivers/gpu/drm/i915/i915_mm.c
@@ -35,6 +35,7 @@ struct remap_pfn {
pgprot_t prot;
struct sgt_iter sgt;
+ bool dma;
};
static int remap_pfn(pte_t *pte, unsigned long addr, void *data)
@@ -48,12 +49,15 @@ static int remap_pfn(pte_t *pte, unsigned long addr, void *data)
return 0;
}
-static inline unsigned long sgt_pfn(const struct sgt_iter *sgt)
+static inline unsigned long sgt_pfn(const struct sgt_iter *sgt, bool use_dma)
{
+ if (use_dma)
+ return (sgt->dma + sgt->curr) >> PAGE_SHIFT;
+
return sgt->pfn + (sgt->curr >> PAGE_SHIFT);
}
-static int remap_sg_page(pte_t *pte, unsigned long addr, void *data)
+static int remap_sg(pte_t *pte, unsigned long addr, void *data)
{
struct remap_pfn *r = data;
@@ -62,12 +66,12 @@ static int remap_sg_page(pte_t *pte, unsigned long addr, void *data)
/* Special PTE are not associated with any struct page */
set_pte_at(r->mm, addr, pte,
- pte_mkspecial(pfn_pte(sgt_pfn(&r->sgt), r->prot)));
+ pte_mkspecial(pfn_pte(sgt_pfn(&r->sgt, r->dma), r->prot)));
r->pfn++; /* track insertions in case we need to unwind later */
r->sgt.curr += PAGE_SIZE;
if (r->sgt.curr >= r->sgt.max)
- r->sgt = __sgt_iter(__sg_next(r->sgt.sgp), false);
+ r->sgt = __sgt_iter(__sg_next(r->sgt.sgp), r->dma);
return 0;
}
@@ -108,30 +112,34 @@ int remap_io_mapping(struct vm_area_struct *vma,
}
/**
- * remap_io_sg_page - remap an IO mapping to userspace
+ * remap_io_sg- remap an IO mapping to userspace
* @vma: user vma to map to
* @addr: target user address to start at
* @size: size of map area
* @sgl: Start sg entry
+ * @use_dma: Use stored dma address or pfn
*
* Note: this is only safe if the mm semaphore is held when called.
*/
-int remap_io_sg_page(struct vm_area_struct *vma,
- unsigned long addr, unsigned long size,
- struct scatterlist *sgl)
+int remap_io_sg(struct vm_area_struct *vma,
+ unsigned long addr, unsigned long size,
+ struct scatterlist *sgl, bool use_dma)
{
struct remap_pfn r = {
.mm = vma->vm_mm,
.prot = vma->vm_page_prot,
- .sgt = __sgt_iter(sgl, false),
+ .sgt = __sgt_iter(sgl, use_dma),
+ .dma = use_dma,
};
int err;
/* We rely on prevalidation of the io-mapping to skip track_pfn(). */
GEM_BUG_ON((vma->vm_flags & EXPECTED_FLAGS) != EXPECTED_FLAGS);
- flush_cache_range(vma, addr, size);
- err = apply_to_page_range(r.mm, addr, size, remap_sg_page, &r);
+ if (!use_dma)
+ flush_cache_range(vma, addr, size);
+
+ err = apply_to_page_range(r.mm, addr, size, remap_sg, &r);
if (unlikely(err)) {
zap_vma_ptes(vma, addr, r.pfn << PAGE_SHIFT);
return err;
--
2.25.0.rc0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Intel-gfx] [CI 2/2] drm/i915/selftests: Extend fault handler selftests to all memory regions
2020-01-01 1:35 [Intel-gfx] [CI 1/2] drm/i915/gem: Extend mmap support for lmem Chris Wilson
@ 2020-01-01 1:35 ` Chris Wilson
2020-01-01 1:41 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [CI,1/2] drm/i915/gem: Extend mmap support for lmem Patchwork
2020-01-01 2:06 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2020-01-01 1:35 UTC (permalink / raw)
To: intel-gfx
From: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
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@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reported-by: kbuild test robot <lkp@intel.com>
---
.../drm/i915/gem/selftests/i915_gem_mman.c | 265 ++++++++++++------
1 file changed, 187 insertions(+), 78 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 cbf796da64e3..659c6c4ec924 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,7 @@
#include "gt/intel_engine_pm.h"
#include "gt/intel_gt.h"
#include "gt/intel_gt_pm.h"
+#include "gem/i915_gem_region.h"
#include "huge_gem_object.h"
#include "i915_selftest.h"
#include "selftests/i915_random.h"
@@ -725,44 +726,135 @@ static int igt_mmap_offset_exhaustion(void *arg)
goto out;
}
-#define expand32(x) (((x) << 0) | ((x) << 8) | ((x) << 16) | ((x) << 24))
-static int igt_mmap(void *arg, enum i915_mmap_type type)
+static int gtt_set(struct drm_i915_gem_object *obj)
{
- 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;
+ struct i915_vma *vma;
+ void __iomem *map;
+ int err = 0;
- if (!i915_ggtt_has_aperture(&i915->ggtt))
- return 0;
+ vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, PIN_MAPPABLE);
+ if (IS_ERR(vma))
+ return PTR_ERR(vma);
- obj = i915_gem_object_create_internal(i915, PAGE_SIZE);
- if (IS_ERR(obj))
- return PTR_ERR(obj);
+ 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;
+ }
+
+ memset_io(map, POISON_INUSE, obj->base.size);
+ i915_vma_unpin_iomap(vma);
+
+out:
+ intel_gt_pm_put(vma->vm->gt);
+ return err;
+}
+
+static int gtt_check(struct drm_i915_gem_object *obj)
+{
+ struct i915_vma *vma;
+ void __iomem *map;
+ int err = 0;
+
+ vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, PIN_MAPPABLE);
+ if (IS_ERR(vma))
+ return PTR_ERR(vma);
- vaddr = i915_gem_object_pin_map(obj, I915_MAP_WB);
- if (IS_ERR(vaddr)) {
- err = PTR_ERR(vaddr);
+ 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;
}
- memset(vaddr, POISON_INUSE, PAGE_SIZE);
+
+ if (memchr_inv((void __force *)map, POISON_FREE, obj->base.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 wc_set(struct drm_i915_gem_object *obj)
+{
+ void *vaddr;
+
+ vaddr = i915_gem_object_pin_map(obj, I915_MAP_WC);
+ if (IS_ERR(vaddr))
+ return PTR_ERR(vaddr);
+
+ memset(vaddr, POISON_INUSE, obj->base.size);
i915_gem_object_flush_map(obj);
i915_gem_object_unpin_map(obj);
- mmo = mmap_offset_attach(obj, type, NULL);
- if (IS_ERR(mmo)) {
- err = PTR_ERR(mmo);
- goto out;
+ return 0;
+}
+
+static int wc_check(struct drm_i915_gem_object *obj)
+{
+ void *vaddr;
+ int err = 0;
+
+ vaddr = i915_gem_object_pin_map(obj, I915_MAP_WC);
+ if (IS_ERR(vaddr))
+ return PTR_ERR(vaddr);
+
+ if (memchr_inv(vaddr, POISON_FREE, obj->base.size)) {
+ pr_err("Write via mmap did not land in backing store\n");
+ err = -EINVAL;
}
+ i915_gem_object_unpin_map(obj);
+
+ return err;
+}
+
+static bool can_mmap(struct drm_i915_gem_object *obj, enum i915_mmap_type type)
+{
+ if (type == I915_MMAP_TYPE_GTT &&
+ !i915_ggtt_has_aperture(&to_i915(obj->base.dev)->ggtt))
+ return false;
+
+ if (type != I915_MMAP_TYPE_GTT &&
+ !i915_gem_object_type_has(obj,
+ I915_GEM_OBJECT_HAS_STRUCT_PAGE |
+ I915_GEM_OBJECT_HAS_IOMEM))
+ return false;
+
+ return true;
+}
+
+#define expand32(x) (((x) << 0) | ((x) << 8) | ((x) << 16) | ((x) << 24))
+static int __igt_mmap(struct drm_i915_private *i915,
+ struct drm_i915_gem_object *obj,
+ enum i915_mmap_type type)
+{
+ struct i915_mmap_offset *mmo;
+ struct vm_area_struct *area;
+ unsigned long addr;
+ int err, i;
+
+ if (!can_mmap(obj, type))
+ return 0;
+
+ err = wc_set(obj);
+ if (err == -ENXIO)
+ err = gtt_set(obj);
+ if (err)
+ return err;
+
+ mmo = mmap_offset_attach(obj, type, NULL);
+ 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);
@@ -779,7 +871,7 @@ static int igt_mmap(void *arg, enum i915_mmap_type type)
goto out_unmap;
}
- for (i = 0; i < PAGE_SIZE / sizeof(u32); i++) {
+ for (i = 0; i < obj->base.size / sizeof(u32); i++) {
u32 __user *ux = u64_to_user_ptr((u64)(addr + i * sizeof(*ux)));
u32 x;
@@ -787,14 +879,14 @@ static int igt_mmap(void *arg, enum i915_mmap_type type)
pr_err("Unable to read from mmap, offset:%zd\n",
i * sizeof(x));
err = -EFAULT;
- break;
+ goto out_unmap;
}
if (x != expand32(POISON_INUSE)) {
pr_err("Read incorrect value from mmap, offset:%zd, found:%x, expected:%x\n",
i * sizeof(x), x, expand32(POISON_INUSE));
err = -EINVAL;
- break;
+ goto out_unmap;
}
x = expand32(POISON_FREE);
@@ -802,37 +894,46 @@ static int igt_mmap(void *arg, enum i915_mmap_type type)
pr_err("Unable to write to mmap, offset:%zd\n",
i * sizeof(x));
err = -EFAULT;
- break;
+ goto out_unmap;
}
}
+ err = wc_check(obj);
+ if (err == -ENXIO)
+ err = gtt_check(obj);
out_unmap:
- vm_munmap(addr, PAGE_SIZE);
-
- 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);
+ vm_munmap(addr, obj->base.size);
-out:
- i915_gem_object_put(obj);
return err;
}
-static int igt_mmap_gtt(void *arg)
+static int igt_mmap(void *arg)
{
- return igt_mmap(arg, I915_MMAP_TYPE_GTT);
-}
+ struct drm_i915_private *i915 = arg;
+ struct intel_memory_region *mr;
+ enum intel_region_id id;
-static int igt_mmap_cpu(void *arg)
-{
- return igt_mmap(arg, I915_MMAP_TYPE_WC);
+ for_each_memory_region(mr, i915, id) {
+ struct drm_i915_gem_object *obj;
+ int err;
+
+ obj = i915_gem_object_create_region(mr, PAGE_SIZE, 0);
+ if (obj == ERR_PTR(-ENODEV))
+ continue;
+
+ if (IS_ERR(obj))
+ return PTR_ERR(obj);
+
+ err = __igt_mmap(i915, obj, I915_MMAP_TYPE_GTT);
+ if (err == 0)
+ err = __igt_mmap(i915, obj, I915_MMAP_TYPE_WC);
+
+ i915_gem_object_put(obj);
+ if (err)
+ return err;
+ }
+
+ return 0;
}
static int check_present_pte(pte_t *pte, unsigned long addr, void *data)
@@ -887,32 +988,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 (!can_mmap(obj, type))
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 +1045,37 @@ 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_revoke(void *arg)
{
- return igt_mmap_revoke(arg, I915_MMAP_TYPE_GTT);
-}
+ struct drm_i915_private *i915 = arg;
+ struct intel_memory_region *mr;
+ enum intel_region_id id;
-static int igt_mmap_cpu_revoke(void *arg)
-{
- return igt_mmap_revoke(arg, I915_MMAP_TYPE_WC);
+ for_each_memory_region(mr, i915, id) {
+ struct drm_i915_gem_object *obj;
+ int err;
+
+ obj = i915_gem_object_create_region(mr, PAGE_SIZE, 0);
+ if (obj == ERR_PTR(-ENODEV))
+ continue;
+
+ if (IS_ERR(obj))
+ return PTR_ERR(obj);
+
+ err = __igt_mmap_revoke(i915, obj, I915_MMAP_TYPE_GTT);
+ if (err == 0)
+ err = __igt_mmap_revoke(i915, obj, I915_MMAP_TYPE_WC);
+
+ i915_gem_object_put(obj);
+ if (err)
+ return err;
+ }
+
+ return 0;
}
int i915_gem_mman_live_selftests(struct drm_i915_private *i915)
@@ -973,10 +1084,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),
+ SUBTEST(igt_mmap_revoke),
};
return i915_subtests(tests, i915);
--
2.25.0.rc0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [CI,1/2] drm/i915/gem: Extend mmap support for lmem
2020-01-01 1:35 [Intel-gfx] [CI 1/2] drm/i915/gem: Extend mmap support for lmem Chris Wilson
2020-01-01 1:35 ` [Intel-gfx] [CI 2/2] drm/i915/selftests: Extend fault handler selftests to all memory regions Chris Wilson
@ 2020-01-01 1:41 ` Patchwork
2020-01-01 2:06 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-01-01 1:41 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: series starting with [CI,1/2] drm/i915/gem: Extend mmap support for lmem
URL : https://patchwork.freedesktop.org/series/71537/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
c269d4536b3a drm/i915/gem: Extend mmap support for lmem
68ca521ddb6d drm/i915/selftests: Extend fault handler selftests to all memory regions
-:157: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'x' - possible side-effects?
#157: FILE: drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c:832:
+#define expand32(x) (((x) << 0) | ((x) << 8) | ((x) << 16) | ((x) << 24))
total: 0 errors, 0 warnings, 1 checks, 356 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [CI,1/2] drm/i915/gem: Extend mmap support for lmem
2020-01-01 1:35 [Intel-gfx] [CI 1/2] drm/i915/gem: Extend mmap support for lmem Chris Wilson
2020-01-01 1:35 ` [Intel-gfx] [CI 2/2] drm/i915/selftests: Extend fault handler selftests to all memory regions Chris Wilson
2020-01-01 1:41 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [CI,1/2] drm/i915/gem: Extend mmap support for lmem Patchwork
@ 2020-01-01 2:06 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-01-01 2:06 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: series starting with [CI,1/2] drm/i915/gem: Extend mmap support for lmem
URL : https://patchwork.freedesktop.org/series/71537/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7661 -> Patchwork_15962
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15962 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_15962, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15962:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_mman:
- fi-gdg-551: NOTRUN -> [DMESG-FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-gdg-551/igt@i915_selftest@live_mman.html
- fi-skl-lmem: [PASS][2] -> [INCOMPLETE][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-skl-lmem/igt@i915_selftest@live_mman.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-skl-lmem/igt@i915_selftest@live_mman.html
Known issues
------------
Here are the changes found in Patchwork_15962 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium@hdmi-crc-fast:
- fi-icl-u2: [PASS][4] -> [FAIL][5] ([fdo#109635])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
#### Possible fixes ####
* igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6700k2: [INCOMPLETE][6] ([i915#671]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-skl-6700k2/igt@i915_module_load@reload-with-fault-injection.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-skl-6700k2/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_pm_rpm@module-reload:
- fi-skl-6600u: [DMESG-WARN][8] ([i915#889]) -> [PASS][9] +23 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-skl-6600u/igt@i915_pm_rpm@module-reload.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-skl-6600u/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live_blt:
- fi-hsw-4770: [DMESG-FAIL][10] ([i915#563]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-hsw-4770/igt@i915_selftest@live_blt.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-hsw-4770/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gt_lrc:
- fi-skl-6600u: [DMESG-FAIL][12] ([i915#889]) -> [PASS][13] +7 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-skl-6600u/igt@i915_selftest@live_gt_lrc.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-skl-6600u/igt@i915_selftest@live_gt_lrc.html
* igt@i915_selftest@live_workarounds:
- fi-icl-dsi: [DMESG-FAIL][14] -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-icl-dsi/igt@i915_selftest@live_workarounds.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-icl-dsi/igt@i915_selftest@live_workarounds.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][16] ([fdo#111407]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
#### Warnings ####
* igt@i915_pm_rpm@basic-rte:
- fi-kbl-guc: [FAIL][18] ([i915#704]) -> [SKIP][19] ([fdo#109271])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
* igt@kms_flip@basic-flip-vs-modeset:
- fi-kbl-x1275: [DMESG-WARN][20] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][21] ([i915#62] / [i915#92]) +7 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-kbl-x1275/igt@kms_flip@basic-flip-vs-modeset.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-kbl-x1275/igt@kms_flip@basic-flip-vs-modeset.html
* igt@kms_flip@basic-flip-vs-wf_vblank:
- fi-kbl-x1275: [DMESG-WARN][22] ([i915#62] / [i915#92]) -> [DMESG-WARN][23] ([i915#62] / [i915#92] / [i915#95]) +4 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7661/fi-kbl-x1275/igt@kms_flip@basic-flip-vs-wf_vblank.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/fi-kbl-x1275/igt@kms_flip@basic-flip-vs-wf_vblank.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109635]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#671]: https://gitlab.freedesktop.org/drm/intel/issues/671
[i915#704]: https://gitlab.freedesktop.org/drm/intel/issues/704
[i915#889]: https://gitlab.freedesktop.org/drm/intel/issues/889
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (45 -> 43)
------------------------------
Additional (5): fi-hsw-4770r fi-cml-s fi-skl-6770hq fi-gdg-551 fi-blb-e6850
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-bdw-gvtdvm fi-byt-squawks fi-snb-2520m fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7661 -> Patchwork_15962
CI-20190529: 20190529
CI_DRM_7661: 1adead839bd8fc1b4c150864c9de270ee05051a7 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5357: a555a4b98f90dab655d24bb3d07e9291a8b8dac8 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15962: 68ca521ddb6db731b8b8e0197473e403708b7ac5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
68ca521ddb6d drm/i915/selftests: Extend fault handler selftests to all memory regions
c269d4536b3a drm/i915/gem: Extend mmap support for lmem
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15962/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] [CI 1/2] drm/i915/gem: Extend mmap support for lmem
@ 2019-12-31 23:36 Chris Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2019-12-31 23:36 UTC (permalink / raw)
To: intel-gfx
From: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Local memory objects are similar to our usual scatterlist, but instead
of using the struct page stored therein, we need to use the
sg->dma_address.
Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 16 +++++++++-------
drivers/gpu/drm/i915/i915_drv.h | 6 +++---
drivers/gpu/drm/i915/i915_mm.c | 23 ++++++++++++++---------
3 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index 905527ce2999..4caf7d750c34 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -216,6 +216,7 @@ static vm_fault_t i915_error_to_vmf_fault(int err)
case -ENOSPC: /* shmemfs allocation failure */
case -ENOMEM: /* our allocation failure */
+ case -ENXIO:
return VM_FAULT_OOM;
case 0:
@@ -236,11 +237,10 @@ static vm_fault_t vm_fault_cpu(struct vm_fault *vmf)
struct vm_area_struct *area = vmf->vma;
struct i915_mmap_offset *mmo = area->vm_private_data;
struct drm_i915_gem_object *obj = mmo->obj;
+ bool use_dma =
+ !i915_gem_object_type_has(obj, I915_GEM_OBJECT_HAS_STRUCT_PAGE);
int err;
- if (unlikely(!i915_gem_object_has_struct_page(obj)))
- return VM_FAULT_SIGBUS;
-
/* Sanity check that we allow writing into this object */
if (unlikely(i915_gem_object_is_readonly(obj) &&
area->vm_flags & VM_WRITE))
@@ -251,9 +251,9 @@ static vm_fault_t vm_fault_cpu(struct vm_fault *vmf)
goto out;
/* PTEs are revoked in obj->ops->put_pages() */
- err = remap_io_sg_page(area,
- area->vm_start, area->vm_end - area->vm_start,
- obj->mm.pages->sgl);
+ err = remap_io_sg(area,
+ area->vm_start, area->vm_end - area->vm_start,
+ obj->mm.pages->sgl, use_dma);
if (area->vm_flags & VM_WRITE) {
GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
@@ -552,7 +552,9 @@ __assign_mmap_offset(struct drm_file *file,
}
if (mmap_type != I915_MMAP_TYPE_GTT &&
- !i915_gem_object_has_struct_page(obj)) {
+ !i915_gem_object_type_has(obj,
+ I915_GEM_OBJECT_HAS_STRUCT_PAGE |
+ I915_GEM_OBJECT_HAS_IOMEM)) {
err = -ENODEV;
goto out;
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c2348272e211..5361a3a2a659 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2015,9 +2015,9 @@ int i915_reg_read_ioctl(struct drm_device *dev, void *data,
int remap_io_mapping(struct vm_area_struct *vma,
unsigned long addr, unsigned long pfn, unsigned long size,
struct io_mapping *iomap);
-int remap_io_sg_page(struct vm_area_struct *vma,
- unsigned long addr, unsigned long size,
- struct scatterlist *sgl);
+int remap_io_sg(struct vm_area_struct *vma,
+ unsigned long addr, unsigned long size,
+ struct scatterlist *sgl, bool use_dma);
static inline int intel_hws_csb_write_index(struct drm_i915_private *i915)
{
diff --git a/drivers/gpu/drm/i915/i915_mm.c b/drivers/gpu/drm/i915/i915_mm.c
index 2998689e6d42..cb891914ae21 100644
--- a/drivers/gpu/drm/i915/i915_mm.c
+++ b/drivers/gpu/drm/i915/i915_mm.c
@@ -35,6 +35,7 @@ struct remap_pfn {
pgprot_t prot;
struct sgt_iter sgt;
+ bool use_dma;
};
static int remap_pfn(pte_t *pte, unsigned long addr, void *data)
@@ -53,7 +54,7 @@ static inline unsigned long sgt_pfn(const struct sgt_iter *sgt)
return sgt->pfn + (sgt->curr >> PAGE_SHIFT);
}
-static int remap_sg_page(pte_t *pte, unsigned long addr, void *data)
+static int remap_sg(pte_t *pte, unsigned long addr, void *data)
{
struct remap_pfn *r = data;
@@ -67,7 +68,7 @@ static int remap_sg_page(pte_t *pte, unsigned long addr, void *data)
r->sgt.curr += PAGE_SIZE;
if (r->sgt.curr >= r->sgt.max)
- r->sgt = __sgt_iter(__sg_next(r->sgt.sgp), false);
+ r->sgt = __sgt_iter(__sg_next(r->sgt.sgp), r->use_dma);
return 0;
}
@@ -108,30 +109,34 @@ int remap_io_mapping(struct vm_area_struct *vma,
}
/**
- * remap_io_sg_page - remap an IO mapping to userspace
+ * remap_io_sg- remap an IO mapping to userspace
* @vma: user vma to map to
* @addr: target user address to start at
* @size: size of map area
* @sgl: Start sg entry
+ * @use_dma: Use stored dma address or pfn
*
* Note: this is only safe if the mm semaphore is held when called.
*/
-int remap_io_sg_page(struct vm_area_struct *vma,
- unsigned long addr, unsigned long size,
- struct scatterlist *sgl)
+int remap_io_sg(struct vm_area_struct *vma,
+ unsigned long addr, unsigned long size,
+ struct scatterlist *sgl, bool use_dma)
{
struct remap_pfn r = {
.mm = vma->vm_mm,
.prot = vma->vm_page_prot,
- .sgt = __sgt_iter(sgl, false),
+ .sgt = __sgt_iter(sgl, use_dma),
+ .use_dma = use_dma,
};
int err;
/* We rely on prevalidation of the io-mapping to skip track_pfn(). */
GEM_BUG_ON((vma->vm_flags & EXPECTED_FLAGS) != EXPECTED_FLAGS);
- flush_cache_range(vma, addr, size);
- err = apply_to_page_range(r.mm, addr, size, remap_sg_page, &r);
+ if (!use_dma)
+ flush_cache_range(vma, addr, size);
+
+ err = apply_to_page_range(r.mm, addr, size, remap_sg, &r);
if (unlikely(err)) {
zap_vma_ptes(vma, addr, r.pfn << PAGE_SHIFT);
return err;
--
2.25.0.rc0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-01-01 2:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-01 1:35 [Intel-gfx] [CI 1/2] drm/i915/gem: Extend mmap support for lmem Chris Wilson
2020-01-01 1:35 ` [Intel-gfx] [CI 2/2] drm/i915/selftests: Extend fault handler selftests to all memory regions Chris Wilson
2020-01-01 1:41 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [CI,1/2] drm/i915/gem: Extend mmap support for lmem Patchwork
2020-01-01 2:06 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2019-12-31 23:36 [Intel-gfx] [CI 1/2] " Chris Wilson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.